66743 2011-08-22 18:41:08 -0700 [chromium] Remove obsolete child context list from LayerRendererChromium 2011-08-23 16:01:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66435 1 jamesr jamesr enne jbates kbr vangelis webkit.review.bot oldest_to_newest 455141 0 jamesr 2011-08-22 18:41:08 -0700 [chromium] Remove obsolete child context list from LayerRendererChromium 455142 1 104781 jamesr 2011-08-22 18:43:24 -0700 Created attachment 104781 Patch 455144 2 104781 jbates 2011-08-22 18:52:30 -0700 Comment on attachment 104781 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104781&action=review My precious codez! > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:-584 > - i->first->flush(); I think this was added during Al's flush patch. Not sure if it's necessary. Seems like it should be done elsewhere anyways. 455158 3 jamesr 2011-08-22 19:25:42 -0700 That was added to replace the latch that used to be there, but we don't need to explicit flushes here at all (see the ChangeLog). 455584 4 104781 jamesr 2011-08-23 12:15:11 -0700 Comment on attachment 104781 Patch Glad you like it, John, but I need a WebKit reviewer to r+ or the tools will yell at me. Ken, mind officially reviewing this? 455688 5 104781 kbr 2011-08-23 13:58:25 -0700 Comment on attachment 104781 Patch Looks good as long as it's been tested with various content to ensure that the flushes being removed aren't necessary. 455772 6 104781 webkit.review.bot 2011-08-23 16:01:22 -0700 Comment on attachment 104781 Patch Clearing flags on attachment: 104781 Committed r93647: <http://trac.webkit.org/changeset/93647> 455773 7 webkit.review.bot 2011-08-23 16:01:26 -0700 All reviewed patches have been landed. Closing bug. 104781 2011-08-22 18:43:24 -0700 2011-08-23 16:01:22 -0700 Patch bug-66743-20110822184323.patch text/plain 11042 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1NjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmI4OThhNDM3N2UxZTgz MjE0ZGQyY2JjNDhlMTQzNzRlOTRhMTM4Li4xMDEwZTE3MGI3OGVjMjJhMzIzNjM4NmNmMTc1MDAy NTNkNjIxMzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDgtMjIgIEphbWVz IFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJl bW92ZSBvYnNvbGV0ZSBjaGlsZCBjb250ZXh0IGxpc3QgZnJvbSBMYXllclJlbmRlcmVyQ2hyb21p dW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2NzQz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3Jl IHdlIGhhZCBwcm9wZXIgc2VtYW50aWNzIGZvciBmbHVzaCgpIGluIHRoZSBjb21tYW5kIGJ1ZmZl ciwgd2UKKyAgICAgICAgdXNlZCBhIHNjaGVtZSBvZiBsYXRjaGVzIGFjcm9zcyBjb250ZXh0cyB0 byBlbnN1cmUgY29uc2lzdGVudCBmcmFtZXMKKyAgICAgICAgd2VyZSBwcmVzZW50ZWQgZm9yIFdl YkdMIGFuZCBjYW52YXMuIFdlIG5vIGxvbmdlciBoYXZlIGxhdGNoZXMgYW5kCisgICAgICAgIGZs dXNoIGlzIGEgcHJvcGVyIHN5bmNocm9uaXphdGlvbiBwcmltYXRpdmUsIHNvIHRoZSBjaGlsZCBj b250ZXh0IGxpc3QKKyAgICAgICAgbm8gbG9uZ2VyIGRvZXMgYW55dGhpbmcuIENhbnZhczJETGF5 ZXJDaHJvbWl1bSBhbmQKKyAgICAgICAgV2ViR0xMYXllckNocm9taXVtJ3MgaW1wbGVtZW50YXRp b25zIG9mIHVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMoKSBkbworICAgICAgICBmbHVzaGVzIG9u IHRoZSBhcHByb3ByaWF0ZSBjb250ZXh0IGFscmVhZHkgLSBjYW52YXMgbGF5ZXJzIHZpYQorICAg ICAgICBEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheWVyKCksIGFuZCBXZWJHTCBs YXllcnMgdmlhIHRoZSBjYWxsCisgICAgICAgIHRvIHByZXBhcmVUZXh0dXJlKCkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZSBjb2RlIGJlaW5nIHJlbW92ZWQgZG9lc24ndCBkbyBh bnl0aGluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJE TGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXMyRExheWVyQ2hyb21p dW06On5DYW52YXMyRExheWVyQ2hyb21pdW0pOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzMkRM YXllckNocm9taXVtOjpzZXREcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVtOjpkcmF3TGF5ZXJzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V2ViR0xMYXllckNocm9taXVtOjp+V2ViR0xMYXllckNocm9taXVt KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGV4dCk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVtLmg6 CisKIDIwMTEtMDgtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAg ICAgICAgc2hvd01vZGFsRGlhbG9nIGRvZXMgbm90IGNvcnJlY3RseSByZXR1cm4gdGhlIGRlZmlu ZWQgcmV0dXJuVmFsdWUgaW4gY2FzZSBkb21haW4gcmVsYXhpbmcgaXMgdXNlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXll ckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NhbnZhczJETGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggMzc4MGVmNWE0NjFhOGY2NWY4MmUxZWQ2 ZmViNTdmNTI1MWExYWY5OS4uOTQ5ZmUwYmJiN2Y0MWE5OTgwMWMwNTNjY2NjNDZlNmNlYzgzNGE1 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q2FudmFzMkRMYXllckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0uY3BwCkBAIC01NCw4ICs1NCw2 IEBAIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6Q2FudmFzMkRMYXllckNocm9taXVtKERyYXdpbmdC dWZmZXIqIGRyYXdpbmdCdWZmZXIsIEdyYXBoCiAKIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6fkNh bnZhczJETGF5ZXJDaHJvbWl1bSgpCiB7Ci0gICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiBsYXll clJlbmRlcmVyKCkpCi0gICAgICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0 KG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7CiB9CiAKIGJvb2wg Q2FudmFzMkRMYXllckNocm9taXVtOjpkcmF3c0NvbnRlbnQoKSBjb25zdApAQCAtODQsMjkgKzgy LDcgQEAgdW5zaWduZWQgQ2FudmFzMkRMYXllckNocm9taXVtOjp0ZXh0dXJlSWQoKSBjb25zdAog CiB2b2lkIENhbnZhczJETGF5ZXJDaHJvbWl1bTo6c2V0RHJhd2luZ0J1ZmZlcihEcmF3aW5nQnVm ZmVyKiBkcmF3aW5nQnVmZmVyKQogewotICAgIGlmIChkcmF3aW5nQnVmZmVyICE9IG1fZHJhd2lu Z0J1ZmZlcikgewotICAgICAgICBpZiAobV9kcmF3aW5nQnVmZmVyICYmIGxheWVyUmVuZGVyZXIo KSkKLSAgICAgICAgICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fZHJh d2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7Ci0KLSAgICAgICAgbV9kcmF3 aW5nQnVmZmVyID0gZHJhd2luZ0J1ZmZlcjsKLQotICAgICAgICBpZiAoZHJhd2luZ0J1ZmZlciAm JiBsYXllclJlbmRlcmVyKCkpCi0gICAgICAgICAgICBsYXllclJlbmRlcmVyKCktPmFkZENoaWxk Q29udGV4dChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCkuZ2V0KCkpOwotICAg IH0KLX0KLQotdm9pZCBDYW52YXMyRExheWVyQ2hyb21pdW06OnNldExheWVyUmVuZGVyZXIoTGF5 ZXJSZW5kZXJlckNocm9taXVtKiBuZXdMYXllclJlbmRlcmVyKQotewotICAgIGlmIChsYXllclJl bmRlcmVyKCkgIT0gbmV3TGF5ZXJSZW5kZXJlciAmJiBtX2RyYXdpbmdCdWZmZXIpIHsKLSAgICAg ICAgaWYgKG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKSkgewotICAgICAgICAg ICAgaWYgKGxheWVyUmVuZGVyZXIoKSkKLSAgICAgICAgICAgICAgICBsYXllclJlbmRlcmVyKCkt PnJlbW92ZUNoaWxkQ29udGV4dChtX2RyYXdpbmdCdWZmZXItPmdyYXBoaWNzQ29udGV4dDNEKCku Z2V0KCkpOwotICAgICAgICAgICAgaWYgKG5ld0xheWVyUmVuZGVyZXIpCi0gICAgICAgICAgICAg ICAgbmV3TGF5ZXJSZW5kZXJlci0+YWRkQ2hpbGRDb250ZXh0KG1fZHJhd2luZ0J1ZmZlci0+Z3Jh cGhpY3NDb250ZXh0M0QoKS5nZXQoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBMYXllckNocm9t aXVtOjpzZXRMYXllclJlbmRlcmVyKG5ld0xheWVyUmVuZGVyZXIpOwotICAgIH0KKyAgICBtX2Ry YXdpbmdCdWZmZXIgPSBkcmF3aW5nQnVmZmVyOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21pdW0u aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5 ZXJDaHJvbWl1bS5oCmluZGV4IGI2ODliMWMzN2FkNjgyNTA2NjQ4ZTdlNWQ0ZmQwYTFkYWExOTk5 NDcuLmE2ZjA3MDIxMDdlNDRkOTRmZDBhM2NiMzBjYzUwNGY2OGIxNGQwMmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJD aHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NhbnZhczJETGF5ZXJDaHJvbWl1bS5oCkBAIC01Miw4ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHVuc2lnbmVkIHRleHR1cmVJZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0RHJhd2luZ0J1 ZmZlcihEcmF3aW5nQnVmZmVyKik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJSZW5kZXJl cihMYXllclJlbmRlcmVyQ2hyb21pdW0qKTsKLQogcHJpdmF0ZToKICAgICBleHBsaWNpdCBDYW52 YXMyRExheWVyQ2hyb21pdW0oRHJhd2luZ0J1ZmZlciosIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSog b3duZXIpOwogICAgIERyYXdpbmdCdWZmZXIqIG1fZHJhd2luZ0J1ZmZlcjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IGNkY2Q3ZmRkOTZjODdhMzlmNTczNzczNjA3 NzZlMTMwYTQwMjUxMWMuLmI1YzA4OTJiMDFkMDZmNDZkYTk2Yzg2MmI4NjM0N2FiYjVkNmZmMGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAtNTc4LDEyICs1Nzgs NiBAQCB2b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6ZHJhd0xheWVycygpCiAgICAgaWYgKCFy b290TGF5ZXIoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gQmVmb3JlIGRyYXdMYXllcnM6 Ci0gICAgQ2hpbGRDb250ZXh0TWFwOjppdGVyYXRvciBpID0gbV9jaGlsZENvbnRleHRzLmJlZ2lu KCk7Ci0gICAgZm9yICg7IGkgIT0gbV9jaGlsZENvbnRleHRzLmVuZCgpOyArK2kpIHsKLSAgICAg ICAgaS0+Zmlyc3QtPmZsdXNoKCk7Ci0gICAgfQotCiAgICAgewogICAgICAgICBUUkFDRV9FVkVO VCgiTGF5ZXJSZW5kZXJlckNocm9taXVtOjpzeW5jaHJvbml6ZVRyZWVzIiwgdGhpcywgMCk7CiAg ICAgICAgIG1fcm9vdENDTGF5ZXJJbXBsID0gVHJlZVN5bmNocm9uaXplcjo6c3luY2hyb25pemVU cmVlcyhyb290TGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpLCBtX3Jvb3RDQ0xheWVySW1wbC5nZXQo KSk7CkBAIC0xMzEzLDQzICsxMzA3LDYgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmR1 bXBSZW5kZXJTdXJmYWNlcyhUZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgY29uc3QKICAgICAg ICAgZHVtcFJlbmRlclN1cmZhY2VzKHRzLCBpbmRlbnQsIGxheWVyLT5jaGlsZHJlbigpW2ldLmdl dCgpKTsKIH0KIAotCi12b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6YWRkQ2hpbGRDb250ZXh0 KEdyYXBoaWNzQ29udGV4dDNEKiBjdHgpCi17Ci0gICAgLy8gVGhpcyBpcyBhIHJlZi1jb3VudGlu ZyBtYXAsIGJlY2F1c2Ugc29tZSBjb250ZXh0cyBhcmUgc2hhcmVkIGJ5IG11bHRpcGxlCi0gICAg Ly8gbGF5ZXJzIChzcGVjaWZpY2FsbHksIENhbnZhczJETGF5ZXJDaHJvbWl1bSkuCi0KLSAgICAv LyBJbnNlcnQgdGhlIGN0eCB3aXRoIGEgY291bnQgb2YgMSwgb3IgcmV0dXJuIHRoZSBleGlzdGlu ZyBpdGVyYXRvci4KLSAgICBzdGQ6OnBhaXI8Q2hpbGRDb250ZXh0TWFwOjppdGVyYXRvciwgYm9v bD4gaW5zZXJ0X3Jlc3VsdCA9IG1fY2hpbGRDb250ZXh0cy5hZGQoY3R4LCAxKTsKLSAgICBpZiAo IWluc2VydF9yZXN1bHQuc2Vjb25kKSB7Ci0gICAgICAgIC8vIEFscmVhZHkgcHJlc2VudCBpbiBt YXAsIHNvIGluY3JlbWVudC4KLSAgICAgICAgKytpbnNlcnRfcmVzdWx0LmZpcnN0LT5zZWNvbmQ7 Ci0gICAgfSBlbHNlIHsKLS8vIEZJWE1FKGpiYXRlcyk6IHdoZW4gY29tcG9zaXRvciBpcyBtdWx0 aXRocmVhZGVkIGFuZCBjb3B5VGV4SW1hZ2UyRCBidWcgaXMgZml4ZWQsCi0vLyB1bmNvbW1lbnQg dGhpcyBibG9jazoKLS8vICAgICAgLy8gVGhpcyBpcyBhIG5ldyBjaGlsZCBjb250ZXh0IC0gc2V0 IHRoZSBwYXJlbnRUb0NoaWxkIGxhdGNoIHNvIHRoYXQgaXQKLS8vICAgICAgLy8gY2FuIGNvbnRp bnVlIHBhc3QgaXRzIGZpcnN0IHdhaXQgbGF0Y2guCi0vLyAgICAgIEV4dGVuc2lvbnMzRENocm9t aXVtKiBleHQgPSBzdGF0aWNfY2FzdDxFeHRlbnNpb25zM0RDaHJvbWl1bSo+KGN0eC0+Z2V0RXh0 ZW5zaW9ucygpKTsKLS8vICAgICAgR0MzRHVpbnQgbGF0Y2hJZDsKLS8vICAgICAgZXh0LT5nZXRQ YXJlbnRUb0NoaWxkTGF0Y2hDSFJPTUlVTSgmbGF0Y2hJZCk7Ci0vLyAgICAgIGV4dC0+c2V0TGF0 Y2hDSFJPTUlVTSgwLCBsYXRjaElkKTsKLSAgICB9Ci19Ci0KLXZvaWQgTGF5ZXJSZW5kZXJlckNo cm9taXVtOjpyZW1vdmVDaGlsZENvbnRleHQoR3JhcGhpY3NDb250ZXh0M0QqIGN0eCkKLXsKLSAg ICBDaGlsZENvbnRleHRNYXA6Oml0ZXJhdG9yIGkgPSBtX2NoaWxkQ29udGV4dHMuZmluZChjdHgp OwotICAgIGlmIChpICE9IG1fY2hpbGRDb250ZXh0cy5lbmQoKSkgewotICAgICAgICBpZiAoLS1p LT5zZWNvbmQgPD0gMCkgewotICAgICAgICAgICAgLy8gQ291bnQgcmVhY2hlZCB6ZXJvLCBzbyBy ZW1vdmUgZnJvbSBtYXAuCi0gICAgICAgICAgICBtX2NoaWxkQ29udGV4dHMucmVtb3ZlKGkpOwot ICAgICAgICB9Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8gZXJyb3IKLSAgICAgICAgQVNTRVJU KDAgJiYgIm1fY2hpbGRDb250ZXh0cyBtYXAgaGFzIG1pc21hdGNoZWQgYWRkL3JlbW92ZSBjYWxs cyIpOwotICAgIH0KLX0KLQogYm9vbCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmlzQ29tcG9zaXRv ckNvbnRleHRMb3N0KCkKIHsKICAgICByZXR1cm4gKG1fY29udGV4dC5nZXQoKS0+Z2V0RXh0ZW5z aW9ucygpLT5nZXRHcmFwaGljc1Jlc2V0U3RhdHVzQVJCKCkgIT0gR3JhcGhpY3NDb250ZXh0M0Q6 Ok5PX0VSUk9SKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKaW5kZXggYmUyM2Q1 MmI2MjdjNjM1ZjU3OTgxNTk5MTg3MmUxM2I3NWZmNjNiYS4uNmQyYmQ4ZmQzYjExYTgwZWZlYmE5 ZjM5OTg1ZjZiYTE2MzY3ZjI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgK QEAgLTE0Myw5ICsxNDMsNiBAQCBwdWJsaWM6CiAKICAgICBTdHJpbmcgbGF5ZXJUcmVlQXNUZXh0 KCkgY29uc3Q7CiAKLSAgICB2b2lkIGFkZENoaWxkQ29udGV4dChHcmFwaGljc0NvbnRleHQzRCop OwotICAgIHZvaWQgcmVtb3ZlQ2hpbGRDb250ZXh0KEdyYXBoaWNzQ29udGV4dDNEKik7Ci0KICAg ICAvLyBSZXR1cm4gdHJ1ZSBpZiB0aGUgY29tcG9zaXRvciBjb250ZXh0IGhhcyBhbiBlcnJvci4K ICAgICBib29sIGlzQ29tcG9zaXRvckNvbnRleHRMb3N0KCk7CiAKQEAgLTE2Miw4ICsxNTksNiBA QCBwdWJsaWM6CiAgICAgdHlwZWRlZiBWZWN0b3I8UmVmUHRyPENDTGF5ZXJJbXBsPiA+IENDTGF5 ZXJMaXN0OwogCiBwcml2YXRlOgotICAgIHR5cGVkZWYgSGFzaE1hcDxHcmFwaGljc0NvbnRleHQz RCosIGludD4gQ2hpbGRDb250ZXh0TWFwOwotCiAgICAgLy8gRklYTUU6IFRoaXMgbmVlZHMgdG8g YmUgbW92ZWQgdG8gdGhlIENDTGF5ZXJUcmVlSG9zdEltcGwgd2hlbiB0aGF0IGNsYXNzIGV4aXN0 cy4KICAgICBSZWZQdHI8Q0NMYXllckltcGw+IG1fcm9vdENDTGF5ZXJJbXBsOwogCkBAIC0yNDAs OCArMjM1LDYgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8R3JDb250ZXh0PiBtX3NraWFDb250ZXh0 OwogI2VuZGlmCiAKLSAgICBDaGlsZENvbnRleHRNYXAgbV9jaGlsZENvbnRleHRzOwotCiAgICAg Ym9vbCBtX2NvbnRleHRTdXBwb3J0c01hcFN1YjsKIAogICAgIENDUmVuZGVyU3VyZmFjZSogbV9k ZWZhdWx0UmVuZGVyU3VyZmFjZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCmluZGV4 IDEwZjFhN2YyMGYwNjYwYTlkODdiYmJjNWIxOTVkNWFjMThlYTkxZDIuLmVlOWY4YmI2OWZiZDRj NWI2NzEwYzBhNjc1OWVlZWUxODIzMDYyOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNocm9taXVt LmNwcApAQCAtNTksOCArNTksNiBAQCBXZWJHTExheWVyQ2hyb21pdW06OldlYkdMTGF5ZXJDaHJv bWl1bShHcmFwaGljc0xheWVyQ2hyb21pdW0qIG93bmVyKQogCiBXZWJHTExheWVyQ2hyb21pdW06 On5XZWJHTExheWVyQ2hyb21pdW0oKQogewotICAgIGlmIChtX2NvbnRleHQgJiYgbGF5ZXJSZW5k ZXJlcigpKQotICAgICAgICBsYXllclJlbmRlcmVyKCktPnJlbW92ZUNoaWxkQ29udGV4dChtX2Nv bnRleHQpOwogfQogCiBib29sIFdlYkdMTGF5ZXJDaHJvbWl1bTo6ZHJhd3NDb250ZW50KCkgY29u c3QKQEAgLTEyOSwxMiArMTI3LDYgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldFRleHR1 cmVVcGRhdGVkKCkKIHZvaWQgV2ViR0xMYXllckNocm9taXVtOjpzZXRDb250ZXh0KGNvbnN0IEdy YXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQogewogICAgIGJvb2wgY29udGV4dENoYW5nZWQgPSAo bV9jb250ZXh0ICE9IGNvbnRleHQpOwotICAgIGlmIChjb250ZXh0Q2hhbmdlZCAmJiBsYXllclJl bmRlcmVyKCkpIHsKLSAgICAgICAgaWYgKG1fY29udGV4dCkKLSAgICAgICAgICAgIGxheWVyUmVu ZGVyZXIoKS0+cmVtb3ZlQ2hpbGRDb250ZXh0KG1fY29udGV4dCk7Ci0gICAgICAgIGlmIChjb250 ZXh0KQotICAgICAgICAgICAgbGF5ZXJSZW5kZXJlcigpLT5hZGRDaGlsZENvbnRleHQoY29uc3Rf Y2FzdDxHcmFwaGljc0NvbnRleHQzRCo+KGNvbnRleHQpKTsKLSAgICB9CiAKICAgICBtX2NvbnRl eHQgPSBjb25zdF9jYXN0PEdyYXBoaWNzQ29udGV4dDNEKj4oY29udGV4dCk7CiAKQEAgLTE1Mywy MCArMTQ1LDYgQEAgdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldENvbnRleHQoY29uc3QgR3Jh cGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgbV9jb250ZXh0U3VwcG9ydHNSYXRlTGltaXRp bmdFeHRlbnNpb24gPSBtX2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9ydHMoIkdMX0NI Uk9NSVVNX3JhdGVfbGltaXRfb2Zmc2NyZWVuX2NvbnRleHQiKTsKIH0KIAotdm9pZCBXZWJHTExh eWVyQ2hyb21pdW06OnNldExheWVyUmVuZGVyZXIoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBuZXdM YXllclJlbmRlcmVyKQotewotICAgIGlmIChsYXllclJlbmRlcmVyKCkgIT0gbmV3TGF5ZXJSZW5k ZXJlcikgewotICAgICAgICBpZiAobV9jb250ZXh0KSB7Ci0gICAgICAgICAgICBpZiAobGF5ZXJS ZW5kZXJlcigpKQotICAgICAgICAgICAgICAgIGxheWVyUmVuZGVyZXIoKS0+cmVtb3ZlQ2hpbGRD b250ZXh0KG1fY29udGV4dCk7Ci0gICAgICAgICAgICBpZiAobmV3TGF5ZXJSZW5kZXJlcikKLSAg ICAgICAgICAgICAgICBuZXdMYXllclJlbmRlcmVyLT5hZGRDaGlsZENvbnRleHQobV9jb250ZXh0 KTsKLSAgICAgICAgfQotCi0gICAgICAgIExheWVyQ2hyb21pdW06OnNldExheWVyUmVuZGVyZXIo bmV3TGF5ZXJSZW5kZXJlcik7Ci0gICAgfQotfQotCiB2b2lkIFdlYkdMTGF5ZXJDaHJvbWl1bTo6 cmF0ZUxpbWl0Q29udGV4dChUaW1lcjxXZWJHTExheWVyQ2hyb21pdW0+KikKIHsKICAgICBUUkFD RV9FVkVOVCgiV2ViR0xMYXllckNocm9taXVtOjpyYXRlTGltaXRDb250ZXh0IiwgdGhpcywgMCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9X ZWJHTExheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDFmNDNiNWU1ZjYzYTkyMzVjNDMyZDU5 YzY2NjYzYWEzZjUzNTAyZmYuLjU2ZDQ3ZDRhZjc4ZGY4ZmRlYjdmMWRhOTlkZGM5NTc0NWY3NDI3 NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L1dlYkdMTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5oCkBAIC01Nyw4ICs1Nyw2IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldENvbnRleHQoY29uc3QgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQp OwogICAgIEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0OyB9 CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TGF5ZXJSZW5kZXJlcihMYXllclJlbmRlcmVyQ2hyb21p dW0qKTsKLQogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogbGF5ZXJUeXBlQXNT dHJpbmcoKSBjb25zdCB7IHJldHVybiAiV2ViR0xMYXllciI7IH0KIAo=