42236 2010-07-13 23:51:56 -0700 [Chromium] Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor 2011-01-18 13:02:56 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 42232 1 fishd fishd adamk commit-queue oldest_to_newest 250997 0 fishd 2010-07-13 23:51:56 -0700 Replace ChromiumBridge::widgetSetCursor with ChromeClient::setCursor 334615 1 adamk 2011-01-14 14:32:19 -0800 Request for some clarification: the only call to ChromiumBridge::widgetSetCursor() is in Widget::setCursor() (WidgetChromium.cpp). But Widget itself doesn't have easy access to a ChromeClient. Is the intention just to move ChromiumBridge's logic up into WidgetChromium (it involves using pseudo-RTTI and static_cast<FrameView*>(this)), or did you have something else in mind? 334622 2 adamk 2011-01-14 14:39:40 -0800 Oh, I see that Widget actually has a nice root() method which does this for me. Using that seems to be the way to go. 334674 3 fishd 2011-01-14 15:33:15 -0800 Yes, you can see in ChromiumBridge.cpp how we get to the ChromeClientImpl class given only a Widget. It used to be the case that ChromeClient did not have the setCursor method; however, it was added for WebKit2 (in r63339). We can use ChromeClient from our WidgetChromium implementation to reach the new setCursor method. We could not previously cast to ChromeClientImpl from WidgetChromium because WebCore cannot depend directly on code in WebKit. 334729 4 79024 adamk 2011-01-14 16:42:45 -0800 Created attachment 79024 Patch 334740 5 79024 fishd 2011-01-14 16:57:26 -0800 Comment on attachment 79024 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79024&action=review > Source/WebCore/platform/chromium/WidgetChromium.cpp:63 > + FrameView* view; Sorry, I just realized there is a much simpler way to achieve this! HostWindow also gained a setCursor method, and you can get the HostWindow from a Widget's parent ScrollView. That will dramatically simplify this code. 334742 6 fishd 2011-01-14 16:58:15 -0800 The HostWindow approach makes more sense too because there is a "rule" that WebCore/platform/ should not depend back onto code outside of WebCore/platform/ (with the exception of wtf/). 334940 7 79075 adamk 2011-01-15 13:37:19 -0800 Created attachment 79075 Patch 334941 8 adamk 2011-01-15 13:38:42 -0800 Indeed, much simpler. And it matches with the other platforms do. 336035 9 79075 commit-queue 2011-01-18 13:02:50 -0800 Comment on attachment 79075 Patch Clearing flags on attachment: 79075 Committed r76048: <http://trac.webkit.org/changeset/76048> 336036 10 commit-queue 2011-01-18 13:02:56 -0800 All reviewed patches have been landed. Closing bug. 79024 2011-01-14 16:42:45 -0800 2011-01-15 13:37:16 -0800 Patch bug-42236-20110114164244.patch text/plain 6116 adamk SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1ODQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDEtMTQgIEFkYW0gS2xl aW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBSZXBsYWNlIENocm9taXVtQnJpZGdlOjp3aWRn ZXRTZXRDdXJzb3Igd2l0aCBDaHJvbWVDbGllbnQ6OnNldEN1cnNvcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyMzYKKworICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21p dW0vV2lkZ2V0Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0OjpzZXRDdXJz b3IpOgorCiAyMDExLTAxLTE0ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHJldmlzaW9uIDc1ODEy KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAko d29ya2luZyBjb3B5KQpAQCAtMzQ2LDkgKzM0Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgc3RhdGljIExpbmtIYXNoIHZpc2l0ZWRMaW5rSGFzaChjb25zdCBVQ2hhciogdXJsLCB1 bnNpZ25lZCBsZW5ndGgpOwogICAgICAgICBzdGF0aWMgTGlua0hhc2ggdmlzaXRlZExpbmtIYXNo KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IEF0b21pY1N0cmluZyYgYXR0cmlidXRlVVJMKTsKICAg ICAgICAgc3RhdGljIGJvb2wgaXNMaW5rVmlzaXRlZChMaW5rSGFzaCk7Ci0KLSAgICAgICAgLy8g V2lkZ2V0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KLSAgICAgICAgc3RhdGljIHZvaWQgd2lkZ2V0U2V0Q3Vyc29yKFdpZGdldCos IGNvbnN0IEN1cnNvciYpOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1dpZGdldENocm9taXVtLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9XaWRnZXRDaHJvbWl1 bS5jcHAJKHJldmlzaW9uIDc1ODEyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vV2lkZ2V0Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiwxMSBAQAog I2luY2x1ZGUgIldpZGdldC5oIgogCiAjaW5jbHVkZSAiQXNzZXJ0aW9ucy5oIgotI2luY2x1ZGUg IkNocm9taXVtQnJpZGdlLmgiCisjaW5jbHVkZSAiQ2hyb21lLmgiCisjaW5jbHVkZSAiQ2hyb21l Q2xpZW50LmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNp bmNsdWRlICJQYWdlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNTYsNyArNjAsMTcg QEAgdm9pZCBXaWRnZXQ6OmhpZGUoKQogCiB2b2lkIFdpZGdldDo6c2V0Q3Vyc29yKGNvbnN0IEN1 cnNvciYgY3Vyc29yKQogewotICAgIENocm9taXVtQnJpZGdlOjp3aWRnZXRTZXRDdXJzb3IodGhp cywgY3Vyc29yKTsKKyAgICBGcmFtZVZpZXcqIHZpZXc7CisgICAgaWYgKGlzRnJhbWVWaWV3KCkp CisgICAgICAgIHZpZXcgPSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPih0aGlzKTsKKyAgICBlbHNl IGlmIChwYXJlbnQoKSAmJiBwYXJlbnQoKS0+aXNGcmFtZVZpZXcoKSkKKyAgICAgICAgdmlldyA9 IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHRoaXMpOworICAgIGVsc2UKKyAgICAgICAgcmV0dXJu OworCisgICAgUGFnZSogcGFnZSA9IHZpZXctPmZyYW1lKCkgPyB2aWV3LT5mcmFtZSgpLT5wYWdl KCkgOiAwOworICAgIGlmIChwYWdlICYmIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKSkKKyAgICAg ICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5zZXRDdXJzb3IoY3Vyc29yKTsKIH0KIAogdm9p ZCBXaWRnZXQ6OnBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKQpJbmRleDog V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCShyZXZpc2lvbiA3NTg0MCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wMS0xNCAgQWRhbSBLbGVpbiAg PGFkYW1rQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbQ2hyb21pdW1dIFJlcGxhY2UgQ2hyb21pdW1CcmlkZ2U6OndpZGdldFNl dEN1cnNvciB3aXRoIENocm9tZUNsaWVudDo6c2V0Q3Vyc29yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjIzNgorCisgICAgICAgICogc3JjL0Nocm9t ZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnRJbXBsOjpzZXRD dXJzb3IpOgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBsLmg6CisgICAgICAgICogc3Jj L0Nocm9taXVtQnJpZGdlLmNwcDoKKwogMjAxMS0wMS0xNCAgSm9jaGVuIEVpc2luZ2VyICA8am9j aGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsIGNocm9taXVtIGRl cHMgdG8gcjcxNDMyLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwu Y3BwCShyZXZpc2lvbiA3NTgxMikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50 SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwMCw2ICs3MDAsMTEgQEAgdm9pZCBDaHJvbWVD bGllbnRJbXBsOjpwb3B1cENsb3NlZChXZWJDbwogICAgIG1fd2ViVmlldy0+cG9wdXBDbG9zZWQo cG9wdXBDb250YWluZXIpOwogfQogCit2b2lkIENocm9tZUNsaWVudEltcGw6OnNldEN1cnNvcihj b25zdCBXZWJDb3JlOjpDdXJzb3ImIGN1cnNvcikKK3sKKyAgICBzZXRDdXJzb3IoV2ViQ3Vyc29y SW5mbyhjdXJzb3IpKTsKK30KKwogdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpzZXRDdXJzb3IoY29u c3QgV2ViQ3Vyc29ySW5mbyYgY3Vyc29yKQogewogICAgIGlmIChtX3dlYlZpZXctPmNsaWVudCgp KQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgJKHJldmlzaW9uIDc1 ODEyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEzMiw3ICsxMzIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNhbmNl bEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSosIFdl YkNvcmU6Okdlb2xvY2F0aW9uKik7CiAgICAgdmlydHVhbCB2b2lkIHJ1bk9wZW5QYW5lbChXZWJD b3JlOjpGcmFtZSosIFBhc3NSZWZQdHI8V2ViQ29yZTo6RmlsZUNob29zZXI+KTsKICAgICB2aXJ0 dWFsIHZvaWQgY2hvb3NlSWNvbkZvckZpbGVzKGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mLCBX ZWJDb3JlOjpGaWxlQ2hvb3NlciopOwotICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzb3IoY29uc3Qg V2ViQ29yZTo6Q3Vyc29yJikgeyB9CisgICAgdmlydHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBX ZWJDb3JlOjpDdXJzb3ImKTsKICAgICB2aXJ0dWFsIHZvaWQgZm9ybVN0YXRlRGlkQ2hhbmdlKGNv bnN0IFdlYkNvcmU6Ok5vZGUqKTsKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8V2ViQ29yZTo6SFRN TFBhcnNlclF1aXJrcz4gY3JlYXRlSFRNTFBhcnNlclF1aXJrcygpIHsgcmV0dXJuIDA7IH0KICNp ZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpAQCAtMTY3LDggKzE2Nyw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgcG9zdEFjY2Vzc2liaWxpdHlOb3RpZmljYXRpb24oV2ViQ29yZTo6QWNjZXNz aWJpbGl0eU9iamVjdCosIFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OkFYTm90aWZpY2F0aW9uKTsK IAogICAgIC8vIENocm9tZUNsaWVudEltcGw6Ci0gICAgdm9pZCBzZXRDdXJzb3IoY29uc3QgV2Vi Q3Vyc29ySW5mbyYgY3Vyc29yKTsKLSAgICB2b2lkIHNldEN1cnNvckZvclBsdWdpbihjb25zdCBX ZWJDdXJzb3JJbmZvJiBjdXJzb3IpOworICAgIHZvaWQgc2V0Q3Vyc29yRm9yUGx1Z2luKGNvbnN0 IFdlYkN1cnNvckluZm8mKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzZWxlY3RJdGVtV3JpdGluZ0Rp cmVjdGlvbklzTmF0dXJhbCgpOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb3JlOjpQb3B1 cE1lbnU+IGNyZWF0ZVBvcHVwTWVudShXZWJDb3JlOjpQb3B1cE1lbnVDbGllbnQqKSBjb25zdDsK QEAgLTE4MCw2ICsxNzksNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBnZXRQb3B1 cE1lbnVJbmZvKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyKiwgV2ViUG9wdXBNZW51SW5mbyopOwor ICAgIHZvaWQgc2V0Q3Vyc29yKGNvbnN0IFdlYkN1cnNvckluZm8mKTsKIAogICAgIFdlYlZpZXdJ bXBsKiBtX3dlYlZpZXc7ICAvLyB3ZWFrIHBvaW50ZXIKICAgICBib29sIG1fdG9vbGJhcnNWaXNp YmxlOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAJKHJldmlzaW9u IDc1ODEyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWl1bUJyaWRnZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM5LDcgKzM5LDYgQEAKICNpbmNsdWRlICJXZWJDbGlwYm9hcmQuaCIKICNp bmNsdWRlICJXZWJDb29raWUuaCIKICNpbmNsdWRlICJXZWJDb29raWVKYXIuaCIKLSNpbmNsdWRl ICJXZWJDdXJzb3JJbmZvLmgiCiAjaW5jbHVkZSAiV2ViRGF0YS5oIgogI2luY2x1ZGUgIldlYkRy YWdEYXRhLmgiCiAjaW5jbHVkZSAiV2ViRmlsZVV0aWxpdGllcy5oIgpAQCAtOTkwLDEzICs5ODks NiBAQCBib29sIENocm9taXVtQnJpZGdlOjpwb3B1cHNBbGxvd2VkKE5QUCBuCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCi12b2lkIENocm9taXVtQnJpZGdlOjp3aWRnZXRTZXRDdXJzb3IoV2lkZ2V0 KiB3aWRnZXQsIGNvbnN0IEN1cnNvciYgY3Vyc29yKQotewotICAgIENocm9tZUNsaWVudEltcGwq IGNsaWVudCA9IHRvQ2hyb21lQ2xpZW50SW1wbCh3aWRnZXQpOwotICAgIGlmIChjbGllbnQpCi0g ICAgICAgIGNsaWVudC0+c2V0Q3Vyc29yKFdlYkN1cnNvckluZm8oY3Vyc29yKSk7Ci19Ci0KIFdv cmtlckNvbnRleHRQcm94eSogV29ya2VyQ29udGV4dFByb3h5OjpjcmVhdGUoV29ya2VyKiB3b3Jr ZXIpCiB7CiAgICAgcmV0dXJuIFdlYldvcmtlckNsaWVudEltcGw6OmNyZWF0ZVdvcmtlckNvbnRl eHRQcm94eSh3b3JrZXIpOwo= 79075 2011-01-15 13:37:19 -0800 2011-01-18 13:02:50 -0800 Patch bug-42236-20110115133717.patch text/plain 5770 adamk SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1ODQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDEtMTQgIEFkYW0gS2xl aW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBSZXBsYWNlIENocm9taXVtQnJpZGdlOjp3aWRn ZXRTZXRDdXJzb3Igd2l0aCBDaHJvbWVDbGllbnQ6OnNldEN1cnNvcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIyMzYKKworICAgICAgICAqIHBsYXRm b3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmg6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21p dW0vV2lkZ2V0Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0OjpzZXRDdXJz b3IpOgorCiAyMDExLTAxLTE0ICBUb255IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHJldmlzaW9uIDc1ODEy KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAko d29ya2luZyBjb3B5KQpAQCAtMzQ2LDkgKzM0Niw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgc3RhdGljIExpbmtIYXNoIHZpc2l0ZWRMaW5rSGFzaChjb25zdCBVQ2hhciogdXJsLCB1 bnNpZ25lZCBsZW5ndGgpOwogICAgICAgICBzdGF0aWMgTGlua0hhc2ggdmlzaXRlZExpbmtIYXNo KGNvbnN0IEtVUkwmIGJhc2UsIGNvbnN0IEF0b21pY1N0cmluZyYgYXR0cmlidXRlVVJMKTsKICAg ICAgICAgc3RhdGljIGJvb2wgaXNMaW5rVmlzaXRlZChMaW5rSGFzaCk7Ci0KLSAgICAgICAgLy8g V2lkZ2V0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KLSAgICAgICAgc3RhdGljIHZvaWQgd2lkZ2V0U2V0Q3Vyc29yKFdpZGdldCos IGNvbnN0IEN1cnNvciYpOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1dpZGdldENocm9taXVtLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9XaWRnZXRDaHJvbWl1 bS5jcHAJKHJldmlzaW9uIDc1ODEyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vV2lkZ2V0Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw4IEBACiAj aW5jbHVkZSAiV2lkZ2V0LmgiCiAKICNpbmNsdWRlICJBc3NlcnRpb25zLmgiCi0jaW5jbHVkZSAi Q2hyb21pdW1CcmlkZ2UuaCIKKyNpbmNsdWRlICJIb3N0V2luZG93LmgiCisjaW5jbHVkZSAiU2Ny b2xsVmlldy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTU2LDcgKzU3LDkgQEAgdm9p ZCBXaWRnZXQ6OmhpZGUoKQogCiB2b2lkIFdpZGdldDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYg Y3Vyc29yKQogewotICAgIENocm9taXVtQnJpZGdlOjp3aWRnZXRTZXRDdXJzb3IodGhpcywgY3Vy c29yKTsKKyAgICBTY3JvbGxWaWV3KiB2aWV3ID0gcm9vdCgpOworICAgIGlmICh2aWV3KQorICAg ICAgICB2aWV3LT5ob3N0V2luZG93KCktPnNldEN1cnNvcihjdXJzb3IpOwogfQogCiB2b2lkIFdp ZGdldDo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYpCkluZGV4OiBXZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHJldmlzaW9uIDc1ODQwKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTAxLTE0ICBBZGFtIEtsZWluICA8YWRh bWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtDaHJvbWl1bV0gUmVwbGFjZSBDaHJvbWl1bUJyaWRnZTo6d2lkZ2V0U2V0Q3Vy c29yIHdpdGggQ2hyb21lQ2xpZW50OjpzZXRDdXJzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjM2CisKKyAgICAgICAgKiBzcmMvQ2hyb21lQ2xp ZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudEltcGw6OnNldEN1cnNv cik6CisgICAgICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBzcmMvQ2hy b21pdW1CcmlkZ2UuY3BwOgorCiAyMDExLTAxLTE0ICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgY2hyb21pdW0gZGVwcyB0 byByNzE0MzIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAJ KHJldmlzaW9uIDc1ODEyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBs LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAwLDYgKzcwMCwxMSBAQCB2b2lkIENocm9tZUNsaWVu dEltcGw6OnBvcHVwQ2xvc2VkKFdlYkNvCiAgICAgbV93ZWJWaWV3LT5wb3B1cENsb3NlZChwb3B1 cENvbnRhaW5lcik7CiB9CiAKK3ZvaWQgQ2hyb21lQ2xpZW50SW1wbDo6c2V0Q3Vyc29yKGNvbnN0 IFdlYkNvcmU6OkN1cnNvciYgY3Vyc29yKQoreworICAgIHNldEN1cnNvcihXZWJDdXJzb3JJbmZv KGN1cnNvcikpOworfQorCiB2b2lkIENocm9tZUNsaWVudEltcGw6OnNldEN1cnNvcihjb25zdCBX ZWJDdXJzb3JJbmZvJiBjdXJzb3IpCiB7CiAgICAgaWYgKG1fd2ViVmlldy0+Y2xpZW50KCkpCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuaAkocmV2aXNpb24gNzU4MTIp CisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuaAkod29ya2luZyBjb3B5 KQpAQCAtMTMyLDcgKzEzMiw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsR2Vv bG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKiwgV2ViQ29y ZTo6R2VvbG9jYXRpb24qKTsKICAgICB2aXJ0dWFsIHZvaWQgcnVuT3BlblBhbmVsKFdlYkNvcmU6 OkZyYW1lKiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpGaWxlQ2hvb3Nlcj4pOwogICAgIHZpcnR1YWwg dm9pZCBjaG9vc2VJY29uRm9yRmlsZXMoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYsIFdlYkNv cmU6OkZpbGVDaG9vc2VyKik7Ci0gICAgdmlydHVhbCB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJD b3JlOjpDdXJzb3ImKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc29yKGNvbnN0IFdlYkNv cmU6OkN1cnNvciYpOwogICAgIHZpcnR1YWwgdm9pZCBmb3JtU3RhdGVEaWRDaGFuZ2UoY29uc3Qg V2ViQ29yZTo6Tm9kZSopOwogICAgIHZpcnR1YWwgUGFzc093blB0cjxXZWJDb3JlOjpIVE1MUGFy c2VyUXVpcmtzPiBjcmVhdGVIVE1MUGFyc2VyUXVpcmtzKCkgeyByZXR1cm4gMDsgfQogI2lmIEVO QUJMRShUT1VDSF9FVkVOVFMpCkBAIC0xNjcsOCArMTY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBwb3N0QWNjZXNzaWJpbGl0eU5vdGlmaWNhdGlvbihXZWJDb3JlOjpBY2Nlc3NpYmls aXR5T2JqZWN0KiwgV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6QVhOb3RpZmljYXRpb24pOwogCiAg ICAgLy8gQ2hyb21lQ2xpZW50SW1wbDoKLSAgICB2b2lkIHNldEN1cnNvcihjb25zdCBXZWJDdXJz b3JJbmZvJiBjdXJzb3IpOwotICAgIHZvaWQgc2V0Q3Vyc29yRm9yUGx1Z2luKGNvbnN0IFdlYkN1 cnNvckluZm8mIGN1cnNvcik7CisgICAgdm9pZCBzZXRDdXJzb3JGb3JQbHVnaW4oY29uc3QgV2Vi Q3Vyc29ySW5mbyYpOwogCiAgICAgdmlydHVhbCBib29sIHNlbGVjdEl0ZW1Xcml0aW5nRGlyZWN0 aW9uSXNOYXR1cmFsKCk7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OlBvcHVwTWVu dT4gY3JlYXRlUG9wdXBNZW51KFdlYkNvcmU6OlBvcHVwTWVudUNsaWVudCopIGNvbnN0OwpAQCAt MTgwLDYgKzE3OSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGdldFBvcHVwTWVu dUluZm8oV2ViQ29yZTo6UG9wdXBDb250YWluZXIqLCBXZWJQb3B1cE1lbnVJbmZvKik7CisgICAg dm9pZCBzZXRDdXJzb3IoY29uc3QgV2ViQ3Vyc29ySW5mbyYpOwogCiAgICAgV2ViVmlld0ltcGwq IG1fd2ViVmlldzsgIC8vIHdlYWsgcG9pbnRlcgogICAgIGJvb2wgbV90b29sYmFyc1Zpc2libGU7 CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcAkocmV2aXNpb24gNzU4 MTIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIldlYkNsaXBib2FyZC5oIgogI2luY2x1 ZGUgIldlYkNvb2tpZS5oIgogI2luY2x1ZGUgIldlYkNvb2tpZUphci5oIgotI2luY2x1ZGUgIldl YkN1cnNvckluZm8uaCIKICNpbmNsdWRlICJXZWJEYXRhLmgiCiAjaW5jbHVkZSAiV2ViRHJhZ0Rh dGEuaCIKICNpbmNsdWRlICJXZWJGaWxlVXRpbGl0aWVzLmgiCkBAIC05OTAsMTMgKzk4OSw2IEBA IGJvb2wgQ2hyb21pdW1CcmlkZ2U6OnBvcHVwc0FsbG93ZWQoTlBQIG4KICAgICByZXR1cm4gZmFs c2U7CiB9CiAKLXZvaWQgQ2hyb21pdW1CcmlkZ2U6OndpZGdldFNldEN1cnNvcihXaWRnZXQqIHdp ZGdldCwgY29uc3QgQ3Vyc29yJiBjdXJzb3IpCi17Ci0gICAgQ2hyb21lQ2xpZW50SW1wbCogY2xp ZW50ID0gdG9DaHJvbWVDbGllbnRJbXBsKHdpZGdldCk7Ci0gICAgaWYgKGNsaWVudCkKLSAgICAg ICAgY2xpZW50LT5zZXRDdXJzb3IoV2ViQ3Vyc29ySW5mbyhjdXJzb3IpKTsKLX0KLQogV29ya2Vy Q29udGV4dFByb3h5KiBXb3JrZXJDb250ZXh0UHJveHk6OmNyZWF0ZShXb3JrZXIqIHdvcmtlcikK IHsKICAgICByZXR1cm4gV2ViV29ya2VyQ2xpZW50SW1wbDo6Y3JlYXRlV29ya2VyQ29udGV4dFBy b3h5KHdvcmtlcik7Cg==