147788 2015-08-07 11:42:26 -0700 Replace RenderObject::isRooted() logic with isDescendantOf(). 2015-08-07 14:30:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1115825 0 zalan 2015-08-07 11:42:26 -0700 SSIA. 1115827 1 258516 zalan 2015-08-07 11:44:38 -0700 Created attachment 258516 Patch 1115881 2 258516 commit-queue 2015-08-07 14:30:52 -0700 Comment on attachment 258516 Patch Clearing flags on attachment: 258516 Committed r188164: <http://trac.webkit.org/changeset/188164> 1115882 3 commit-queue 2015-08-07 14:30:55 -0700 All reviewed patches have been landed. Closing bug. 258516 2015-08-07 11:44:38 -0700 2015-08-07 14:30:52 -0700 Patch bug-147788-20150807114427.patch text/plain 12484 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzhkNTVhY2YzNWY5NTcx N2I1ZmVjOWZhOGIzZWJjNTU5M2MyNTcxZC4uMDgzZjZiMzYxNWMyNGZjNmY2NTNjOTA2ZjU5MGNi ZTVlNmUyODZkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE1LTA4LTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBSZW5kZXJPYmpl Y3Q6OmlzUm9vdGVkKCkgbG9naWMgd2l0aCBpc0Rlc2NlbmRhbnRPZigpLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3Nzg4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQW5kIHNvbWUgcmVsYXRlZCBjbGVh bnVwcy4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2NoZWR1 bGVSZWxheW91dE9mU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmV4dGVu ZGVkQmFja2dyb3VuZFJlY3RGb3JQYWludGluZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnBhaW50Um9vdEJveEZpbGxM YXllcnMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnNob3VsZFJlcGFpbnRGb3JJbWFnZUFuaW1hdGlvbik6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6 OmlzRGVzY2VuZGFudE9mKToKKyAgICAgICAgKFdlYkNvcmU6OnNjaGVkdWxlUmVsYXlvdXRGb3JT dWJ0cmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6cmVwYWludCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnJlcGFpbnRSZWN0YW5nbGUpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpyZXBhaW50U2xvd1JlcGFpbnRPYmplY3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojppc1Jvb3RlZCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OnVuZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpiYWNrZ3JvdW5kUmVjdCk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKwogMjAxNS0wOC0wNCAgTWF0dCBSYWpjYSAgPG1yYWpj YUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWEgU2Vzc2lvbjogcHVzaCBwYXVzZWQgc3RhdGUg dG8gdGhlIG1lZGlhIHNlc3Npb24gZm9jdXMgbWFuYWdlciBpbnN0ZWFkIG9mIHBvbGxpbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAzMDU2ZTMzYjZmNTQxYWUwYjFiYWExMGQ0ZTFi OThlNjU1YmY2YTM0Li5jOGZiNWQ5ZGE0ZGY0NTE4NDUzZmE2YWE2MGM5ZDBhNjIwMjJmNmU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNTg3LDcgKzI1ODcsNyBAQCBzdGF0aWMg Ym9vbCBpc09iamVjdEFuY2VzdG9yQ29udGFpbmVyT2YoUmVuZGVyT2JqZWN0KiBhbmNlc3Rvciwg UmVuZGVyT2JqZWN0KiBkZQogdm9pZCBGcmFtZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXRPZlN1YnRy ZWUoUmVuZGVyRWxlbWVudCYgbmV3UmVsYXlvdXRSb290KQogewogICAgIEFTU0VSVChyZW5kZXJW aWV3KCkpOwotICAgIFJlbmRlclZpZXcmIHJlbmRlclZpZXcgPSAqdGhpcy0+cmVuZGVyVmlldygp OworICAgIGNvbnN0IFJlbmRlclZpZXcmIHJlbmRlclZpZXcgPSAqdGhpcy0+cmVuZGVyVmlldygp OwogCiAgICAgLy8gVHJ5IHRvIGNhdGNoIHVubmVjZXNzYXJ5IHdvcmsgZHVyaW5nIHJlbmRlciB0 cmVlIHRlYXJkb3duLgogICAgIEFTU0VSVCghcmVuZGVyVmlldy5kb2N1bWVudEJlaW5nRGVzdHJv eWVkKCkpOwpAQCAtMjg4NSw3ICsyODg1LDcgQEAgSW50UmVjdCBGcmFtZVZpZXc6OmV4dGVuZGVk QmFja2dyb3VuZFJlY3RGb3JQYWludGluZygpIGNvbnN0CiAgICAgaWYgKCFyZW5kZXJWaWV3KQog ICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogICAgIAotICAgIExheW91dFJlY3QgZXh0ZW5kZWRS ZWN0ID0gcmVuZGVyVmlldy0+dW5leHRlbmRlZEJhY2tncm91bmRSZWN0KHJlbmRlclZpZXcpOwor ICAgIExheW91dFJlY3QgZXh0ZW5kZWRSZWN0ID0gcmVuZGVyVmlldy0+dW5leHRlbmRlZEJhY2tn cm91bmRSZWN0KCk7CiAgICAgaWYgKCF0aWxlZEJhY2tpbmctPmhhc01hcmdpbnMoKSkKICAgICAg ICAgcmV0dXJuIHNuYXBwZWRJbnRSZWN0KGV4dGVuZGVkUmVjdCk7CiAgICAgCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDNlODZjYzY4OWU0YjRmNjJlMjIyMmZjZTYx MjFhZWIyZWFjNjI5OGUuLmM2NjI5YmQ4NDYyOGM0NWM4NWU2MzM3NGI2NDZmOTg4ZjMzYTBmNjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xMjQ5LDcgKzEyNDks NyBAQCB2b2lkIFJlbmRlckJveDo6cGFpbnRSb290Qm94RmlsbExheWVycyhjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbykKICAgICBjb25zdCBGaWxsTGF5ZXIqIGJnTGF5ZXIgPSByb290QmFja2dy b3VuZFJlbmRlcmVyLnN0eWxlKCkuYmFja2dyb3VuZExheWVycygpOwogICAgIENvbG9yIGJnQ29s b3IgPSByb290QmFja2dyb3VuZFJlbmRlcmVyLnN0eWxlKCkudmlzaXRlZERlcGVuZGVudENvbG9y KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKIAotICAgIHBhaW50RmlsbExheWVycyhwYWlu dEluZm8sIGJnQ29sb3IsIGJnTGF5ZXIsIHZpZXcoKS5iYWNrZ3JvdW5kUmVjdCh0aGlzKSwgQmFj a2dyb3VuZEJsZWVkTm9uZSwgQ29tcG9zaXRlU291cmNlT3ZlciwgJnJvb3RCYWNrZ3JvdW5kUmVu ZGVyZXIpOworICAgIHBhaW50RmlsbExheWVycyhwYWludEluZm8sIGJnQ29sb3IsIGJnTGF5ZXIs IHZpZXcoKS5iYWNrZ3JvdW5kUmVjdCgpLCBCYWNrZ3JvdW5kQmxlZWROb25lLCBDb21wb3NpdGVT b3VyY2VPdmVyLCAmcm9vdEJhY2tncm91bmRSZW5kZXJlcik7CiB9CiAKIEJhY2tncm91bmRCbGVl ZEF2b2lkYW5jZSBSZW5kZXJCb3g6OmRldGVybWluZUJhY2tncm91bmRCbGVlZEF2b2lkYW5jZShH cmFwaGljc0NvbnRleHQqIGNvbnRleHQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRWxlbWVudC5jcHAKaW5kZXggNTBmOGEzZTVjNzFlNWEyNTM1NmRhYTRkZTk0ZjAyZDIz MWJiMDM3MS4uYTc5MWJkMTkwNTc5Y2EyYTYzYmNhMjc2Yzk2Njk5YTE2NTVjNWNmMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtMTQyNyw3ICsxNDI3 LDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkUmVwYWludEZvckltYWdlQW5pbWF0aW9uKGNvbnN0IFJl bmRlckVsZW1lbnQmIHJlbmRlcmVyLCBjb25zdAogICAgICAgICBiYWNrZ3JvdW5kSXNQYWludGVk QnlSb290ID0gIXJvb3RSZW5kZXJlci5oYXNCYWNrZ3JvdW5kKCk7CiAKICAgICB9Ci0gICAgTGF5 b3V0UmVjdCBiYWNrZ3JvdW5kUGFpbnRpbmdSZWN0ID0gYmFja2dyb3VuZElzUGFpbnRlZEJ5Um9v dCA/IHJlbmRlcmVyLnZpZXcoKS5iYWNrZ3JvdW5kUmVjdCgmcmVuZGVyZXIudmlldygpKSA6IHJl bmRlcmVyLmFic29sdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCgpOworICAgIExheW91dFJlY3QgYmFj a2dyb3VuZFBhaW50aW5nUmVjdCA9IGJhY2tncm91bmRJc1BhaW50ZWRCeVJvb3QgPyByZW5kZXJl ci52aWV3KCkuYmFja2dyb3VuZFJlY3QoKSA6IHJlbmRlcmVyLmFic29sdXRlQ2xpcHBlZE92ZXJm bG93UmVjdCgpOwogICAgIGlmICghdmlzaWJsZVJlY3QuaW50ZXJzZWN0cyhlbmNsb3NpbmdJbnRS ZWN0KGJhY2tncm91bmRQYWludGluZ1JlY3QpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGFlNjQxYTQ4YWY2 NjA3Y2NlMjVmYjBlMGZhZjc3NzEzNGRkZDA0YjAuLjhhNGU1M2U0ZDFlMmUxMjA5YTczMjE3MDdl NDQ4MWNiMTQ5MGJkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3Qu Y3BwCkBAIC0xNDEsMTAgKzE0MSwxMCBAQCBSZW5kZXJUaGVtZSYgUmVuZGVyT2JqZWN0Ojp0aGVt ZSgpIGNvbnN0CiAgICAgcmV0dXJuIGRvY3VtZW50KCkucGFnZSgpLT50aGVtZSgpOwogfQogCi1i b29sIFJlbmRlck9iamVjdDo6aXNEZXNjZW5kYW50T2YoY29uc3QgUmVuZGVyT2JqZWN0KiBvYmop IGNvbnN0Citib29sIFJlbmRlck9iamVjdDo6aXNEZXNjZW5kYW50T2YoY29uc3QgUmVuZGVyT2Jq ZWN0KiBhbmNlc3RvcikgY29uc3QKIHsKLSAgICBmb3IgKGNvbnN0IFJlbmRlck9iamVjdCogciA9 IHRoaXM7IHI7IHIgPSByLT5tX3BhcmVudCkgewotICAgICAgICBpZiAociA9PSBvYmopCisgICAg Zm9yIChjb25zdCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gdGhpczsgcmVuZGVyZXI7IHJlbmRl cmVyID0gcmVuZGVyZXItPm1fcGFyZW50KSB7CisgICAgICAgIGlmIChyZW5kZXJlciA9PSBhbmNl c3RvcikKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7 CkBAIC01NzEsMTMgKzU3MSwxMyBAQCB2b2lkIFJlbmRlck9iamVjdDo6Y2xlYXJOZWVkc0xheW91 dCgpCiAKIHN0YXRpYyB2b2lkIHNjaGVkdWxlUmVsYXlvdXRGb3JTdWJ0cmVlKFJlbmRlckVsZW1l bnQmIHJlbmRlcmVyKQogewotICAgIGlmICghaXM8UmVuZGVyVmlldz4ocmVuZGVyZXIpKSB7Ci0g ICAgICAgIGlmICghcmVuZGVyZXIuaXNSb290ZWQoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgcmVuZGVyZXIudmlldygpLmZyYW1lVmlldygpLnNjaGVkdWxlUmVsYXlvdXRPZlN1YnRy ZWUocmVuZGVyZXIpOworICAgIGlmIChpczxSZW5kZXJWaWV3PihyZW5kZXJlcikpIHsKKyAgICAg ICAgZG93bmNhc3Q8UmVuZGVyVmlldz4ocmVuZGVyZXIpLmZyYW1lVmlldygpLnNjaGVkdWxlUmVs YXlvdXQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBkb3duY2FzdDxSZW5kZXJWaWV3 PihyZW5kZXJlcikuZnJhbWVWaWV3KCkuc2NoZWR1bGVSZWxheW91dCgpOworCisgICAgaWYgKHJl bmRlcmVyLmlzUm9vdGVkKCkpCisgICAgICAgIHJlbmRlcmVyLnZpZXcoKS5mcmFtZVZpZXcoKS5z Y2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKHJlbmRlcmVyKTsKIH0KIAogdm9pZCBSZW5kZXJPYmpl Y3Q6Om1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KFNjaGVkdWxlUmVsYXlvdXQgc2NoZWR1 bGVSZWxheW91dCwgUmVuZGVyRWxlbWVudCogbmV3Um9vdCkKQEAgLTEyNDksNjEgKzEyNDksNTgg QEAgdm9pZCBSZW5kZXJPYmplY3Q6OnJlcGFpbnRVc2luZ0NvbnRhaW5lcihjb25zdCBSZW5kZXJM YXllck1vZGVsT2JqZWN0KiByZXBhaW50Q28KIHZvaWQgUmVuZGVyT2JqZWN0OjpyZXBhaW50KCkg Y29uc3QKIHsKICAgICAvLyBEb24ndCByZXBhaW50IGlmIHdlJ3JlIHVucm9vdGVkIChub3RlIHRo YXQgdmlldygpIHN0aWxsIHJldHVybnMgdGhlIHZpZXcgd2hlbiB1bnJvb3RlZCkKLSAgICBSZW5k ZXJWaWV3KiB2aWV3OwotICAgIGlmICghaXNSb290ZWQoJnZpZXcpKQorICAgIGlmICghaXNSb290 ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHZpZXctPnByaW50aW5nKCkpCi0gICAg ICAgIHJldHVybjsgLy8gRG9uJ3QgcmVwYWludCBpZiB3ZSdyZSBwcmludGluZy4KKyAgICBjb25z dCBSZW5kZXJWaWV3JiB2aWV3ID0gdGhpcy0+dmlldygpOworICAgIGlmICh2aWV3LnByaW50aW5n KCkpCisgICAgICAgIHJldHVybjsKIAogICAgIFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHJlcGFp bnRDb250YWluZXIgPSBjb250YWluZXJGb3JSZXBhaW50KCk7Ci0gICAgcmVwYWludFVzaW5nQ29u dGFpbmVyKHJlcGFpbnRDb250YWluZXIgPyByZXBhaW50Q29udGFpbmVyIDogdmlldywgY2xpcHBl ZE92ZXJmbG93UmVjdEZvclJlcGFpbnQocmVwYWludENvbnRhaW5lcikpOworICAgIHJlcGFpbnRV c2luZ0NvbnRhaW5lcihyZXBhaW50Q29udGFpbmVyID8gcmVwYWludENvbnRhaW5lciA6ICZ2aWV3 LCBjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChyZXBhaW50Q29udGFpbmVyKSk7CiB9CiAK IHZvaWQgUmVuZGVyT2JqZWN0OjpyZXBhaW50UmVjdGFuZ2xlKGNvbnN0IExheW91dFJlY3QmIHIs IGJvb2wgc2hvdWxkQ2xpcFRvTGF5ZXIpIGNvbnN0CiB7CiAgICAgLy8gRG9uJ3QgcmVwYWludCBp ZiB3ZSdyZSB1bnJvb3RlZCAobm90ZSB0aGF0IHZpZXcoKSBzdGlsbCByZXR1cm5zIHRoZSB2aWV3 IHdoZW4gdW5yb290ZWQpCi0gICAgUmVuZGVyVmlldyogdmlldzsKLSAgICBpZiAoIWlzUm9vdGVk KCZ2aWV3KSkKKyAgICBpZiAoIWlzUm9vdGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlm ICh2aWV3LT5wcmludGluZygpKQotICAgICAgICByZXR1cm47IC8vIERvbid0IHJlcGFpbnQgaWYg d2UncmUgcHJpbnRpbmcuCisgICAgY29uc3QgUmVuZGVyVmlldyYgdmlldyA9IHRoaXMtPnZpZXco KTsKKyAgICBpZiAodmlldy5wcmludGluZygpKQorICAgICAgICByZXR1cm47CiAKICAgICBMYXlv dXRSZWN0IGRpcnR5UmVjdChyKTsKLQogICAgIC8vIEZJWE1FOiBsYXlvdXREZWx0YSBuZWVkcyB0 byBiZSBhcHBsaWVkIGluIHBhcnRzIGJlZm9yZS9hZnRlciB0cmFuc2Zvcm1zIGFuZAogICAgIC8v IHJlcGFpbnQgY29udGFpbmVycy4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMzA4Ci0gICAgZGlydHlSZWN0Lm1vdmUodmlldy0+bGF5b3V0RGVsdGEoKSk7CisgICAg ZGlydHlSZWN0Lm1vdmUodmlldy5sYXlvdXREZWx0YSgpKTsKIAogICAgIFJlbmRlckxheWVyTW9k ZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIgPSBjb250YWluZXJGb3JSZXBhaW50KCk7CiAgICAg Y29tcHV0ZVJlY3RGb3JSZXBhaW50KHJlcGFpbnRDb250YWluZXIsIGRpcnR5UmVjdCk7Ci0gICAg cmVwYWludFVzaW5nQ29udGFpbmVyKHJlcGFpbnRDb250YWluZXIgPyByZXBhaW50Q29udGFpbmVy IDogdmlldywgZGlydHlSZWN0LCBzaG91bGRDbGlwVG9MYXllcik7CisgICAgcmVwYWludFVzaW5n Q29udGFpbmVyKHJlcGFpbnRDb250YWluZXIgPyByZXBhaW50Q29udGFpbmVyIDogJnZpZXcsIGRp cnR5UmVjdCwgc2hvdWxkQ2xpcFRvTGF5ZXIpOwogfQogCiB2b2lkIFJlbmRlck9iamVjdDo6cmVw YWludFNsb3dSZXBhaW50T2JqZWN0KCkgY29uc3QKIHsKICAgICAvLyBEb24ndCByZXBhaW50IGlm IHdlJ3JlIHVucm9vdGVkIChub3RlIHRoYXQgdmlldygpIHN0aWxsIHJldHVybnMgdGhlIHZpZXcg d2hlbiB1bnJvb3RlZCkKLSAgICBSZW5kZXJWaWV3KiB2aWV3OwotICAgIGlmICghaXNSb290ZWQo JnZpZXcpKQorICAgIGlmICghaXNSb290ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8g RG9uJ3QgcmVwYWludCBpZiB3ZSdyZSBwcmludGluZy4KLSAgICBpZiAodmlldy0+cHJpbnRpbmco KSkKKyAgICBjb25zdCBSZW5kZXJWaWV3JiB2aWV3ID0gdGhpcy0+dmlldygpOworICAgIGlmICh2 aWV3LnByaW50aW5nKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlbmRlckxheWVyTW9kZWxP YmplY3QqIHJlcGFpbnRDb250YWluZXIgPSBjb250YWluZXJGb3JSZXBhaW50KCk7CisgICAgY29u c3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciA9IGNvbnRhaW5lckZv clJlcGFpbnQoKTsKICAgICBpZiAoIXJlcGFpbnRDb250YWluZXIpCi0gICAgICAgIHJlcGFpbnRD b250YWluZXIgPSB2aWV3OworICAgICAgICByZXBhaW50Q29udGFpbmVyID0gJnZpZXc7CiAKICAg ICBib29sIHNob3VsZENsaXBUb0xheWVyID0gdHJ1ZTsKICAgICBJbnRSZWN0IHJlcGFpbnRSZWN0 OwotCiAgICAgLy8gSWYgdGhpcyBpcyB0aGUgcm9vdCBiYWNrZ3JvdW5kLCB3ZSBuZWVkIHRvIGNo ZWNrIGlmIHRoZXJlIGlzIGFuIGV4dGVuZGVkIGJhY2tncm91bmQgcmVjdC4gSWYKICAgICAvLyB0 aGVyZSBpcywgdGhlbiB3ZSBzaG91bGQgbm90IGFsbG93IHBhaW50aW5nIHRvIGNsaXAgdG8gdGhl IGxheWVyIHNpemUuCiAgICAgaWYgKGlzUm9vdCgpIHx8IGlzQm9keSgpKSB7Ci0gICAgICAgIHNo b3VsZENsaXBUb0xheWVyID0gIXZpZXctPmZyYW1lVmlldygpLmhhc0V4dGVuZGVkQmFja2dyb3Vu ZFJlY3RGb3JQYWludGluZygpOwotICAgICAgICByZXBhaW50UmVjdCA9IHNuYXBwZWRJbnRSZWN0 KHZpZXctPmJhY2tncm91bmRSZWN0KHZpZXcpKTsKKyAgICAgICAgc2hvdWxkQ2xpcFRvTGF5ZXIg PSAhdmlldy5mcmFtZVZpZXcoKS5oYXNFeHRlbmRlZEJhY2tncm91bmRSZWN0Rm9yUGFpbnRpbmco KTsKKyAgICAgICAgcmVwYWludFJlY3QgPSBzbmFwcGVkSW50UmVjdCh2aWV3LmJhY2tncm91bmRS ZWN0KCkpOwogICAgIH0gZWxzZQogICAgICAgICByZXBhaW50UmVjdCA9IHNuYXBwZWRJbnRSZWN0 KGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KHJlcGFpbnRDb250YWluZXIpKTsKIApAQCAt MTc2NCwxOSArMTc2MSw5IEBAIExheW91dFJlY3QgUmVuZGVyT2JqZWN0Ojpsb2NhbENhcmV0UmVj dChJbmxpbmVCb3gqLCBpbnQsIExheW91dFVuaXQqIGV4dHJhV2lkdGhUCiAgICAgcmV0dXJuIExh eW91dFJlY3QoKTsKIH0KIAotYm9vbCBSZW5kZXJPYmplY3Q6OmlzUm9vdGVkKFJlbmRlclZpZXcq KiB2aWV3KSBjb25zdAorYm9vbCBSZW5kZXJPYmplY3Q6OmlzUm9vdGVkKCkgY29uc3QKIHsKLSAg ICBjb25zdCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gdGhpczsKLSAgICB3aGlsZSAocmVuZGVy ZXItPnBhcmVudCgpKQotICAgICAgICByZW5kZXJlciA9IHJlbmRlcmVyLT5wYXJlbnQoKTsKLQot ICAgIGlmICghaXM8UmVuZGVyVmlldz4oKnJlbmRlcmVyKSkKLSAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgaWYgKHZpZXcpCi0gICAgICAgICp2aWV3ID0gY29uc3RfY2FzdDxSZW5kZXJWaWV3 Kj4oZG93bmNhc3Q8UmVuZGVyVmlldz4ocmVuZGVyZXIpKTsKLQotICAgIHJldHVybiB0cnVlOwor ICAgIHJldHVybiBpc0Rlc2NlbmRhbnRPZigmdmlldygpKTsKIH0KIAogUmVzcGVjdEltYWdlT3Jp ZW50YXRpb25FbnVtIFJlbmRlck9iamVjdDo6c2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24o KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGY1Y2Qz NTVmZmM0ZDg3YzBhNmNhMGNiOGJhMjkyOTUyMDcxMDk4NjAuLmUxNzAwYTRlYzg5YTQ2NWIwYTFm MzM1Y2M1ZWJhZDNjZDQyNzRkOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmgKQEAgLTU2OCw4ICs1NjgsOCBAQCBwdWJsaWM6CiAKICAgICBSZW5kZXJWaWV3JiB2aWV3 KCkgY29uc3QgeyByZXR1cm4gKmRvY3VtZW50KCkucmVuZGVyVmlldygpOyB9OwogCi0gICAgLy8g UmV0dXJucyB0cnVlIGlmIHRoaXMgcmVuZGVyZXIgaXMgcm9vdGVkLCBhbmQgb3B0aW9uYWxseSBy ZXR1cm5zIHRoZSBob3N0aW5nIHZpZXcgKHRoZSByb290IG9mIHRoZSBoaWVyYXJjaHkpLgotICAg IGJvb2wgaXNSb290ZWQoUmVuZGVyVmlldyoqID0gbnVsbHB0cikgY29uc3Q7CisgICAgLy8gUmV0 dXJucyB0cnVlIGlmIHRoaXMgcmVuZGVyZXIgaXMgcm9vdGVkLgorICAgIGJvb2wgaXNSb290ZWQo KSBjb25zdDsKIAogICAgIE5vZGUqIG5vZGUoKSBjb25zdCB7IHJldHVybiBpc0Fub255bW91cygp ID8gbnVsbHB0ciA6ICZtX25vZGU7IH0KICAgICBOb2RlKiBub25Qc2V1ZG9Ob2RlKCkgY29uc3Qg eyByZXR1cm4gaXNQc2V1ZG9FbGVtZW50KCkgPyBudWxscHRyIDogbm9kZSgpOyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggNjJhYmZlMGI1ZTEyNDZhN2RlZmZi YzNlMWMzYjkzYmNiOWE5NDdiNy4uNDI4YzE2MDI5YmMwNzVmNjQ4YzIyZGE1NzFlNGNjODdiY2Y5 YzkwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtMTE2Miwx OSArMTE2MiwxOSBAQCBib29sIFJlbmRlclZpZXc6OnJvb3RCYWNrZ3JvdW5kSXNFbnRpcmVseUZp eGVkKCkgY29uc3QKICAgICByZXR1cm4gcm9vdE9iamVjdC0+cmVuZGVyZXJGb3JSb290QmFja2dy b3VuZCgpLmhhc0VudGlyZWx5Rml4ZWRCYWNrZ3JvdW5kKCk7CiB9CiAgICAgCi1MYXlvdXRSZWN0 IFJlbmRlclZpZXc6OnVuZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjdChSZW5kZXJCb3gqKSBjb25zdAor TGF5b3V0UmVjdCBSZW5kZXJWaWV3Ojp1bmV4dGVuZGVkQmFja2dyb3VuZFJlY3QoKSBjb25zdAog ewogICAgIC8vIEZJWE1FOiBXaGF0IGlzIHRoaXM/IE5lZWQgdG8gcGF0Y2ggZm9yIG5ldyBjb2x1 bW5zPwogICAgIHJldHVybiB1bnNjYWxlZERvY3VtZW50UmVjdCgpOwogfQogICAgIAotTGF5b3V0 UmVjdCBSZW5kZXJWaWV3OjpiYWNrZ3JvdW5kUmVjdChSZW5kZXJCb3gqIGJhY2tncm91bmRSZW5k ZXJlcikgY29uc3QKK0xheW91dFJlY3QgUmVuZGVyVmlldzo6YmFja2dyb3VuZFJlY3QoKSBjb25z dAogewogICAgIC8vIEZJWE1FOiBOZXcgY29sdW1ucyBjYXJlIGFib3V0IHRoaXM/CiAgICAgaWYg KGZyYW1lVmlldygpLmhhc0V4dGVuZGVkQmFja2dyb3VuZFJlY3RGb3JQYWludGluZygpKQogICAg ICAgICByZXR1cm4gZnJhbWVWaWV3KCkuZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjdEZvclBhaW50aW5n KCk7CiAKLSAgICByZXR1cm4gdW5leHRlbmRlZEJhY2tncm91bmRSZWN0KGJhY2tncm91bmRSZW5k ZXJlcik7CisgICAgcmV0dXJuIHVuZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjdCgpOwogfQogCiBJbnRS ZWN0IFJlbmRlclZpZXc6OmRvY3VtZW50UmVjdCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuaAppbmRleCA3MTYwYzlkZjM2ZDhlZmNkZmIzYzI3MjYwMGMxMzNjYmZjZDE2 MDU3Li5jODAwZWZiNGUyNDk0ODg3OTdkM2M0MzhmNzNkZTc1YjQ0YzlkNDk1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAgLTE4OCw4ICsxODgsOCBAQCBwdWJsaWM6CiAg ICAgV0VCQ09SRV9FWFBPUlQgYm9vbCB1c2VzQ29tcG9zaXRpbmcoKSBjb25zdDsKIAogICAgIFdF QkNPUkVfRVhQT1JUIEludFJlY3QgdW5zY2FsZWREb2N1bWVudFJlY3QoKSBjb25zdDsKLSAgICBM YXlvdXRSZWN0IHVuZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjdChSZW5kZXJCb3gqIGJhY2tncm91bmRS ZW5kZXJlcikgY29uc3Q7Ci0gICAgTGF5b3V0UmVjdCBiYWNrZ3JvdW5kUmVjdChSZW5kZXJCb3gq IGJhY2tncm91bmRSZW5kZXJlcikgY29uc3Q7CisgICAgTGF5b3V0UmVjdCB1bmV4dGVuZGVkQmFj a2dyb3VuZFJlY3QoKSBjb25zdDsKKyAgICBMYXlvdXRSZWN0IGJhY2tncm91bmRSZWN0KCkgY29u c3Q7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBJbnRSZWN0IGRvY3VtZW50UmVjdCgpIGNvbnN0Owog Cg==