53941 2011-02-07 14:22:44 -0800 Inform the UIProcess when main frame scrollbars change 2011-02-07 14:32:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sam sam oldest_to_newest 346786 0 sam 2011-02-07 14:22:44 -0800 Inform the UIProcess when main frame scrollbars change 346790 1 81519 sam 2011-02-07 14:25:11 -0800 Created attachment 81519 Patch 346791 2 sam 2011-02-07 14:26:20 -0800 <rdar://problem/8967496> 346793 3 81519 bweinstein 2011-02-07 14:28:01 -0800 Comment on attachment 81519 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81519&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:2544 > + printf("WebPageProxy::didChangeScrollbarsForMainFrame %s %s\n", hasHorizontalScrollbar ? "YES" : "NO", hasVecticalScrollbar ? "YES" : "NO"); Did you mean to keep this? 346796 4 81519 darin 2011-02-07 14:30:01 -0800 Comment on attachment 81519 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81519&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:2539 > +void WebPageProxy::didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVecticalScrollbar) vectical? 346797 5 sam 2011-02-07 14:32:42 -0800 Landed in r77846. 81519 2011-02-07 14:25:11 -0800 2011-02-07 14:30:01 -0800 Patch bug-53941-20110207142510.patch text/plain 9783 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3ODQ0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDItMDcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbmZvcm0gdGhlIFVJUHJvY2VzcyB3aGVuIG1haW4gZnJhbWUgc2Nyb2xs YmFycyBjaGFuZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUzOTQxCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAg ICAgKFdLUGFnZUhhc0hvcml6b250YWxTY3JvbGxiYXIpOgorICAgICAgICAoV0tQYWdlSGFzVmVy dGljYWxTY3JvbGxiYXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAg ICAgICAgQWRkIEFQSSB0byBxdWVyeSB3aGV0aGVyIHRoZSBtYWluIGZyYW1lIGhhcyBzY3JvbGxi YXJzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpjbG9zZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vz c0RpZENyYXNoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDaGFuZ2VTY3Jv bGxiYXJzRm9yTWFpbkZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFzSG9yaXpvbnRhbFNjcm9sbGJhcik6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFzVmVydGljYWxTY3JvbGxiYXIpOgor ICAgICAgICBTdG9yZS91cGRhdGUgbWFpbiBmcmFtZSBzY3JvbGxiYXIgc3RhdGUuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViQ2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2VkKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAoV2ViS2l0 OjpXZWJDaHJvbWVDbGllbnQ6OldlYkNocm9tZUNsaWVudCk6CisgICAgICAgIFBvc3QgbWVzc2Fn ZSB3aGVuIG1haW4gZnJhbWUgc2Nyb2xsYmFyIHN0YXRlIGNoYW5nZXMuCisKIDIwMTEtMDItMDcg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAJKHJldmlzaW9uIDc3ODI4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw2ICsxMzIsOCBAQCBXZWJQYWdl UHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiBwCiAgICAgLCBtX3BlbmRpbmdMZWFybk9y SWdub3JlV29yZE1lc3NhZ2VDb3VudCgwKQogICAgICwgbV9tYWluRnJhbWVIYXNDdXN0b21SZXBy ZXNlbnRhdGlvbihmYWxzZSkKICAgICAsIG1fY3VycmVudERyYWdPcGVyYXRpb24oRHJhZ09wZXJh dGlvbk5vbmUpCisgICAgLCBtX21haW5GcmFtZUhhc0hvcml6b250YWxTY3JvbGxiYXIoZmFsc2Up CisgICAgLCBtX21haW5GcmFtZUhhc1ZlcnRpY2FsU2Nyb2xsYmFyKGZhbHNlKQogewogI2lmbmRl ZiBOREVCVUcKICAgICB3ZWJQYWdlUHJveHlDb3VudGVyLmluY3JlbWVudCgpOwpAQCAtMjc5LDYg KzI4MSw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjbG9zZSgpCiAKICAgICBtX3Rvb2xUaXAgPSBT dHJpbmcoKTsKIAorICAgIG1fbWFpbkZyYW1lSGFzSG9yaXpvbnRhbFNjcm9sbGJhciA9IGZhbHNl OworICAgIG1fbWFpbkZyYW1lSGFzVmVydGljYWxTY3JvbGxiYXIgPSBmYWxzZTsKKwogICAgIGlu dmFsaWRhdGVDYWxsYmFja01hcChtX3ZvaWRDYWxsYmFja3MpOwogICAgIGludmFsaWRhdGVDYWxs YmFja01hcChtX2RhdGFDYWxsYmFja3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3N0 cmluZ0NhbGxiYWNrcyk7CkBAIC0yMzc5LDYgKzIzODQsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cHJvY2Vzc0RpZENyYXNoKCkKIAogICAgIG1fdG9vbFRpcCA9IFN0cmluZygpOwogCisgICAgbV9t YWluRnJhbWVIYXNIb3Jpem9udGFsU2Nyb2xsYmFyID0gZmFsc2U7CisgICAgbV9tYWluRnJhbWVI YXNWZXJ0aWNhbFNjcm9sbGJhciA9IGZhbHNlOworCiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFw KG1fdm9pZENhbGxiYWNrcyk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fZGF0YUNhbGxi YWNrcyk7CiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc3RyaW5nQ2FsbGJhY2tzKTsKQEAg LTI1MjgsNiArMjUzNiwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tcGxldGVSdWJiZXJC YW5kCiAgICAgbV91aUNsaWVudC5kaWRDb21wbGV0ZVJ1YmJlckJhbmRGb3JNYWluRnJhbWUodGhp cywgaW5pdGlhbE92ZXJoYW5nKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmRpZENoYW5nZVNj cm9sbGJhcnNGb3JNYWluRnJhbWUoYm9vbCBoYXNIb3Jpem9udGFsU2Nyb2xsYmFyLCBib29sIGhh c1ZlY3RpY2FsU2Nyb2xsYmFyKQoreworICAgIG1fbWFpbkZyYW1lSGFzSG9yaXpvbnRhbFNjcm9s bGJhciA9IGhhc0hvcml6b250YWxTY3JvbGxiYXI7CisgICAgbV9tYWluRnJhbWVIYXNWZXJ0aWNh bFNjcm9sbGJhciA9IGhhc1ZlY3RpY2FsU2Nyb2xsYmFyOworICAgIAorICAgIHByaW50ZigiV2Vi UGFnZVByb3h5OjpkaWRDaGFuZ2VTY3JvbGxiYXJzRm9yTWFpbkZyYW1lICVzICVzXG4iLCBoYXNI b3Jpem9udGFsU2Nyb2xsYmFyID8gIllFUyIgOiAiTk8iLCBoYXNWZWN0aWNhbFNjcm9sbGJhciA/ ICJZRVMiIDogIk5PIik7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkaW5n RGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2Um IGRhdGFSZWZlcmVuY2UpCiB7CiAgICAgbV9wYWdlQ2xpZW50LT5kaWRGaW5pc2hMb2FkaW5nRGF0 YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGRhdGFSZWZlcmVuY2UpOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gNzc4MjgpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2Niw2 ICsyNjYsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCB1c2VGaXhlZExheW91dCgpIGNvbnN0IHsgcmV0 dXJuIG1fdXNlRml4ZWRMYXlvdXQ7IH07CiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgZml4 ZWRMYXlvdXRTaXplKCkgY29uc3QgeyByZXR1cm4gbV9maXhlZExheW91dFNpemU7IH07CiAKKyAg ICBib29sIGhhc0hvcml6b250YWxTY3JvbGxiYXIoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFt ZUhhc0hvcml6b250YWxTY3JvbGxiYXI7IH0KKyAgICBib29sIGhhc1ZlcnRpY2FsU2Nyb2xsYmFy KCkgY29uc3QgeyByZXR1cm4gbV9tYWluRnJhbWVIYXNWZXJ0aWNhbFNjcm9sbGJhcjsgfQorCiAj aWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgc2VuZEFjY2Vzc2liaWxpdHlQcmVzZW50ZXJUb2tl bihjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJik7CiAjZW5kaWYKQEAgLTQ2OCw2ICs0NzEs NyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVxdWVzdEdlb2xvY2F0aW9uUGVybWlzc2lvbkZvckZy YW1lKHVpbnQ2NF90IGdlb2xvY2F0aW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBvcmln aW5JZGVudGlmaWVyKTsKICAgICB2b2lkIHJ1bk1vZGFsKCkgeyBtX3VpQ2xpZW50LnJ1bk1vZGFs KHRoaXMpOyB9CiAgICAgdm9pZCBkaWRDb21wbGV0ZVJ1YmJlckJhbmRGb3JNYWluRnJhbWUoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYpOworICAgIHZvaWQgZGlkQ2hhbmdlU2Nyb2xsYmFyc0Zvck1h aW5GcmFtZShib29sIGhhc0hvcml6b250YWxTY3JvbGxiYXIsIGJvb2wgaGFzVmVjdGljYWxTY3Jv bGxiYXIpOwogCiAgICAgdm9pZCByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogICAgIHZvaWQgcmVh dHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKik7CkBAIC02 NjcsNiArNjcxLDkgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpEcmFnT3BlcmF0aW9uIG1fY3Vy cmVudERyYWdPcGVyYXRpb247CiAKICAgICBTdHJpbmcgbV9wZW5kaW5nQVBJUmVxdWVzdFVSTDsK KworICAgIGJvb2wgbV9tYWluRnJhbWVIYXNIb3Jpem9udGFsU2Nyb2xsYmFyOworICAgIGJvb2wg bV9tYWluRnJhbWVIYXNWZXJ0aWNhbFNjcm9sbGJhcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiA3NzgyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDcg QEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBQcmludEZyYW1lKHVpbnQ2NF90IGZy YW1lSUQpIC0+ICgpCiAgICAgUnVuTW9kYWwoKQogICAgIERpZENvbXBsZXRlUnViYmVyQmFuZEZv ck1haW5GcmFtZShXZWJDb3JlOjpJbnRTaXplIGluaXRpYWxPdmVyaGFuZykKKyAgICBEaWRDaGFu Z2VTY3JvbGxiYXJzRm9yTWFpbkZyYW1lKGJvb2wgaGFzSG9yaXpvbnRhbFNjcm9sbGJhciwgYm9v bCBoYXNWZXJ0aWNhbFNjcm9sbGJhcikKIAogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JF KQogICAgIFBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKFdlYkNvcmU6OkludFNpemUgZGVsdGEpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gNzc4 MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjkxLDYgKzI5MSwxNiBAQCBXS1NpemUgV0tQYWdlRml4ZWRMYXlvdXRTaXpl KFdLUGFnZVJlZiBwCiAgICAgcmV0dXJuIHRvQVBJKHRvSW1wbChwYWdlUmVmKS0+Zml4ZWRMYXlv dXRTaXplKCkpOwogfQogCitib29sIFdLUGFnZUhhc0hvcml6b250YWxTY3JvbGxiYXIoV0tQYWdl UmVmIHBhZ2VSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+aGFzSG9yaXpvbnRh bFNjcm9sbGJhcigpOworfQorCitib29sIFdLUGFnZUhhc1ZlcnRpY2FsU2Nyb2xsYmFyKFdLUGFn ZVJlZiBwYWdlUmVmKQoreworICAgIHJldHVybiB0b0ltcGwocGFnZVJlZiktPmhhc1ZlcnRpY2Fs U2Nyb2xsYmFyKCk7Cit9CisKIHZvaWQgV0tQYWdlRmluZFN0cmluZyhXS1BhZ2VSZWYgcGFnZVJl ZiwgV0tTdHJpbmdSZWYgc3RyaW5nLCBXS0ZpbmRPcHRpb25zIG9wdGlvbnMsIHVuc2lnbmVkIG1h eE1hdGNoQ291bnQpCiB7CiAgICAgdG9JbXBsKHBhZ2VSZWYpLT5maW5kU3RyaW5nKHRvSW1wbChz dHJpbmcpLT5zdHJpbmcoKSwgdG9GaW5kT3B0aW9ucyhvcHRpb25zKSwgbWF4TWF0Y2hDb3VudCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA3 NzgyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzA3LDggKzMwNywxMSBAQCBXS19FWFBPUlQgZG91YmxlIFdLUGFnZUdldFNj YWxlRmFjdG9yKFdLCiAKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVNldFVzZUZpeGVkTGF5b3V0KFdL UGFnZVJlZiBwYWdlLCBib29sIGZpeGVkKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVNldEZpeGVk TGF5b3V0U2l6ZShXS1BhZ2VSZWYgcGFnZSwgV0tTaXplIHNpemUpOwotV0tfRVhQT1JUIGJvb2wg V0tQYWdlVXNlRml4ZWRMYXlvdXQoV0tQYWdlUmVmIHBhZ2VSZWYpOwotV0tfRVhQT1JUIFdLU2l6 ZSBXS1BhZ2VGaXhlZExheW91dFNpemUoV0tQYWdlUmVmIHBhZ2VSZWYpOworV0tfRVhQT1JUIGJv b2wgV0tQYWdlVXNlRml4ZWRMYXlvdXQoV0tQYWdlUmVmIHBhZ2UpOworV0tfRVhQT1JUIFdLU2l6 ZSBXS1BhZ2VGaXhlZExheW91dFNpemUoV0tQYWdlUmVmIHBhZ2UpOworCitXS19FWFBPUlQgYm9v bCBXS1BhZ2VIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKFdLUGFnZVJlZiBwYWdlKTsKK1dLX0VYUE9S VCBib29sIFdLUGFnZUhhc1ZlcnRpY2FsU2Nyb2xsYmFyKFdLUGFnZVJlZiBwYWdlKTsKIAogV0tf RVhQT1JUIHZvaWQgV0tQYWdlRmluZFN0cmluZyhXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYg c3RyaW5nLCBXS0ZpbmRPcHRpb25zIGZpbmRPcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50 KTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUhpZGVGaW5kVUkoV0tQYWdlUmVmIHBhZ2UpOwpJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAkocmV2aXNpb24gNzc4MjgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUwLDYgKzUwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVDaG9vc2Vy Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVM b2FkZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1ZGUgPFdlYkNv cmUvSFRNTE5hbWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50 Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CkBAIC00MjAsNiArNDIxLDE5IEBAIHZvaWQg V2ViQ2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2UKICAgICAgICAgbV9jYWNoZWRGcmFt ZVNldExhcmdlc3RGcmFtZSA9IGxhcmdlc3RGcmFtZTsKICAgICAgICAgV2ViUHJvY2Vzczo6c2hh cmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkZyYW1lU2V0 TGFyZ2VzdEZyYW1lQ2hhbmdlZChsYXJnZXN0RnJhbWUgPyBsYXJnZXN0RnJhbWUtPmZyYW1lSUQo KSA6IDApLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKICAgICB9CisKKyAgICBGcmFtZVZpZXcqIGZyYW1l VmlldyA9IGZyYW1lLT52aWV3KCk7CisgICAgaWYgKGZyYW1lVmlldykgeworICAgICAgICBib29s IGhhc0hvcml6b250YWxTY3JvbGxiYXIgPSBmcmFtZVZpZXctPmhvcml6b250YWxTY3JvbGxiYXIo KTsKKyAgICAgICAgYm9vbCBoYXNWZWN0aWNhbFNjcm9sbGJhciA9IGZyYW1lVmlldy0+dmVydGlj YWxTY3JvbGxiYXIoKTsKKworICAgICAgICBpZiAoaGFzSG9yaXpvbnRhbFNjcm9sbGJhciAhPSBt X2NhY2hlZEhhc0hvcml6b250YWxTY3JvbGxiYXIgfHwgaGFzVmVjdGljYWxTY3JvbGxiYXIgIT0g bV9jYWNoZWRIYXNWZXJ0aWNhbFNjcm9sbGJhcikgeworICAgICAgICAgICAgV2ViUHJvY2Vzczo6 c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENo YW5nZVNjcm9sbGJhcnNGb3JNYWluRnJhbWUoaGFzSG9yaXpvbnRhbFNjcm9sbGJhciwgaGFzVmVj dGljYWxTY3JvbGxiYXIpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgbV9jYWNoZWRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyID0gaGFzSG9yaXpvbnRhbFNjcm9s bGJhcjsKKyAgICAgICAgICAgIG1fY2FjaGVkSGFzVmVydGljYWxTY3JvbGxiYXIgPSBoYXNWZWN0 aWNhbFNjcm9sbGJhcjsKKyAgICAgICAgfQorICAgIH0KIH0KIAogdm9pZCBXZWJDaHJvbWVDbGll bnQ6OnNjcm9sbFJlY3RJbnRvVmlldyhjb25zdCBJbnRSZWN0JiwgY29uc3QgU2Nyb2xsVmlldyop IGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkNocm9tZUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgJKHJldmlzaW9uIDc3ODI4KQorKysgU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAko d29ya2luZyBjb3B5KQpAQCAtMzksMTEgKzM5LDE0IEBAIGNsYXNzIFdlYlBhZ2U7CiBjbGFzcyBX ZWJDaHJvbWVDbGllbnQgOiBwdWJsaWMgV2ViQ29yZTo6Q2hyb21lQ2xpZW50IHsKIHB1YmxpYzoK ICAgICBXZWJDaHJvbWVDbGllbnQoV2ViUGFnZSogcGFnZSkKLSAgICAgICAgOiBtX3BhZ2UocGFn ZSkKKyAgICAgICAgOiBtX2NhY2hlZEhhc0hvcml6b250YWxTY3JvbGxiYXIoZmFsc2UpCisgICAg ICAgICwgbV9jYWNoZWRIYXNWZXJ0aWNhbFNjcm9sbGJhcihmYWxzZSkKKyAgICAgICAgLCBtX3Bh Z2UocGFnZSkKICAgICB7CiAgICAgfQogICAgIAogICAgIFdlYlBhZ2UqIHBhZ2UoKSBjb25zdCB7 IHJldHVybiBtX3BhZ2U7IH0KKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgY2hyb21lRGVz dHJveWVkKCk7CiAgICAgCkBAIC0yMDksNiArMjEyLDkgQEAgcHJpdmF0ZToKIAogICAgIFN0cmlu ZyBtX2NhY2hlZFRvb2xUaXA7CiAgICAgbXV0YWJsZSBSZWZQdHI8V2ViRnJhbWU+IG1fY2FjaGVk RnJhbWVTZXRMYXJnZXN0RnJhbWU7CisgICAgbXV0YWJsZSBib29sIG1fY2FjaGVkSGFzSG9yaXpv bnRhbFNjcm9sbGJhcjsKKyAgICBtdXRhYmxlIGJvb2wgbV9jYWNoZWRIYXNWZXJ0aWNhbFNjcm9s bGJhcjsKKwogICAgIFdlYlBhZ2UqIG1fcGFnZTsKIH07CiAK