132841 2014-05-12 15:43:50 -0700 Content shadow layer needs to move in sync with the content layer 2014-05-12 16:23:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin cmarcelo commit-queue esprehn+autocc glenn jamesr kondapallykalyan luiz sam simon.fraser thorton tonikitoo oldest_to_newest 1008762 0 bdakin 2014-05-12 15:43:50 -0700 Content shadow layer needs to move in sync with the content layer <rdar://problem/16641115> 1008765 1 231336 bdakin 2014-05-12 15:51:41 -0700 Created attachment 231336 Patch 1008781 2 bdakin 2014-05-12 16:23:17 -0700 Thanks Simon! http://trac.webkit.org/changeset/168655 231336 2014-05-12 15:51:41 -0700 2014-05-12 16:16:53 -0700 Patch for-review.txt text/plain 12107 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODY0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA1LTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBDb250ZW50IHNoYWRvdyBsYXllciBu ZWVkcyB0byBtb3ZlIGluIHN5bmMgd2l0aCB0aGUgY29udGVudCBsYXllcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyODQxCisgICAgICAgIC1hbmQg Y29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NjQxMTE1PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vdyB0aGF0IHRoZSBy b290IGNvbnRlbnQgbGF5ZXIgbW92ZXMgYSBsaXR0bGUgYml0IChmb3IgeSBzY3JvbGwgcG9zaXRp b25zIGJldHdlZW4gCisgICAgICAgIDAgYW5kIHRvcENvbnRlbnRJbnNldCksIHRoZSBzaGFkb3cg bGF5ZXIgbmVlZHMgdG8gbW92ZSBhbG9uZyB3aXRoIGl0IHNpbmNlIHRoZSAKKyAgICAgICAgc2hh ZG93IGxheWVyIHNob3VsZCBhbHdheXMgaGF2ZSB0aGUgc2FtZSBwb3NpdGlvbiBhcyB0aGUgcm9v dCBjb250ZW50IGxheWVyLgorCisgICAgICAgIFNldCB0aGUgcm9vdCBzdGF0ZSBub2Rl4oCZcyBz aGFkb3cgbGF5ZXIsIGFuZCB1cGRhdGUgdGhlIHBvc2l0aW9uIHdoZW5ldmVyIHRoZSByb290IAor ICAgICAgICBjb250ZW50IGxheWVy4oCZcyBwb3NpdGlvbiBpcyB1cGRhdGVkLgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Um9vdExheWVyRGlk Q2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVw ZGF0ZVNjcm9sbFBvc2l0aW9uQWZ0ZXJBc3luY1Njcm9sbCk6CisKKyAgICAgICAgRmV0Y2ggdGhl IGNvbXBvc2l0b3LigJlzIGxheWVyRm9yQ29udGVudFNoYWRvdygpLgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ0Nvb3JkaW5hdG9yOjpjb250ZW50U2hhZG93TGF5ZXJGb3JGcmFtZVZpZXcpOgorICAg ICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisKKyAgICAgICAg SG9vayB1cCB0aGUgY29udGVudFNoYWRvd0xheWVyIGluIHRoZSBzdGF0ZSBub2RlLgorICAgICAg ICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGlu Z05vZGU6OnNldENvbnRlbnRTaGFkb3dMYXllcik6CisKKyAgICAgICAgSG9vayBpdCB1cCBpbiB0 aGUgU2Nyb2xsaW5nVHJlZU5vZGUgYXMgd2VsbC4gTW92ZSB0aGUgbGF5ZXIgd2hlbmV2ZXIgdGhl IG0KKyAgICAgICAgX3Njcm9sbGVkQ29udGVudHNMYXllciBpcyBtb3ZlZC4KKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMuaDoKKyAgICAg ICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWMubW06 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYzo6dXBkYXRl QmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGVNYWM6OnNldFNjcm9sbExheWVyUG9zaXRpb24pOgorCisgICAgICAgIFRoZSBzaGFkb3cg bGF5ZXIgbmVlZHMgYW4gYW5jaG9yIHBvaW50IG5vdyB0aGF0IHdlIGFyZSBtb3ZpbmcgaXQgYXJv dW5kLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVyZmxvd0NvbnRy b2xzTGF5ZXJzKToKKwogMjAxNC0wNS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl bkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByb2dyZXNzIG9uIHdlYiB0aW1pbmcuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcAkocmV2aXNpb24gMTY4NjMxKQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEzNSw2ICsxMzUsNyBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZy YW1lVmllCiAgICAgbm9kZS0+c2V0TGF5ZXIoc2Nyb2xsTGF5ZXJGb3JGcmFtZVZpZXcoZnJhbWVW aWV3KSk7CiAgICAgbm9kZS0+c2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGNvdW50ZXJTY3JvbGxp bmdMYXllckZvckZyYW1lVmlldyhmcmFtZVZpZXcpKTsKICAgICBub2RlLT5zZXRJbnNldENsaXBM YXllcihpbnNldENsaXBMYXllckZvckZyYW1lVmlldyhmcmFtZVZpZXcpKTsKKyAgICBub2RlLT5z ZXRDb250ZW50U2hhZG93TGF5ZXIoY29udGVudFNoYWRvd0xheWVyRm9yRnJhbWVWaWV3KGZyYW1l VmlldykpOwogICAgIG5vZGUtPnNldEhlYWRlckxheWVyKGhlYWRlckxheWVyRm9yRnJhbWVWaWV3 KGZyYW1lVmlldykpOwogICAgIG5vZGUtPnNldEZvb3RlckxheWVyKGZvb3RlckxheWVyRm9yRnJh bWVWaWV3KGZyYW1lVmlldykpOwogICAgIG5vZGUtPnNldFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRF bGVtZW50cyhmcmFtZVZpZXctPnNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cygpKTsKQEAg LTIxNSw2ICsyMTYsNyBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVNj CiAgICAgICAgIGlmIChHcmFwaGljc0xheWVyKiBzY3JvbGxMYXllciA9IHNjcm9sbExheWVyRm9y RnJhbWVWaWV3KGZyYW1lVmlldykpIHsKICAgICAgICAgICAgIEdyYXBoaWNzTGF5ZXIqIGNvdW50 ZXJTY3JvbGxpbmdMYXllciA9IGNvdW50ZXJTY3JvbGxpbmdMYXllckZvckZyYW1lVmlldyhmcmFt ZVZpZXcpOwogICAgICAgICAgICAgR3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIgPSBpbnNl dENsaXBMYXllckZvckZyYW1lVmlldyhmcmFtZVZpZXcpOworICAgICAgICAgICAgR3JhcGhpY3NM YXllciogY29udGVudFNoYWRvd0xheWVyID0gY29udGVudFNoYWRvd0xheWVyRm9yRnJhbWVWaWV3 KGZyYW1lVmlldyk7CiAgICAgICAgICAgICBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRz TGF5ZXIgPSByb290Q29udGVudExheWVyRm9yRnJhbWVWaWV3KGZyYW1lVmlldyk7CiAgICAgICAg ICAgICBHcmFwaGljc0xheWVyKiBoZWFkZXJMYXllciA9IGhlYWRlckxheWVyRm9yRnJhbWVWaWV3 KGZyYW1lVmlldyk7CiAgICAgICAgICAgICBHcmFwaGljc0xheWVyKiBmb290ZXJMYXllciA9IGZv b3RlckxheWVyRm9yRnJhbWVWaWV3KGZyYW1lVmlldyk7CkBAIC0yMzQsNiArMjM2LDggQEAgdm9p ZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVTYwogICAgICAgICAgICAgICAgICAg ICBjb3VudGVyU2Nyb2xsaW5nTGF5ZXItPnNldFBvc2l0aW9uKHRvTGF5b3V0UG9pbnQoc2Nyb2xs T2Zmc2V0Rm9yRml4ZWQpKTsKICAgICAgICAgICAgICAgICBpZiAoaW5zZXRDbGlwTGF5ZXIpCiAg ICAgICAgICAgICAgICAgICAgIGluc2V0Q2xpcExheWVyLT5zZXRQb3NpdGlvbihwb3NpdGlvbkZv ckluc2V0Q2xpcExheWVyKTsKKyAgICAgICAgICAgICAgICBpZiAoY29udGVudFNoYWRvd0xheWVy KQorICAgICAgICAgICAgICAgICAgICBjb250ZW50U2hhZG93TGF5ZXItPnNldFBvc2l0aW9uKHBv c2l0aW9uRm9yQ29udGVudHNMYXllcik7CiAgICAgICAgICAgICAgICAgaWYgKHNjcm9sbGVkQ29u dGVudHNMYXllcikKICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZWRDb250ZW50c0xheWVyLT5z ZXRQb3NpdGlvbihwb3NpdGlvbkZvckNvbnRlbnRzTGF5ZXIpOwogICAgICAgICAgICAgICAgIGlm IChoZWFkZXJMYXllcikKQEAgLTI0Niw2ICsyNTAsOCBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnVwZGF0ZVNjCiAgICAgICAgICAgICAgICAgICAgIGNvdW50ZXJTY3JvbGxpbmdM YXllci0+c3luY1Bvc2l0aW9uKHRvTGF5b3V0UG9pbnQoc2Nyb2xsT2Zmc2V0Rm9yRml4ZWQpKTsK ICAgICAgICAgICAgICAgICBpZiAoaW5zZXRDbGlwTGF5ZXIpCiAgICAgICAgICAgICAgICAgICAg IGluc2V0Q2xpcExheWVyLT5zeW5jUG9zaXRpb24ocG9zaXRpb25Gb3JJbnNldENsaXBMYXllcik7 CisgICAgICAgICAgICAgICAgaWYgKGNvbnRlbnRTaGFkb3dMYXllcikKKyAgICAgICAgICAgICAg ICAgICAgY29udGVudFNoYWRvd0xheWVyLT5zeW5jUG9zaXRpb24ocG9zaXRpb25Gb3JDb250ZW50 c0xheWVyKTsKICAgICAgICAgICAgICAgICBpZiAoc2Nyb2xsZWRDb250ZW50c0xheWVyKQogICAg ICAgICAgICAgICAgICAgICBzY3JvbGxlZENvbnRlbnRzTGF5ZXItPnN5bmNQb3NpdGlvbihwb3Np dGlvbkZvckNvbnRlbnRzTGF5ZXIpOwogICAgICAgICAgICAgICAgIGlmIChoZWFkZXJMYXllcikK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdDb29yZGluYXRvci5jcHAJKHJldmlzaW9uIDE2ODYzMSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjU1LDYgKzI1NSwxMyBAQCBHcmFwaGljc0xheWVyKiBTY3JvbGxpbmdDb29yZGluYXRvcjo6aW5z CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKK0dyYXBoaWNzTGF5ZXIqIFNjcm9sbGluZ0Nvb3Jk aW5hdG9yOjpjb250ZW50U2hhZG93TGF5ZXJGb3JGcmFtZVZpZXcoRnJhbWVWaWV3KiBmcmFtZVZp ZXcpCit7CisgICAgaWYgKFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSBmcmFtZVZpZXctPmZyYW1l KCkuY29udGVudFJlbmRlcmVyKCkpCisgICAgICAgIHJldHVybiByZW5kZXJWaWV3LT5jb21wb3Np dG9yKCkubGF5ZXJGb3JDb250ZW50U2hhZG93KCk7CisgICAgcmV0dXJuIG51bGxwdHI7Cit9CisK IEdyYXBoaWNzTGF5ZXIqIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpyb290Q29udGVudExheWVyRm9y RnJhbWVWaWV3KEZyYW1lVmlldyogZnJhbWVWaWV3KQogewogICAgIGlmIChSZW5kZXJWaWV3KiBy ZW5kZXJWaWV3ID0gZnJhbWVWaWV3LT5mcmFtZSgpLmNvbnRlbnRSZW5kZXJlcigpKQpJbmRleDog U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5oCShyZXZpc2lvbiAxNjg2MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdDb29yZGluYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsNiArMjA1LDcg QEAgcHJvdGVjdGVkOgogICAgIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJTY3JvbGxpbmdMYXllckZv ckZyYW1lVmlldyhGcmFtZVZpZXcqKTsKICAgICBHcmFwaGljc0xheWVyKiBpbnNldENsaXBMYXll ckZvckZyYW1lVmlldyhGcmFtZVZpZXcqKTsKICAgICBHcmFwaGljc0xheWVyKiByb290Q29udGVu dExheWVyRm9yRnJhbWVWaWV3KEZyYW1lVmlldyopOworICAgIEdyYXBoaWNzTGF5ZXIqIGNvbnRl bnRTaGFkb3dMYXllckZvckZyYW1lVmlldyhGcmFtZVZpZXcqKTsKICAgICBHcmFwaGljc0xheWVy KiBoZWFkZXJMYXllckZvckZyYW1lVmlldyhGcmFtZVZpZXcqKTsKICAgICBHcmFwaGljc0xheWVy KiBmb290ZXJMYXllckZvckZyYW1lVmlldyhGcmFtZVZpZXcqKTsKIApJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGUuY3BwCShyZXZpc2lvbiAxNjg2MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04Nyw2ICs4Nyw5IEBAIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5n U3QKICAgICBpZiAoaGFzQ2hhbmdlZFByb3BlcnR5KEluc2V0Q2xpcExheWVyKSkKICAgICAgICAg c2V0SW5zZXRDbGlwTGF5ZXIoc3RhdGVOb2RlLmluc2V0Q2xpcExheWVyKCkudG9SZXByZXNlbnRh dGlvbihhZG9wdGl2ZVRyZWUucHJlZmVycmVkTGF5ZXJSZXByZXNlbnRhdGlvbigpKSk7CiAKKyAg ICBpZiAoaGFzQ2hhbmdlZFByb3BlcnR5KENvbnRlbnRTaGFkb3dMYXllcikpCisgICAgICAgIHNl dENvbnRlbnRTaGFkb3dMYXllcihzdGF0ZU5vZGUuY29udGVudFNoYWRvd0xheWVyKCkudG9SZXBy ZXNlbnRhdGlvbihhZG9wdGl2ZVRyZWUucHJlZmVycmVkTGF5ZXJSZXByZXNlbnRhdGlvbigpKSk7 CisKICAgICBpZiAoaGFzQ2hhbmdlZFByb3BlcnR5KEhlYWRlckxheWVyKSkKICAgICAgICAgc2V0 SGVhZGVyTGF5ZXIoc3RhdGVOb2RlLmhlYWRlckxheWVyKCkudG9SZXByZXNlbnRhdGlvbihhZG9w dGl2ZVRyZWUucHJlZmVycmVkTGF5ZXJSZXByZXNlbnRhdGlvbigpKSk7CiAKQEAgLTI1NSw2ICsy NTgsMTUgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OnNldElucwogICAgIHNl dFByb3BlcnR5Q2hhbmdlZChJbnNldENsaXBMYXllcik7CiB9CiAKK3ZvaWQgU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlOjpzZXRDb250ZW50U2hhZG93TGF5ZXIoY29uc3QgTGF5ZXJSZXByZXNl bnRhdGlvbiYgbGF5ZXJSZXByZXNlbnRhdGlvbikKK3sKKyAgICBpZiAobGF5ZXJSZXByZXNlbnRh dGlvbiA9PSBtX2NvbnRlbnRTaGFkb3dMYXllcikKKyAgICAgICAgcmV0dXJuOworICAgIAorICAg IG1fY29udGVudFNoYWRvd0xheWVyID0gbGF5ZXJSZXByZXNlbnRhdGlvbjsKKyAgICBzZXRQcm9w ZXJ0eUNoYW5nZWQoQ29udGVudFNoYWRvd0xheWVyKTsKK30KKwogdm9pZCBTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6OnNldEhlYWRlckxheWVyKGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24m IGxheWVyUmVwcmVzZW50YXRpb24pCiB7CiAgICAgaWYgKGxheWVyUmVwcmVzZW50YXRpb24gPT0g bV9oZWFkZXJMYXllcikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5oCShyZXZpc2lvbiAxNjg2 MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiArNjMsNyBAQCBwdWJsaWM6CiAgICAg ICAgIFNjcm9sbGVkQ29udGVudHNMYXllciwKICAgICAgICAgQ291bnRlclNjcm9sbGluZ0xheWVy LAogICAgICAgICBJbnNldENsaXBMYXllciwKKyAgICAgICAgQ29udGVudFNoYWRvd0xheWVyLAog ICAgICAgICBIZWFkZXJIZWlnaHQsCiAgICAgICAgIEZvb3RlckhlaWdodCwKICAgICAgICAgSGVh ZGVyTGF5ZXIsCkBAIC0xMzAsNiArMTMxLDkgQEAgcHVibGljOgogICAgIGNvbnN0IExheWVyUmVw cmVzZW50YXRpb24mIGluc2V0Q2xpcExheWVyKCkgY29uc3QgeyByZXR1cm4gbV9pbnNldENsaXBM YXllcjsgfQogICAgIHZvaWQgc2V0SW5zZXRDbGlwTGF5ZXIoY29uc3QgTGF5ZXJSZXByZXNlbnRh dGlvbiYpOwogCisgICAgY29uc3QgTGF5ZXJSZXByZXNlbnRhdGlvbiYgY29udGVudFNoYWRvd0xh eWVyKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50U2hhZG93TGF5ZXI7IH0KKyAgICB2b2lkIHNl dENvbnRlbnRTaGFkb3dMYXllcihjb25zdCBMYXllclJlcHJlc2VudGF0aW9uJik7CisKICAgICAv LyBUaGUgaGVhZGVyIGFuZCBmb290ZXIgbGF5ZXJzIHNjcm9sbCB2ZXJ0aWNhbGx5IHdpdGggdGhl IHBhZ2UsIHRoZXkgc2hvdWxkIHJlbWFpbiBmaXhlZCB3aGVuIHNjcm9sbGluZyBob3Jpem9udGFs bHkuCiAgICAgY29uc3QgTGF5ZXJSZXByZXNlbnRhdGlvbiYgaGVhZGVyTGF5ZXIoKSBjb25zdCB7 IHJldHVybiBtX2hlYWRlckxheWVyOyB9CiAgICAgdm9pZCBzZXRIZWFkZXJMYXllcihjb25zdCBM YXllclJlcHJlc2VudGF0aW9uJik7CkBAIC0xNTMsNiArMTU3LDcgQEAgcHJpdmF0ZToKICAgICBM YXllclJlcHJlc2VudGF0aW9uIG1fc2Nyb2xsZWRDb250ZW50c0xheWVyOwogICAgIExheWVyUmVw cmVzZW50YXRpb24gbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXI7CiAgICAgTGF5ZXJSZXByZXNlbnRh dGlvbiBtX2luc2V0Q2xpcExheWVyOworICAgIExheWVyUmVwcmVzZW50YXRpb24gbV9jb250ZW50 U2hhZG93TGF5ZXI7CiAgICAgTGF5ZXJSZXByZXNlbnRhdGlvbiBtX2hlYWRlckxheWVyOwogICAg IExheWVyUmVwcmVzZW50YXRpb24gbV9mb290ZXJMYXllcjsKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlTWFjLmgJKHJldmlzaW9uIDE2ODYzMSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1hYy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC05MCw2ICs5MCw3IEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPENBTGF5 ZXI+IG1fc2Nyb2xsZWRDb250ZW50c0xheWVyOwogICAgIFJldGFpblB0cjxDQUxheWVyPiBtX2Nv dW50ZXJTY3JvbGxpbmdMYXllcjsKICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9pbnNldENsaXBM YXllcjsKKyAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9jb250ZW50U2hhZG93TGF5ZXI7CiAgICAg UmV0YWluUHRyPENBTGF5ZXI+IG1faGVhZGVyTGF5ZXI7CiAgICAgUmV0YWluUHRyPENBTGF5ZXI+ IG1fZm9vdGVyTGF5ZXI7CiAgICAgUmV0YWluUHRyPFNjcm9sbGJhclBhaW50ZXI+IG1fdmVydGlj YWxTY3JvbGxiYXJQYWludGVyOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZU1h Yy5tbQkocmV2aXNpb24gMTY4NjMxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC04 Nyw2ICs4Nyw5IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVNYWM6OnVwZGEKICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6Okluc2V0Q2xpcExheWVyKSkKICAgICAgICAgbV9pbnNldENsaXBMYXll ciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5pbnNldENsaXBMYXllcigpOwogCisgICAgaWYgKHNjcm9s bGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlOjpDb250ZW50U2hhZG93TGF5ZXIpKQorICAgICAgICBtX2NvbnRlbnRTaGFkb3dMYXllciA9 IHNjcm9sbGluZ1N0YXRlTm9kZS5jb250ZW50U2hhZG93TGF5ZXIoKTsKKwogICAgIGlmIChzY3Jv bGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5n Tm9kZTo6SGVhZGVyTGF5ZXIpKQogICAgICAgICBtX2hlYWRlckxheWVyID0gc2Nyb2xsaW5nU3Rh dGVOb2RlLmhlYWRlckxheWVyKCk7CiAKQEAgLTM2MCw2ICszNjMsOCBAQCB2b2lkIFNjcm9sbGlu Z1RyZWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTCiAgICAgICAgIG1faW5zZXRDbGlwTGF5ZXIuZ2V0 KCkucG9zaXRpb24gPSBGbG9hdFBvaW50KDAsIEZyYW1lVmlldzo6eVBvc2l0aW9uRm9ySW5zZXRD bGlwTGF5ZXIocG9zaXRpb24sIHRvcENvbnRlbnRJbnNldCkpOwogICAgICAgICBtX3Njcm9sbGVk Q29udGVudHNMYXllci5nZXQoKS5wb3NpdGlvbiA9IEZsb2F0UG9pbnQobV9zY3JvbGxlZENvbnRl bnRzTGF5ZXIuZ2V0KCkucG9zaXRpb24ueCwKICAgICAgICAgICAgIEZyYW1lVmlldzo6eVBvc2l0 aW9uRm9yUm9vdENvbnRlbnRMYXllcihwb3NpdGlvbiwgdG9wQ29udGVudEluc2V0LCBoZWFkZXJI ZWlnaHQoKSkpOworICAgICAgICBpZiAobV9jb250ZW50U2hhZG93TGF5ZXIpCisgICAgICAgICAg ICBtX2NvbnRlbnRTaGFkb3dMYXllci5nZXQoKS5wb3NpdGlvbiA9IG1fc2Nyb2xsZWRDb250ZW50 c0xheWVyLmdldCgpLnBvc2l0aW9uOwogICAgIH0KIAogICAgIGlmIChtX2hlYWRlckxheWVyIHx8 IG1fZm9vdGVyTGF5ZXIpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCShyZXZpc2lvbiAxNjg2NDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzEwMiw2ICszMTAyLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZU92ZXJmbAogI2VuZGlmCiAgICAgICAgICAgICBtX2NvbnRlbnRTaGFkb3dMYXllci0+c2V0U2l6 ZShtX3Jvb3RDb250ZW50TGF5ZXItPnNpemUoKSk7CiAgICAgICAgICAgICBtX2NvbnRlbnRTaGFk b3dMYXllci0+c2V0UG9zaXRpb24obV9yb290Q29udGVudExheWVyLT5wb3NpdGlvbigpKTsKKyAg ICAgICAgICAgIG1fY29udGVudFNoYWRvd0xheWVyLT5zZXRBbmNob3JQb2ludChGbG9hdFBvaW50 M0QoKSk7CiAgICAgICAgICAgICBtX2NvbnRlbnRTaGFkb3dMYXllci0+c2V0Q3VzdG9tQXBwZWFy YW5jZShHcmFwaGljc0xheWVyOjpTY3JvbGxpbmdTaGFkb3cpOwogCiAgICAgICAgICAgICBtX3Nj cm9sbExheWVyLT5hZGRDaGlsZEJlbG93KG1fY29udGVudFNoYWRvd0xheWVyLmdldCgpLCBtX3Jv b3RDb250ZW50TGF5ZXIuZ2V0KCkpOwo=