143716 2015-04-14 10:21:19 -0700 FrameView::m_frame should be a Ref<Frame> 2015-04-14 12:23:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue kling simon.fraser oldest_to_newest 1085173 0 cdumez 2015-04-14 10:21:19 -0700 FrameView::m_frame should be a Ref<Frame> instead of a RefPtr<Frame> as it can never be null. 1085182 1 250713 cdumez 2015-04-14 10:32:39 -0700 Created attachment 250713 Patch 1085209 2 250713 commit-queue 2015-04-14 12:23:36 -0700 Comment on attachment 250713 Patch Clearing flags on attachment: 250713 Committed r182805: <http://trac.webkit.org/changeset/182805> 1085210 3 commit-queue 2015-04-14 12:23:40 -0700 All reviewed patches have been landed. Closing bug. 250713 2015-04-14 10:32:39 -0700 2015-04-14 12:23:36 -0700 Patch bug-143716-20150414103143.patch text/plain 11236 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDcyZjY5MTY4YTc2MDBi ZGVkMTYxZDA5ZDUyODRkNmEyZjUwYjVhZC4uZGE2NDMwOTYxYTI1OTUwNjZiZjNkMjcxZmNiZDBm NDY4NDg3ZDYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTA0LTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRnJhbWVWaWV3OjptX2ZyYW1l IHNob3VsZCBiZSBhIFJlZjxGcmFtZT4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0MzcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZyYW1lVmlldzo6bV9mcmFtZSBzaG91bGQgYmUgYSBSZWY8RnJhbWU+ IGluc3RlYWQgb2YgYSBSZWZQdHI8RnJhbWU+IGFzCisgICAgICAgIGl0IGNhbiBuZXZlciBiZSBu dWxsLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVWaWV3OjpGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmbHVz aENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpoYXNDb21wb3NpdGVkQ29udGVudEluY2x1ZGluZ0Rlc2NlbmRhbnRzKToKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lVmlldzo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJh bWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlQ2FuQmxpdE9uU2Nyb2xs UmVjdXJzaXZlbHkpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRJc092ZXJsYXBw ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzaG91bGRVcGRhdGVDb21wb3NpdGlu Z0xheWVyc0FmdGVyU2Nyb2xsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVu ZGVyZWRDaGFyYWN0ZXJzRXhjZWVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBk YXRlTGF5ZXJGbHVzaFRocm90dGxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpz ZXJ2aWNlU2NyaXB0ZWRBbmltYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 dXBkYXRlQmFja2dyb3VuZFJlY3Vyc2l2ZWx5KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmll dzo6YWRqdXN0U2Nyb2xsU3RlcEZvckZpeGVkQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OnBhaW50Q29udGVudHNGb3JTbmFwc2hvdCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6Om5vdGlmeVdpZGdldHNJbkFsbEZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OnNldEV4cG9zZWRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 c2V0Vmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cyk6CisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuaDoKKwogMjAxNS0wNC0xNCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE4Mjc5NC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA5YmYxMDQ2YjljOWZjOTEyNTg4ZTA2OTk0OTUyMWM3 Njc2ZWUxMmY5Li5kYjI1Mzk4MzcyYjE1M2Y3MzkxZWFlM2ZhMDRlZmM0YzhlYzM5OGJhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0xNjEsNyArMTYxLDcgQEAgUGFnaW5hdGlvbjo6 TW9kZSBwYWdpbmF0aW9uTW9kZUZvclJlbmRlclN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHls ZSkKIH0KIAogRnJhbWVWaWV3OjpGcmFtZVZpZXcoRnJhbWUmIGZyYW1lKQotICAgIDogbV9mcmFt ZSgmZnJhbWUpCisgICAgOiBtX2ZyYW1lKGZyYW1lKQogICAgICwgbV9jYW5IYXZlU2Nyb2xsYmFy cyh0cnVlKQogICAgICwgbV9sYXlvdXRUaW1lcigqdGhpcywgJkZyYW1lVmlldzo6bGF5b3V0VGlt ZXJGaXJlZCkKICAgICAsIG1fbGF5b3V0Um9vdChudWxscHRyKQpAQCAtOTA5LDcgKzkwOSw3IEBA IGJvb2wgRnJhbWVWaWV3OjpmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoRnJhbWUq IHJvb3RGcmFtZUZvckZsdXNoKQogICAgICAgICB0aWxlQ2FjaGUtPmRvUGVuZGluZ1JlcGFpbnRz KCk7CiAjZW5kaWYKIAotICAgIHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS5mbHVzaFBlbmRpbmdM YXllckNoYW5nZXMocm9vdEZyYW1lRm9yRmx1c2ggPT0gJmZyYW1lKCkpOworICAgIHJlbmRlclZp ZXctPmNvbXBvc2l0b3IoKS5mbHVzaFBlbmRpbmdMYXllckNoYW5nZXMocm9vdEZyYW1lRm9yRmx1 c2ggPT0gbV9mcmFtZS5wdHIoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTEwMTQsNyAr MTAxNCw3IEBAIGJvb2wgRnJhbWVWaWV3OjpoYXNDb21wb3NpdGVkQ29udGVudCgpIGNvbnN0CiAK IGJvb2wgRnJhbWVWaWV3OjpoYXNDb21wb3NpdGVkQ29udGVudEluY2x1ZGluZ0Rlc2NlbmRhbnRz KCkgY29uc3QKIHsKLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1l OyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KG1fZnJhbWUuZ2V0KCkpKSB7Cisg ICAgZm9yIChhdXRvKiBmcmFtZSA9IG1fZnJhbWUucHRyKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KG1fZnJhbWUucHRyKCkpKSB7CiAgICAgICAgIFJlbmRlclZp ZXcqIHJlbmRlclZpZXcgPSBmcmFtZS0+Y29udGVudFJlbmRlcmVyKCk7CiAgICAgICAgIGlmIChS ZW5kZXJMYXllckNvbXBvc2l0b3IqIGNvbXBvc2l0b3IgPSByZW5kZXJWaWV3ID8gJnJlbmRlclZp ZXctPmNvbXBvc2l0b3IoKSA6IG51bGxwdHIpIHsKICAgICAgICAgICAgIGlmIChjb21wb3NpdG9y LT5pbkNvbXBvc2l0aW5nTW9kZSgpKQpAQCAtMTA2Myw3ICsxMDYzLDcgQEAgYm9vbCBGcmFtZVZp ZXc6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpCiB7CiAgICAgYm9v bCBhbGxGcmFtZXNGbHVzaGVkID0gZmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCZm cmFtZSgpKTsKICAgICAKLSAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IGZyYW1lKCkudHJlZSgpLmZp cnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS50cmF2ZXJzZU5leHQoJmZy YW1lKCkpKSB7CisgICAgZm9yIChGcmFtZSogY2hpbGQgPSBmcmFtZSgpLnRyZWUoKS5maXJzdENo aWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT50cmVlKCkudHJhdmVyc2VOZXh0KG1fZnJhbWUu cHRyKCkpKSB7CiAgICAgICAgIGJvb2wgZmx1c2hlZCA9IGNoaWxkLT52aWV3KCktPmZsdXNoQ29t cG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgmZnJhbWUoKSk7CiAgICAgICAgIGFsbEZyYW1lc0Zs dXNoZWQgJj0gZmx1c2hlZDsKICAgICB9CkBAIC0xNTExLDcgKzE1MTEsNyBAQCBib29sIEZyYW1l Vmlldzo6dXNlU2xvd1JlcGFpbnRzSWZOb3RPdmVybGFwcGVkKCkgY29uc3QKIAogdm9pZCBGcmFt ZVZpZXc6OnVwZGF0ZUNhbkJsaXRPblNjcm9sbFJlY3Vyc2l2ZWx5KCkKIHsKLSAgICBmb3IgKEZy YW1lKiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCku dHJhdmVyc2VOZXh0KG1fZnJhbWUuZ2V0KCkpKSB7CisgICAgZm9yIChhdXRvKiBmcmFtZSA9IG1f ZnJhbWUucHRyKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KG1f ZnJhbWUucHRyKCkpKSB7CiAgICAgICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmll dygpKQogICAgICAgICAgICAgdmlldy0+c2V0Q2FuQmxpdE9uU2Nyb2xsKCF2aWV3LT51c2VTbG93 UmVwYWludHMoKSk7CiAgICAgfQpAQCAtMTkxNSw3ICsxOTE1LDcgQEAgdm9pZCBGcmFtZVZpZXc6 OnNldElzT3ZlcmxhcHBlZChib29sIGlzT3ZlcmxhcHBlZCkKICAgICAgICAgaWYgKFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6YWxsb3dzSW5kZXBlbmRlbnRseUNvbXBvc2l0ZWRGcmFtZXModGhpcykp IHsKICAgICAgICAgICAgIC8vIFdlIGFsc28gbmVlZCB0byB0cmlnZ2VyIHJlZXZhbHVhdGlvbiBm b3IgdGhpcyBhbmQgYWxsIGRlc2NlbmRhbnQgZnJhbWVzLAogICAgICAgICAgICAgLy8gc2luY2Ug YSBmcmFtZSB1c2VzIGNvbXBvc2l0aW5nIGlmIGFueSBhbmNlc3RvciBpcyBjb21wb3NpdGluZy4K LSAgICAgICAgICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZS5nZXQoKTsgZnJhbWU7IGZy YW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5nZXQoKSkpIHsKKyAgICAg ICAgICAgIGZvciAoYXV0byogZnJhbWUgPSBtX2ZyYW1lLnB0cigpOyBmcmFtZTsgZnJhbWUgPSBm cmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dChtX2ZyYW1lLnB0cigpKSkgewogICAgICAgICAgICAg ICAgIGlmIChSZW5kZXJWaWV3KiB2aWV3ID0gZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpKSB7CiAg ICAgICAgICAgICAgICAgICAgIFJlbmRlckxheWVyQ29tcG9zaXRvciYgY29tcG9zaXRvciA9IHZp ZXctPmNvbXBvc2l0b3IoKTsKICAgICAgICAgICAgICAgICAgICAgY29tcG9zaXRvci5zZXRDb21w b3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKCk7CkBAIC0yMTc3LDcgKzIxNzcsNyBAQCBib29sIEZy YW1lVmlldzo6c2hvdWxkVXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbGluZygpIGNv bnN0CiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmICgmcGFn ZS0+bWFpbkZyYW1lKCkgIT0gJmZyYW1lKCkpCisgICAgaWYgKCZwYWdlLT5tYWluRnJhbWUoKSAh PSBtX2ZyYW1lLnB0cigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIFNjcm9sbGluZ0Nv b3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHBhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5h dG9yKCk7CkBAIC0yMjk0LDkgKzIyOTQsOSBAQCBzdGF0aWMgdW5zaWduZWQgY291bnRSZW5kZXJl ZENoYXJhY3RlcnNJblJlbmRlck9iamVjdFdpdGhUaHJlc2hvbGQoY29uc3QgUmVuZGVyRQogCiBi b29sIEZyYW1lVmlldzo6cmVuZGVyZWRDaGFyYWN0ZXJzRXhjZWVkKHVuc2lnbmVkIHRocmVzaG9s ZCkKIHsKLSAgICBpZiAoIW1fZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpKQorICAgIGlmICghZnJh bWUoKS5jb250ZW50UmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVy biBjb3VudFJlbmRlcmVkQ2hhcmFjdGVyc0luUmVuZGVyT2JqZWN0V2l0aFRocmVzaG9sZCgqbV9m cmFtZS0+Y29udGVudFJlbmRlcmVyKCksIHRocmVzaG9sZCkgPj0gdGhyZXNob2xkOworICAgIHJl dHVybiBjb3VudFJlbmRlcmVkQ2hhcmFjdGVyc0luUmVuZGVyT2JqZWN0V2l0aFRocmVzaG9sZCgq ZnJhbWUoKS5jb250ZW50UmVuZGVyZXIoKSwgdGhyZXNob2xkKSA+PSB0aHJlc2hvbGQ7CiB9CiAK IHZvaWQgRnJhbWVWaWV3OjphdmFpbGFibGVDb250ZW50U2l6ZUNoYW5nZWQoQXZhaWxhYmxlU2l6 ZUNoYW5nZVJlYXNvbiByZWFzb24pCkBAIC0yNDAwLDcgKzI0MDAsNyBAQCB2b2lkIEZyYW1lVmll dzo6dXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKQogICAgIGlmIChwYWdlLT5jaHJvbWUoKS5j bGllbnQoKS5hZGp1c3RMYXllckZsdXNoVGhyb3R0bGluZyhmbGFncykpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1l ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5nZXQoKSkpIHsKKyAgICBmb3Ig KGF1dG8qIGZyYW1lID0gbV9mcmFtZS5wdHIoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUo KS50cmF2ZXJzZU5leHQobV9mcmFtZS5wdHIoKSkpIHsKICAgICAgICAgaWYgKFJlbmRlclZpZXcq IHJlbmRlclZpZXcgPSBmcmFtZS0+Y29udGVudFJlbmRlcmVyKCkpCiAgICAgICAgICAgICByZW5k ZXJWaWV3LT5jb21wb3NpdG9yKCkuc2V0TGF5ZXJGbHVzaFRocm90dGxpbmdFbmFibGVkKGZsYWdz ICYgTGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkVuYWJsZWQpOwogICAgIH0KQEAgLTI2MzUsMTMg KzI2MzUsMTMgQEAgdm9pZCBGcmFtZVZpZXc6OnVuc2NoZWR1bGVSZWxheW91dCgpCiAjaWYgRU5B QkxFKFJFUVVFU1RfQU5JTUFUSU9OX0ZSQU1FKQogdm9pZCBGcmFtZVZpZXc6OnNlcnZpY2VTY3Jp cHRlZEFuaW1hdGlvbnMoZG91YmxlIG1vbm90b25pY0FuaW1hdGlvblN0YXJ0VGltZSkKIHsKLSAg ICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKKyAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFt ZS5wdHIoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgewog ICAgICAgICBmcmFtZS0+dmlldygpLT5zZXJ2aWNlU2Nyb2xsQW5pbWF0aW9ucygpOwogICAgICAg ICBmcmFtZS0+YW5pbWF0aW9uKCkuc2VydmljZUFuaW1hdGlvbnMoKTsKICAgICB9CiAKICAgICBW ZWN0b3I8UmVmUHRyPERvY3VtZW50Pj4gZG9jdW1lbnRzOwotICAgIGZvciAoRnJhbWUqIGZyYW1l ID0gbV9mcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5l eHQoKSkKKyAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFtZS5wdHIoKTsgZnJhbWU7IGZyYW1l ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkKICAgICAgICAgZG9jdW1lbnRzLmFwcGVu ZChmcmFtZS0+ZG9jdW1lbnQoKSk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRvY3Vt ZW50cy5zaXplKCk7ICsraSkKQEAgLTI2OTksNyArMjY5OSw3IEBAIHZvaWQgRnJhbWVWaWV3Ojpz ZXRCYXNlQmFja2dyb3VuZENvbG9yKGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IpCiAKIHZv aWQgRnJhbWVWaWV3Ojp1cGRhdGVCYWNrZ3JvdW5kUmVjdXJzaXZlbHkoY29uc3QgQ29sb3ImIGJh Y2tncm91bmRDb2xvciwgYm9vbCB0cmFuc3BhcmVudCkKIHsKLSAgICBmb3IgKEZyYW1lKiBmcmFt ZSA9IG1fZnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VO ZXh0KG1fZnJhbWUuZ2V0KCkpKSB7CisgICAgZm9yIChhdXRvKiBmcmFtZSA9IG1fZnJhbWUucHRy KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KG1fZnJhbWUucHRy KCkpKSB7CiAgICAgICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpKSB7CiAg ICAgICAgICAgICB2aWV3LT5zZXRUcmFuc3BhcmVudCh0cmFuc3BhcmVudCk7CiAgICAgICAgICAg ICB2aWV3LT5zZXRCYXNlQmFja2dyb3VuZENvbG9yKGJhY2tncm91bmRDb2xvcik7CkBAIC0zMzU2 LDcgKzMzNTYsNyBAQCBmbG9hdCBGcmFtZVZpZXc6OmFkanVzdFNjcm9sbFN0ZXBGb3JGaXhlZENv bnRlbnQoZmxvYXQgc3RlcCwgU2Nyb2xsYmFyT3JpZW50YXRpbwogICAgICAgICByZXR1cm4gc3Rl cDsKIAogICAgIFRyYWNrZWRSZW5kZXJlckxpc3RIYXNoU2V0KiBwb3NpdGlvbmVkT2JqZWN0cyA9 IG51bGxwdHI7Ci0gICAgaWYgKFJlbmRlclZpZXcqIHJvb3QgPSBtX2ZyYW1lLT5jb250ZW50UmVu ZGVyZXIoKSkgeworICAgIGlmIChSZW5kZXJWaWV3KiByb290ID0gZnJhbWUoKS5jb250ZW50UmVu ZGVyZXIoKSkgewogICAgICAgICBpZiAoIXJvb3QtPmhhc1Bvc2l0aW9uZWRPYmplY3RzKCkpCiAg ICAgICAgICAgICByZXR1cm4gc3RlcDsKICAgICAgICAgcG9zaXRpb25lZE9iamVjdHMgPSByb290 LT5wb3NpdGlvbmVkT2JqZWN0cygpOwpAQCAtMzk4Miw3ICszOTgyLDcgQEAgdm9pZCBGcmFtZVZp ZXc6OnBhaW50Q29udGVudHNGb3JTbmFwc2hvdChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNv bnN0IEludFJlY3QKICAgICAvLyBpbiB0aGUgcmVuZGVyIHRyZWUgb25seS4gVGhpcyB3aWxsIGFs bG93IHVzIHRvIHJlc3RvcmUgdGhlIHNlbGVjdGlvbiBmcm9tIHRoZSBET00KICAgICAvLyBhZnRl ciB3ZSBwYWludCB0aGUgc25hcHNob3QuCiAgICAgaWYgKHNob3VsZFBhaW50U2VsZWN0aW9uID09 IEV4Y2x1ZGVTZWxlY3Rpb24pIHsKLSAgICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSBtX2ZyYW1l LmdldCgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dChtX2ZyYW1l LmdldCgpKSkgeworICAgICAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFtZS5wdHIoKTsgZnJh bWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5wdHIoKSkpIHsK ICAgICAgICAgICAgIGlmIChSZW5kZXJWaWV3KiByb290ID0gZnJhbWUtPmNvbnRlbnRSZW5kZXJl cigpKQogICAgICAgICAgICAgICAgIHJvb3QtPmNsZWFyU2VsZWN0aW9uKCk7CiAgICAgICAgIH0K QEAgLTM5OTgsNyArMzk5OCw3IEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzRm9yU25h cHNob3QoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0CiAKICAgICAvLyBS ZXN0b3JlIHNlbGVjdGlvbi4KICAgICBpZiAoc2hvdWxkUGFpbnRTZWxlY3Rpb24gPT0gRXhjbHVk ZVNlbGVjdGlvbikgewotICAgICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fZnJhbWUuZ2V0KCk7 IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KG1fZnJhbWUuZ2V0KCkp KQorICAgICAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFtZS5wdHIoKTsgZnJhbWU7IGZyYW1l ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5wdHIoKSkpCiAgICAgICAgICAg ICBmcmFtZS0+c2VsZWN0aW9uKCkudXBkYXRlQXBwZWFyYW5jZSgpOwogICAgIH0KIApAQCAtNDQ5 Miw3ICs0NDkyLDcgQEAgYm9vbCBGcmFtZVZpZXc6OmlzRmxpcHBlZERvY3VtZW50KCkgY29uc3QK IAogdm9pZCBGcmFtZVZpZXc6Om5vdGlmeVdpZGdldHNJbkFsbEZyYW1lcyhXaWRnZXROb3RpZmlj YXRpb24gbm90aWZpY2F0aW9uKQogewotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZS5n ZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5n ZXQoKSkpIHsKKyAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFtZS5wdHIoKTsgZnJhbWU7IGZy YW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFtZS5wdHIoKSkpIHsKICAgICAg ICAgaWYgKEZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCkpCiAgICAgICAgICAgICB2aWV3 LT5ub3RpZnlXaWRnZXRzKG5vdGlmaWNhdGlvbik7CiAgICAgfQpAQCAtNDc2Myw3ICs0NzYzLDcg QEAgdm9pZCBGcmFtZVZpZXc6OnNldEV4cG9zZWRSZWN0KEZsb2F0UmVjdCBleHBvc2VkUmVjdCkK ICAgICBtX2V4cG9zZWRSZWN0ID0gZXhwb3NlZFJlY3Q7CiAKICAgICAvLyBGSVhNRTogV2Ugc2hv dWxkIHN1cHBvcnQgY2xpcHBpbmcgdG8gdGhlIGV4cG9zZWQgcmVjdCBmb3Igc3ViZnJhbWVzIGFz IHdlbGwuCi0gICAgaWYgKCFtX2ZyYW1lLT5pc01haW5GcmFtZSgpKQorICAgIGlmICghZnJhbWUo KS5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKFRpbGVkQmFja2luZyog dGlsZWRCYWNraW5nID0gdGhpcy0+dGlsZWRCYWNraW5nKCkpIHsKICAgICAgICAgYWRqdXN0VGls ZWRCYWNraW5nQ292ZXJhZ2UoKTsKQEAgLTQ3ODQsNyArNDc4NCw3IEBAIHZvaWQgRnJhbWVWaWV3 OjpzZXRWaWV3cG9ydFNpemVGb3JDU1NWaWV3cG9ydFVuaXRzKEludFNpemUgc2l6ZSkKICAgICBt X292ZXJyaWRlVmlld3BvcnRTaXplID0gc2l6ZTsKICAgICBtX2hhc092ZXJyaWRlVmlld3BvcnRT aXplID0gdHJ1ZTsKICAgICAKLSAgICBpZiAoRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9mcmFtZS0+ ZG9jdW1lbnQoKSkgeworICAgIGlmIChEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZSgpLmRvY3Vt ZW50KCkpIHsKICAgICAgICAgLy8gRklYTUU6IHRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHVwZGF0 ZVZpZXdwb3J0VW5pdHNPblJlc2l6ZSgpLCBidXQgc3luY2hyb25vdXNseQogICAgICAgICAvLyBk aXJ0eWluZyBzdHlsZSBoZXJlIGNhdXNlcyBhc3NlcnRpb25zIG9uIGlPUyAocmRhcjovL3Byb2Js ZW0vMTk5OTgxNjYpLgogICAgICAgICBkb2N1bWVudC0+c3R5bGVSZXNvbHZlckNoYW5nZWQoRGVm ZXJSZWNhbGNTdHlsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAxYmRiYzlhMTBkYmU3 NjNjMTMzNDhiZmRjZjIxNDZhN2RlZTI2Njc4Li4wMTViNTBmNTNhZTFlYWY0YjQ1ZTIwNzM0MTlk NThhMGZlMGIxZDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTg0LDcgKzg0LDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzY2hlZHVsZUFuaW1hdGlvbigpIG92ZXJyaWRlOwog I2VuZGlmCiAKLSAgICBGcmFtZSYgZnJhbWUoKSBjb25zdCB7IHJldHVybiAqbV9mcmFtZTsgfQor ICAgIEZyYW1lJiBmcmFtZSgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X2Nhc3Q8RnJhbWUmPihtX2Zy YW1lLmdldCgpKTsgfQogCiAgICAgV0VCQ09SRV9FWFBPUlQgUmVuZGVyVmlldyogcmVuZGVyVmll dygpIGNvbnN0OwogCkBAIC02NTksNyArNjU5LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRTaXpl IG1fbWFyZ2luczsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxMaXN0SGFzaFNldDxSZW5kZXJFbWJl ZGRlZE9iamVjdCo+PiBtX2VtYmVkZGVkT2JqZWN0c1RvVXBkYXRlOwotICAgIGNvbnN0IFJlZlB0 cjxGcmFtZT4gbV9mcmFtZTsKKyAgICBjb25zdCBSZWY8RnJhbWU+IG1fZnJhbWU7CiAKICAgICBz dGQ6OnVuaXF1ZV9wdHI8SGFzaFNldDxSZW5kZXJFbGVtZW50Kj4+IG1fc2xvd1JlcGFpbnRPYmpl Y3RzOwogCg==