129021 2014-02-18 20:11:43 -0800 StyleResolver::loadPendingImage() should take a reference to StylePendingImage 2022-02-27 23:15:55 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128671 1 ddkilzer ddkilzer allan.jensen andersca commit-queue darin ddkilzer esprehn+autocc glenn gyuyoung.kim kling koivisto macpherson menard oliver oldest_to_newest 982211 0 ddkilzer 2014-02-18 20:11:43 -0800 StyleResolver::loadPendingImage() should take a reference to StylePendingImage. Clean up as noted in Bug 128671 Comment #4. 982214 1 224580 ddkilzer 2014-02-18 20:21:25 -0800 Created attachment 224580 Patch v1 982441 2 224580 bfulgham 2014-02-19 10:58:00 -0800 Comment on attachment 224580 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=224580&action=review r=me > Source/WebCore/css/StyleResolver.cpp:3495 > + if (CSSImageSetValue* imageSetValue = pendingImage.cssImageSetValue()) Shouldn't this just be 'auto imageSetValue', too? 983265 3 ddkilzer 2014-02-21 11:34:47 -0800 Committed r164489: <http://trac.webkit.org/changeset/164489> 983266 4 ddkilzer 2014-02-21 11:35:12 -0800 (In reply to comment #2) > (From update of attachment 224580 [details]) > > Source/WebCore/css/StyleResolver.cpp:3495 > > + if (CSSImageSetValue* imageSetValue = pendingImage.cssImageSetValue()) > > Shouldn't this just be 'auto imageSetValue', too? I also fixed this while I was in the neighborhood. Thanks! 224580 2014-02-18 20:21:25 -0800 2022-02-27 23:15:55 -0800 Patch v1 bug-129021-20140218202124.patch text/plain 9722 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E5ZWIxYWQ0ZjhhYmVm ZGQ1MjNlYzdjZjUxNDdhMTcyNjE3YTEzZS4uOWRjNWFhOGJmNDFiMGNhZDg5NzQ3ZDkzOTU3OWEz OTYwNzQyYjFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAyLTE4ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgU3R5bGVSZXNvbHZlcjo6 bG9hZFBlbmRpbmdJbWFnZSgpIHNob3VsZCB0YWtlIGEgcmVmZXJlbmNlIHRvIFN0eWxlUGVuZGlu Z0ltYWdlCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzEyOTAyMT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmxvYWRQZW5kaW5nSW1hZ2Up OiBDaGFuZ2UgcGVuZGluZ0ltYWdlCisgICAgICAgIHBhcmFtZXRlciB0byBhIHJlZmVyZW5jZS4K KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmxvYWRQZW5kaW5nU2hhcGVJbWFnZSk6 IFVwZGF0ZSB0byB1c2UKKyAgICAgICAgcmVmZXJlbmNlcy4KKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlUmVzb2x2ZXI6OmxvYWRQZW5kaW5nSW1hZ2VzKTogRGl0dG8uCisgICAgICAgICogY3NzL1N0 eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmxvYWRQZW5k aW5nSW1hZ2UpOiBDaGFuZ2UgcGVuZGluZ0ltYWdlCisgICAgICAgIHBhcmFtZXRlciB0byBhIHJl ZmVyZW5jZS4KKwogMjAxNC0wMi0xOCAgU2FtdWVsIFdoaXRlICA8c2FtdWVsX3doaXRlQGFwcGxl LmNvbT4KIAogICAgICAgICBBWDogU2VhcmNoaW5nIGZvciAiaW1tZWRpYXRlIGRlc2NlbmRhbnRz IG9ubHkiIGNhbiByZXR1cm4gdW5leHBlY3RlZCByZXN1bHRzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwCmluZGV4IDIyYTZiZGUwZTA2Mjg1MDAwNTI1NzA5ZDVhODJhZTkwOTQ1Mjg2 MmIuLmYxNDdjNzU1NzI2MTk2MzZhMjNlNjczMGQ0ZjdhMDU2OWY4N2UyZDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTM0NzgsMjggKzM0NzgsMjggQEAgYm9vbCBTdHls ZVJlc29sdmVyOjpjcmVhdGVGaWx0ZXJPcGVyYXRpb25zKENTU1ZhbHVlKiBpblZhbHVlLCBGaWx0 ZXJPcGVyYXRpb25zJgogCiAjZW5kaWYKIAotUGFzc1JlZlB0cjxTdHlsZUltYWdlPiBTdHlsZVJl c29sdmVyOjpsb2FkUGVuZGluZ0ltYWdlKFN0eWxlUGVuZGluZ0ltYWdlKiBwZW5kaW5nSW1hZ2Us IGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykKK1Bhc3NSZWZQdHI8U3R5bGVJ bWFnZT4gU3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdJbWFnZShjb25zdCBTdHlsZVBlbmRpbmdJ bWFnZSYgcGVuZGluZ0ltYWdlLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMp CiB7Ci0gICAgaWYgKGF1dG8gaW1hZ2VWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VWYWx1 ZSgpKQorICAgIGlmIChhdXRvIGltYWdlVmFsdWUgPSBwZW5kaW5nSW1hZ2UuY3NzSW1hZ2VWYWx1 ZSgpKQogICAgICAgICByZXR1cm4gaW1hZ2VWYWx1ZS0+Y2FjaGVkSW1hZ2UobV9zdGF0ZS5kb2N1 bWVudCgpLmNhY2hlZFJlc291cmNlTG9hZGVyKCksIG9wdGlvbnMpOwogCi0gICAgaWYgKGF1dG8g aW1hZ2VHZW5lcmF0b3JWYWx1ZSA9IHBlbmRpbmdJbWFnZS0+Y3NzSW1hZ2VHZW5lcmF0b3JWYWx1 ZSgpKSB7CisgICAgaWYgKGF1dG8gaW1hZ2VHZW5lcmF0b3JWYWx1ZSA9IHBlbmRpbmdJbWFnZS5j c3NJbWFnZUdlbmVyYXRvclZhbHVlKCkpIHsKICAgICAgICAgaW1hZ2VHZW5lcmF0b3JWYWx1ZS0+ bG9hZFN1YmltYWdlcyhtX3N0YXRlLmRvY3VtZW50KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKSk7 CiAgICAgICAgIHJldHVybiBTdHlsZUdlbmVyYXRlZEltYWdlOjpjcmVhdGUoKmltYWdlR2VuZXJh dG9yVmFsdWUpOwogICAgIH0KIAotICAgIGlmIChhdXRvIGN1cnNvckltYWdlVmFsdWUgPSBwZW5k aW5nSW1hZ2UtPmNzc0N1cnNvckltYWdlVmFsdWUoKSkKKyAgICBpZiAoYXV0byBjdXJzb3JJbWFn ZVZhbHVlID0gcGVuZGluZ0ltYWdlLmNzc0N1cnNvckltYWdlVmFsdWUoKSkKICAgICAgICAgcmV0 dXJuIGN1cnNvckltYWdlVmFsdWUtPmNhY2hlZEltYWdlKG1fc3RhdGUuZG9jdW1lbnQoKS5jYWNo ZWRSZXNvdXJjZUxvYWRlcigpKTsKIAogI2lmIEVOQUJMRShDU1NfSU1BR0VfU0VUKQotICAgIGlm IChDU1NJbWFnZVNldFZhbHVlKiBpbWFnZVNldFZhbHVlID0gcGVuZGluZ0ltYWdlLT5jc3NJbWFn ZVNldFZhbHVlKCkpCisgICAgaWYgKENTU0ltYWdlU2V0VmFsdWUqIGltYWdlU2V0VmFsdWUgPSBw ZW5kaW5nSW1hZ2UuY3NzSW1hZ2VTZXRWYWx1ZSgpKQogICAgICAgICByZXR1cm4gaW1hZ2VTZXRW YWx1ZS0+Y2FjaGVkSW1hZ2VTZXQobV9zdGF0ZS5kb2N1bWVudCgpLmNhY2hlZFJlc291cmNlTG9h ZGVyKCksIG9wdGlvbnMpOwogI2VuZGlmCiAKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotUGFz c1JlZlB0cjxTdHlsZUltYWdlPiBTdHlsZVJlc29sdmVyOjpsb2FkUGVuZGluZ0ltYWdlKFN0eWxl UGVuZGluZ0ltYWdlKiBwZW5kaW5nSW1hZ2UpCitQYXNzUmVmUHRyPFN0eWxlSW1hZ2U+IFN0eWxl UmVzb2x2ZXI6OmxvYWRQZW5kaW5nSW1hZ2UoY29uc3QgU3R5bGVQZW5kaW5nSW1hZ2UmIHBlbmRp bmdJbWFnZSkKIHsKICAgICByZXR1cm4gbG9hZFBlbmRpbmdJbWFnZShwZW5kaW5nSW1hZ2UsIENh Y2hlZFJlc291cmNlTG9hZGVyOjpkZWZhdWx0Q2FjaGVkUmVzb3VyY2VPcHRpb25zKCkpOwogfQpA QCAtMzUxNCw3ICszNTE0LDcgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjpsb2FkUGVuZGluZ1NoYXBl SW1hZ2UoU2hhcGVWYWx1ZSogc2hhcGVWYWx1ZSkKICAgICBpZiAoIWltYWdlIHx8ICFpbWFnZS0+ aXNQZW5kaW5nSW1hZ2UoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgU3R5bGVQZW5kaW5nSW1h Z2UqIHBlbmRpbmdJbWFnZSA9IHRvU3R5bGVQZW5kaW5nSW1hZ2UoaW1hZ2UpOworICAgIGF1dG8m IHBlbmRpbmdJbWFnZSA9IHRvU3R5bGVQZW5kaW5nSW1hZ2UoKmltYWdlKTsKIAogICAgIFJlc291 cmNlTG9hZGVyT3B0aW9ucyBvcHRpb25zID0gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRD YWNoZWRSZXNvdXJjZU9wdGlvbnMoKTsKICAgICBvcHRpb25zLnJlcXVlc3RPcmlnaW5Qb2xpY3kg PSBQb3RlbnRpYWxseUNyb3NzT3JpZ2luRW5hYmxlZDsKQEAgLTM1MzYsOCArMzUzNiw5IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdJbWFnZXMoKQogICAgICAgICBzd2l0Y2ggKGN1 cnJlbnRQcm9wZXJ0eSkgewogICAgICAgICBjYXNlIENTU1Byb3BlcnR5QmFja2dyb3VuZEltYWdl OiB7CiAgICAgICAgICAgICBmb3IgKEZpbGxMYXllciogYmFja2dyb3VuZExheWVyID0gbV9zdGF0 ZS5zdHlsZSgpLT5hY2Nlc3NCYWNrZ3JvdW5kTGF5ZXJzKCk7IGJhY2tncm91bmRMYXllcjsgYmFj a2dyb3VuZExheWVyID0gYmFja2dyb3VuZExheWVyLT5uZXh0KCkpIHsKLSAgICAgICAgICAgICAg ICBpZiAoYmFja2dyb3VuZExheWVyLT5pbWFnZSgpICYmIGJhY2tncm91bmRMYXllci0+aW1hZ2Uo KS0+aXNQZW5kaW5nSW1hZ2UoKSkKLSAgICAgICAgICAgICAgICAgICAgYmFja2dyb3VuZExheWVy LT5zZXRJbWFnZShsb2FkUGVuZGluZ0ltYWdlKHRvU3R5bGVQZW5kaW5nSW1hZ2UoYmFja2dyb3Vu ZExheWVyLT5pbWFnZSgpKSkpOworICAgICAgICAgICAgICAgIGF1dG8gc3R5bGVJbWFnZSA9IGJh Y2tncm91bmRMYXllci0+aW1hZ2UoKTsKKyAgICAgICAgICAgICAgICBpZiAoc3R5bGVJbWFnZSAm JiBzdHlsZUltYWdlLT5pc1BlbmRpbmdJbWFnZSgpKQorICAgICAgICAgICAgICAgICAgICBiYWNr Z3JvdW5kTGF5ZXItPnNldEltYWdlKGxvYWRQZW5kaW5nSW1hZ2UodG9TdHlsZVBlbmRpbmdJbWFn ZSgqc3R5bGVJbWFnZSkpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CkBAIC0zNTQ2LDcgKzM1NDcsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmxvYWRQZW5k aW5nSW1hZ2VzKCkKICAgICAgICAgICAgICAgICBpZiAoY29udGVudERhdGEtPmlzSW1hZ2UoKSkg ewogICAgICAgICAgICAgICAgICAgICBhdXRvJiBzdHlsZUltYWdlID0gdG9JbWFnZUNvbnRlbnRE YXRhKGNvbnRlbnREYXRhKS0+aW1hZ2UoKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKHN0eWxl SW1hZ2UuaXNQZW5kaW5nSW1hZ2UoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgUmVmUHRy PFN0eWxlSW1hZ2U+IGxvYWRlZEltYWdlID0gbG9hZFBlbmRpbmdJbWFnZSh0b1N0eWxlUGVuZGlu Z0ltYWdlKGNvbnN0X2Nhc3Q8U3R5bGVJbWFnZSo+KCZzdHlsZUltYWdlKSkpOworICAgICAgICAg ICAgICAgICAgICAgICAgUmVmUHRyPFN0eWxlSW1hZ2U+IGxvYWRlZEltYWdlID0gbG9hZFBlbmRp bmdJbWFnZSh0b1N0eWxlUGVuZGluZ0ltYWdlKHN0eWxlSW1hZ2UpKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChsb2FkZWRJbWFnZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 b0ltYWdlQ29udGVudERhdGEoY29udGVudERhdGEpLT5zZXRJbWFnZShsb2FkZWRJbWFnZS5yZWxl YXNlKCkpOwogICAgICAgICAgICAgICAgICAgICB9CkBAIC0zNTU4LDQzICszNTU5LDQ3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6bG9hZFBlbmRpbmdJbWFnZXMoKQogICAgICAgICAgICAgaWYgKEN1 cnNvckxpc3QqIGN1cnNvckxpc3QgPSBtX3N0YXRlLnN0eWxlKCktPmN1cnNvcnMoKSkgewogICAg ICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY3Vyc29yTGlzdC0+c2l6ZSgpOyAr K2kpIHsKICAgICAgICAgICAgICAgICAgICAgQ3Vyc29yRGF0YSYgY3VycmVudEN1cnNvciA9IGN1 cnNvckxpc3QtPmF0KGkpOwotICAgICAgICAgICAgICAgICAgICBpZiAoU3R5bGVJbWFnZSogaW1h Z2UgPSBjdXJyZW50Q3Vyc29yLmltYWdlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm IChpbWFnZS0+aXNQZW5kaW5nSW1hZ2UoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBj dXJyZW50Q3Vyc29yLnNldEltYWdlKGxvYWRQZW5kaW5nSW1hZ2UodG9TdHlsZVBlbmRpbmdJbWFn ZShpbWFnZSkpKTsKLSAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBh dXRvIHN0eWxlSW1hZ2UgPSBjdXJyZW50Q3Vyc29yLmltYWdlKCk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChzdHlsZUltYWdlICYmIHN0eWxlSW1hZ2UtPmlzUGVuZGluZ0ltYWdlKCkpCisgICAg ICAgICAgICAgICAgICAgICAgICBjdXJyZW50Q3Vyc29yLnNldEltYWdlKGxvYWRQZW5kaW5nSW1h Z2UodG9TdHlsZVBlbmRpbmdJbWFnZSgqc3R5bGVJbWFnZSkpKTsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBj YXNlIENTU1Byb3BlcnR5TGlzdFN0eWxlSW1hZ2U6IHsKLSAgICAgICAgICAgIGlmIChtX3N0YXRl LnN0eWxlKCktPmxpc3RTdHlsZUltYWdlKCkgJiYgbV9zdGF0ZS5zdHlsZSgpLT5saXN0U3R5bGVJ bWFnZSgpLT5pc1BlbmRpbmdJbWFnZSgpKQotICAgICAgICAgICAgICAgIG1fc3RhdGUuc3R5bGUo KS0+c2V0TGlzdFN0eWxlSW1hZ2UobG9hZFBlbmRpbmdJbWFnZSh0b1N0eWxlUGVuZGluZ0ltYWdl KG1fc3RhdGUuc3R5bGUoKS0+bGlzdFN0eWxlSW1hZ2UoKSkpKTsKKyAgICAgICAgICAgIGF1dG8g c3R5bGVJbWFnZSA9IG1fc3RhdGUuc3R5bGUoKS0+bGlzdFN0eWxlSW1hZ2UoKTsKKyAgICAgICAg ICAgIGlmIChzdHlsZUltYWdlICYmIHN0eWxlSW1hZ2UtPmlzUGVuZGluZ0ltYWdlKCkpCisgICAg ICAgICAgICAgICAgbV9zdGF0ZS5zdHlsZSgpLT5zZXRMaXN0U3R5bGVJbWFnZShsb2FkUGVuZGlu Z0ltYWdlKHRvU3R5bGVQZW5kaW5nSW1hZ2UoKnN0eWxlSW1hZ2UpKSk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VTb3Vy Y2U6IHsKLSAgICAgICAgICAgIGlmIChtX3N0YXRlLnN0eWxlKCktPmJvcmRlckltYWdlU291cmNl KCkgJiYgbV9zdGF0ZS5zdHlsZSgpLT5ib3JkZXJJbWFnZVNvdXJjZSgpLT5pc1BlbmRpbmdJbWFn ZSgpKQotICAgICAgICAgICAgICAgIG1fc3RhdGUuc3R5bGUoKS0+c2V0Qm9yZGVySW1hZ2VTb3Vy Y2UobG9hZFBlbmRpbmdJbWFnZSh0b1N0eWxlUGVuZGluZ0ltYWdlKG1fc3RhdGUuc3R5bGUoKS0+ Ym9yZGVySW1hZ2VTb3VyY2UoKSkpKTsKKyAgICAgICAgICAgIGF1dG8gc3R5bGVJbWFnZSA9IG1f c3RhdGUuc3R5bGUoKS0+Ym9yZGVySW1hZ2VTb3VyY2UoKTsKKyAgICAgICAgICAgIGlmIChzdHls ZUltYWdlICYmIHN0eWxlSW1hZ2UtPmlzUGVuZGluZ0ltYWdlKCkpCisgICAgICAgICAgICAgICAg bV9zdGF0ZS5zdHlsZSgpLT5zZXRCb3JkZXJJbWFnZVNvdXJjZShsb2FkUGVuZGluZ0ltYWdlKHRv U3R5bGVQZW5kaW5nSW1hZ2UoKnN0eWxlSW1hZ2UpKSk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94UmVmbGVjdDogewogICAg ICAgICAgICAgaWYgKFN0eWxlUmVmbGVjdGlvbiogcmVmbGVjdGlvbiA9IG1fc3RhdGUuc3R5bGUo KS0+Ym94UmVmbGVjdCgpKSB7CiAgICAgICAgICAgICAgICAgY29uc3QgTmluZVBpZWNlSW1hZ2Um IG1hc2tJbWFnZSA9IHJlZmxlY3Rpb24tPm1hc2soKTsKLSAgICAgICAgICAgICAgICBpZiAobWFz a0ltYWdlLmltYWdlKCkgJiYgbWFza0ltYWdlLmltYWdlKCktPmlzUGVuZGluZ0ltYWdlKCkpIHsK LSAgICAgICAgICAgICAgICAgICAgUmVmUHRyPFN0eWxlSW1hZ2U+IGxvYWRlZEltYWdlID0gbG9h ZFBlbmRpbmdJbWFnZSh0b1N0eWxlUGVuZGluZ0ltYWdlKG1hc2tJbWFnZS5pbWFnZSgpKSk7Cisg ICAgICAgICAgICAgICAgYXV0byBzdHlsZUltYWdlID0gbWFza0ltYWdlLmltYWdlKCk7CisgICAg ICAgICAgICAgICAgaWYgKHN0eWxlSW1hZ2UgJiYgc3R5bGVJbWFnZS0+aXNQZW5kaW5nSW1hZ2Uo KSkgeworICAgICAgICAgICAgICAgICAgICBSZWZQdHI8U3R5bGVJbWFnZT4gbG9hZGVkSW1hZ2Ug PSBsb2FkUGVuZGluZ0ltYWdlKHRvU3R5bGVQZW5kaW5nSW1hZ2UoKnN0eWxlSW1hZ2UpKTsKICAg ICAgICAgICAgICAgICAgICAgcmVmbGVjdGlvbi0+c2V0TWFzayhOaW5lUGllY2VJbWFnZShsb2Fk ZWRJbWFnZS5yZWxlYXNlKCksIG1hc2tJbWFnZS5pbWFnZVNsaWNlcygpLCBtYXNrSW1hZ2UuZmls bCgpLCBtYXNrSW1hZ2UuYm9yZGVyU2xpY2VzKCksIG1hc2tJbWFnZS5vdXRzZXQoKSwgbWFza0lt YWdlLmhvcml6b250YWxSdWxlKCksIG1hc2tJbWFnZS52ZXJ0aWNhbFJ1bGUoKSkpOwogICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VTb3VyY2U6IHsKLSAg ICAgICAgICAgIGlmIChtX3N0YXRlLnN0eWxlKCktPm1hc2tCb3hJbWFnZVNvdXJjZSgpICYmIG1f c3RhdGUuc3R5bGUoKS0+bWFza0JveEltYWdlU291cmNlKCktPmlzUGVuZGluZ0ltYWdlKCkpCi0g ICAgICAgICAgICAgICAgbV9zdGF0ZS5zdHlsZSgpLT5zZXRNYXNrQm94SW1hZ2VTb3VyY2UobG9h ZFBlbmRpbmdJbWFnZSh0b1N0eWxlUGVuZGluZ0ltYWdlKG1fc3RhdGUuc3R5bGUoKS0+bWFza0Jv eEltYWdlU291cmNlKCkpKSk7CisgICAgICAgICAgICBhdXRvIHN0eWxlSW1hZ2UgPSBtX3N0YXRl LnN0eWxlKCktPm1hc2tCb3hJbWFnZVNvdXJjZSgpOworICAgICAgICAgICAgaWYgKHN0eWxlSW1h Z2UgJiYgc3R5bGVJbWFnZS0+aXNQZW5kaW5nSW1hZ2UoKSkKKyAgICAgICAgICAgICAgICBtX3N0 YXRlLnN0eWxlKCktPnNldE1hc2tCb3hJbWFnZVNvdXJjZShsb2FkUGVuZGluZ0ltYWdlKHRvU3R5 bGVQZW5kaW5nSW1hZ2UoKnN0eWxlSW1hZ2UpKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0ltYWdlOiB7CiAgICAgICAg ICAgICBmb3IgKEZpbGxMYXllciogbWFza0xheWVyID0gbV9zdGF0ZS5zdHlsZSgpLT5hY2Nlc3NN YXNrTGF5ZXJzKCk7IG1hc2tMYXllcjsgbWFza0xheWVyID0gbWFza0xheWVyLT5uZXh0KCkpIHsK LSAgICAgICAgICAgICAgICBpZiAobWFza0xheWVyLT5pbWFnZSgpICYmIG1hc2tMYXllci0+aW1h Z2UoKS0+aXNQZW5kaW5nSW1hZ2UoKSkKLSAgICAgICAgICAgICAgICAgICAgbWFza0xheWVyLT5z ZXRJbWFnZShsb2FkUGVuZGluZ0ltYWdlKHRvU3R5bGVQZW5kaW5nSW1hZ2UobWFza0xheWVyLT5p bWFnZSgpKSkpOworICAgICAgICAgICAgICAgIGF1dG8gc3R5bGVJbWFnZSA9IG1hc2tMYXllci0+ aW1hZ2UoKTsKKyAgICAgICAgICAgICAgICBpZiAoc3R5bGVJbWFnZSAmJiBzdHlsZUltYWdlLT5p c1BlbmRpbmdJbWFnZSgpKQorICAgICAgICAgICAgICAgICAgICBtYXNrTGF5ZXItPnNldEltYWdl KGxvYWRQZW5kaW5nSW1hZ2UodG9TdHlsZVBlbmRpbmdJbWFnZSgqc3R5bGVJbWFnZSkpKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuaAppbmRleCAxMDNkZDVjYjZlNzRjMGM1NjZkNGMwYzkzYjY3YTMwMmMwMGM1 MmZhLi5kYTUzMTZlZjk5NTVkMmRkZTg4NzJjNmMwODQ1M2NiMmNmMTFhM2IyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJlc29sdmVyLmgKQEAgLTQ3Miw4ICs0NzIsOCBAQCBwcml2YXRlOgogCiAgICAg dm9pZCBhcHBseVNWR1Byb3BlcnR5KENTU1Byb3BlcnR5SUQsIENTU1ZhbHVlKik7CiAKLSAgICBQ YXNzUmVmUHRyPFN0eWxlSW1hZ2U+IGxvYWRQZW5kaW5nSW1hZ2UoU3R5bGVQZW5kaW5nSW1hZ2Uq LCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKLSAgICBQYXNzUmVmUHRyPFN0eWxlSW1h Z2U+IGxvYWRQZW5kaW5nSW1hZ2UoU3R5bGVQZW5kaW5nSW1hZ2UqKTsKKyAgICBQYXNzUmVmUHRy PFN0eWxlSW1hZ2U+IGxvYWRQZW5kaW5nSW1hZ2UoY29uc3QgU3R5bGVQZW5kaW5nSW1hZ2UmLCBj b25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKKyAgICBQYXNzUmVmUHRyPFN0eWxlSW1hZ2U+ IGxvYWRQZW5kaW5nSW1hZ2UoY29uc3QgU3R5bGVQZW5kaW5nSW1hZ2UmKTsKICAgICB2b2lkIGxv YWRQZW5kaW5nSW1hZ2VzKCk7CiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCiAgICAgdm9pZCBsb2Fk UGVuZGluZ1NoYXBlSW1hZ2UoU2hhcGVWYWx1ZSopOwo=