56734 2011-03-20 23:40:29 -0700 AX: showContextMenu not working in WK2 2011-03-21 16:35:11 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 370291 0 cfleizach 2011-03-20 23:40:29 -0700 showContextMenu no longer works in WK2 because the popup menu cannot be triggered directly 370293 1 cfleizach 2011-03-20 23:45:47 -0700 rdar://9095026 370294 2 86299 cfleizach 2011-03-20 23:49:21 -0700 Created attachment 86299 patch 370356 3 86299 darin 2011-03-21 06:55:21 -0700 Comment on attachment 86299 patch View in context: https://bugs.webkit.org/attachment.cgi?id=86299&action=review > Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm:2338 > + // In WK2 use the available crome client. Typo, "chrome". > Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm:2339 > + // In WK1, the popup menu can be triggered directly. Can’t we put this code into the chrome client for WebKit1 also? Is it important to keep the code here? It seems awkward to have different code for the two and I don’t see why. > Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm:2341 > + PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, MouseEventPressed, 1, false, false, false, false, WTF::currentTime()); Should just be able to call currentTime rather than WTF::currentTime. > Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm:2344 > + bool handled = frameView->frame()->eventHandler()->sendContextMenuEvent(mouseEvent); > + if (handled) > + frameView->frame()->page()->chrome()->showContextMenu(); Any need to null check the frame or the page? 370924 4 86369 cfleizach 2011-03-21 14:47:55 -0700 Created attachment 86369 patch 370925 5 cfleizach 2011-03-21 14:48:43 -0700 (In reply to comment #3) > > Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm:2339 > > + // In WK1, the popup menu can be triggered directly. > > Can’t we put this code into the chrome client for WebKit1 also? Is it important to keep the code here? It seems awkward to have different code for the two and I don’t see why. > I've moved the logic used to open the context menu from the AX code into showContextMenu() in the WebKit chrome client. Previously it had been empty. 370929 6 86369 darin 2011-03-21 14:52:19 -0700 Comment on attachment 86369 patch View in context: https://bugs.webkit.org/attachment.cgi?id=86369&action=review > Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm:886 > + WebCore::Page* page = [m_webView page]; Why does this need the WebCore:: prefix and nothing else in this function does? > Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm:891 > + if (!controller) > + return; I don’t think this can ever be 0, so this check is not needed. 371001 7 cfleizach 2011-03-21 16:35:11 -0700 http://trac.webkit.org/changeset/81619 86299 2011-03-20 23:49:21 -0700 2011-03-21 14:47:55 -0700 patch patch.txt text/plain 3536 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNTY4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMjAgIGNocmlzIGZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBWDogc2hvd0NvbnRleHRNZW51IG5vdCB3b3JraW5nIGlu IFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY3 MzQKKworICAgICAgICBXSzIgaXMgbm90IGFibGUgdG8gZGlyZWN0bHkgc2hvdyB0aGUgcG9wdXAg bWVudSwgc28gdGhlIGNocm9tZSBjbGllbnQKKyAgICAgICAgbmVlZHMgdG8gYmUgdXNlZC4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1t OgorICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5U2hv d0NvbnRleHRNZW51XSk6CisKIDIwMTEtMDMtMjAgIEJpbGwgQnVkZ2UgIDxiYnVkZ2VAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlci5tbQkocmV2aXNpb24gODE1NjQpCisrKyBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkod29ya2luZyBj b3B5KQpAQCAtNDEsNiArNDEsNyBAQAogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5o IgogI2ltcG9ydCAiQWNjZXNzaWJpbGl0eVRhYmxlUm93LmgiCiAjaW1wb3J0ICJBY2Nlc3NpYmls aXR5VGFibGVDb2x1bW4uaCIKKyNpbXBvcnQgIkNocm9tZS5oIgogI2ltcG9ydCAiQ29sb3JNYWMu aCIKICNpbXBvcnQgIkZyYW1lLmgiCiAjaW1wb3J0ICJGcmFtZUxvYWRlckNsaWVudC5oIgpAQCAt MjMzMywyNSArMjMzNCwzMiBAQCAtICh2b2lkKWFjY2Vzc2liaWxpdHlTaG93Q29udGV4dE1lbnUK IAogICAgIC8vIHNpbXVsYXRlIGEgY2xpY2sgaW4gdGhlIG1pZGRsZSBvZiB0aGUgb2JqZWN0CiAg ICAgSW50UG9pbnQgY2xpY2tQb2ludCA9IG1fb2JqZWN0LT5jbGlja1BvaW50KCk7Ci0gICAgTlNQ b2ludCBuc0NsaWNrUG9pbnQgPSBOU01ha2VQb2ludChjbGlja1BvaW50LngoKSwgY2xpY2tQb2lu dC55KCkpOwogICAgIAotICAgIE5TVmlldyogdmlldyA9IG5pbDsKLSAgICBpZiAobV9vYmplY3Qt PmlzQXR0YWNobWVudCgpKQotICAgICAgICB2aWV3ID0gW3NlbGYgYXR0YWNobWVudFZpZXddOwot ICAgIGVsc2UKLSAgICAgICAgdmlldyA9IGZyYW1lVmlldy0+ZG9jdW1lbnRWaWV3KCk7Ci0gICAg Ci0gICAgaWYgKCF2aWV3KQotICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgTlNQb2ludCBuc1Nj cmVlblBvaW50ID0gW3ZpZXcgY29udmVydFBvaW50Om5zQ2xpY2tQb2ludCB0b1ZpZXc6bmlsXTsK LSAgICAKLSAgICAvLyBTaG93IHRoZSBjb250ZXh0dWFsIG1lbnUgZm9yIHRoaXMgZXZlbnQuCi0g ICAgTlNFdmVudCogZXZlbnQgPSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNSaWdodE1v dXNlRG93biBsb2NhdGlvbjpuc1NjcmVlblBvaW50IG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6 MCB3aW5kb3dOdW1iZXI6W1t2aWV3IHdpbmRvd10gd2luZG93TnVtYmVyXSBjb250ZXh0OjAgZXZl bnROdW1iZXI6MCBjbGlja0NvdW50OjEgcHJlc3N1cmU6MV07Ci0gICAgTlNNZW51KiBtZW51ID0g W3ZpZXcgbWVudUZvckV2ZW50OmV2ZW50XTsKLSAgICAKLSAgICBpZiAobWVudSkKLSAgICAgICAg W05TTWVudSBwb3BVcENvbnRleHRNZW51Om1lbnUgd2l0aEV2ZW50OmV2ZW50IGZvclZpZXc6dmll d107ICAgIAorICAgIC8vIEluIFdLMiB1c2UgdGhlIGF2YWlsYWJsZSBjcm9tZSBjbGllbnQuCisg ICAgLy8gSW4gV0sxLCB0aGUgcG9wdXAgbWVudSBjYW4gYmUgdHJpZ2dlcmVkIGRpcmVjdGx5Lgor ICAgIGlmICghZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdldCgpKSB7CisgICAgICAgIFBsYXRmb3Jt TW91c2VFdmVudCBtb3VzZUV2ZW50KGNsaWNrUG9pbnQsIGNsaWNrUG9pbnQsIFJpZ2h0QnV0dG9u LCBNb3VzZUV2ZW50UHJlc3NlZCwgMSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIFdURjo6 Y3VycmVudFRpbWUoKSk7CisgICAgICAgIGJvb2wgaGFuZGxlZCA9IGZyYW1lVmlldy0+ZnJhbWUo KS0+ZXZlbnRIYW5kbGVyKCktPnNlbmRDb250ZXh0TWVudUV2ZW50KG1vdXNlRXZlbnQpOworICAg ICAgICBpZiAoaGFuZGxlZCkKKyAgICAgICAgICAgIGZyYW1lVmlldy0+ZnJhbWUoKS0+cGFnZSgp LT5jaHJvbWUoKS0+c2hvd0NvbnRleHRNZW51KCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgTlNQ b2ludCBuc0NsaWNrUG9pbnQgPSBOU01ha2VQb2ludChjbGlja1BvaW50LngoKSwgY2xpY2tQb2lu dC55KCkpOworICAgICAgICBOU1ZpZXcqIHZpZXcgPSBuaWw7CisgICAgICAgIGlmIChtX29iamVj dC0+aXNBdHRhY2htZW50KCkpCisgICAgICAgICAgICB2aWV3ID0gW3NlbGYgYXR0YWNobWVudFZp ZXddOworICAgICAgICBlbHNlCisgICAgICAgICAgICB2aWV3ID0gZnJhbWVWaWV3LT5kb2N1bWVu dFZpZXcoKTsKKyAgICAgICAgCisgICAgICAgIGlmICghdmlldykKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgCisgICAgICAgIE5TUG9pbnQgbnNTY3JlZW5Qb2ludCA9IFt2aWV3IGNvbnZl cnRQb2ludDpuc0NsaWNrUG9pbnQgdG9WaWV3Om5pbF07CisgICAgICAgIC8vIFNob3cgdGhlIGNv bnRleHR1YWwgbWVudSBmb3IgdGhpcyBldmVudC4KKyAgICAgICAgTlNFdmVudCogZXZlbnQgPSBb TlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNSaWdodE1vdXNlRG93biBsb2NhdGlvbjpuc1Nj cmVlblBvaW50IG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6W1t2aWV3 IHdpbmRvd10gd2luZG93TnVtYmVyXSBjb250ZXh0OjAgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50 OjEgcHJlc3N1cmU6MV07CisgICAgICAgIE5TTWVudSogbWVudSA9IFt2aWV3IG1lbnVGb3JFdmVu dDpldmVudF07CisgICAgICAgIGlmIChtZW51KQorICAgICAgICAgICAgW05TTWVudSBwb3BVcENv bnRleHRNZW51Om1lbnUgd2l0aEV2ZW50OmV2ZW50IGZvclZpZXc6dmlld107ICAgIAorICAgIH0K IH0KIAogLSAodm9pZClhY2Nlc3NpYmlsaXR5UGVyZm9ybUFjdGlvbjooTlNTdHJpbmcqKWFjdGlv bgo= 86369 2011-03-21 14:47:55 -0700 2011-03-21 14:52:18 -0700 patch patch text/plain 6597 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNjEwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjEgIGNocmlzIGZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBWDogc2hvd0NvbnRleHRNZW51IG5vdCB3b3JraW5nIGlu IFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY3 MzQKKworICAgICAgICBXZWJLaXQyIGlzIG5vdCBhYmxlIHRvIGRpcmVjdGx5IG9wZW4gYSBjb250 ZXh0IG1lbnUgYmVjYXVzZSB0aGUgVUkgaXMgaW4gdGhlIG90aGVyIHByb2Nlc3MuCisgICAgICAg IEluc3RlYWQgdGhlIGNocm9tZSBjbGllbnQgc2hvdWxkIGJlIHVzZWQuIFRoaXMgYWxzbyBtZWFu cyBpbXBsZW1lbnRpbmcgc2hvd0NvbnRleHRNZW51KCkgaW4gV2ViS2l0MQorICAgICAgICBjb2Rl LgorICAgICAgICAKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNj ZXNzaWJpbGl0eVNob3dDb250ZXh0TWVudV0pOgorCiAyMDExLTAzLTA3ICBEYXZpZCBMZXZpbiAg PGxldmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJ bmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9uIDgxNTY0KQorKysgU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIu bW0JKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAKICNpbXBvcnQgIkFjY2Vzc2liaWxp dHlUYWJsZUNlbGwuaCIKICNpbXBvcnQgIkFjY2Vzc2liaWxpdHlUYWJsZVJvdy5oIgogI2ltcG9y dCAiQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1uLmgiCisjaW1wb3J0ICJDaHJvbWUuaCIKICNpbXBv cnQgIkNvbG9yTWFjLmgiCiAjaW1wb3J0ICJGcmFtZS5oIgogI2ltcG9ydCAiRnJhbWVMb2FkZXJD bGllbnQuaCIKQEAgLTIzMzAsMjggKzIzMzEsMjAgQEAgLSAodm9pZClhY2Nlc3NpYmlsaXR5U2hv d0NvbnRleHRNZW51CiAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX29iamVjdC0+ZG9jdW1l bnRGcmFtZVZpZXcoKTsKICAgICBpZiAoIWZyYW1lVmlldykKICAgICAgICAgcmV0dXJuOworICAg IEZyYW1lKiBmcmFtZSA9IGZyYW1lVmlldy0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAg ICAgICByZXR1cm47CisgICAgUGFnZSogcGFnZSA9IGZyYW1lLT5wYWdlKCk7CisgICAgaWYgKCFw YWdlKQorICAgICAgICByZXR1cm47CiAKLSAgICAvLyBzaW11bGF0ZSBhIGNsaWNrIGluIHRoZSBt aWRkbGUgb2YgdGhlIG9iamVjdAorICAgIC8vIFNpbXVsYXRlIGEgY2xpY2sgaW4gdGhlIG1pZGRs ZSBvZiB0aGUgb2JqZWN0LgogICAgIEludFBvaW50IGNsaWNrUG9pbnQgPSBtX29iamVjdC0+Y2xp Y2tQb2ludCgpOwotICAgIE5TUG9pbnQgbnNDbGlja1BvaW50ID0gTlNNYWtlUG9pbnQoY2xpY2tQ b2ludC54KCksIGNsaWNrUG9pbnQueSgpKTsKLSAgICAKLSAgICBOU1ZpZXcqIHZpZXcgPSBuaWw7 Ci0gICAgaWYgKG1fb2JqZWN0LT5pc0F0dGFjaG1lbnQoKSkKLSAgICAgICAgdmlldyA9IFtzZWxm IGF0dGFjaG1lbnRWaWV3XTsKLSAgICBlbHNlCi0gICAgICAgIHZpZXcgPSBmcmFtZVZpZXctPmRv Y3VtZW50VmlldygpOwotICAgIAotICAgIGlmICghdmlldykKLSAgICAgICAgcmV0dXJuOwotICAg IAotICAgIE5TUG9pbnQgbnNTY3JlZW5Qb2ludCA9IFt2aWV3IGNvbnZlcnRQb2ludDpuc0NsaWNr UG9pbnQgdG9WaWV3Om5pbF07Ci0gICAgCi0gICAgLy8gU2hvdyB0aGUgY29udGV4dHVhbCBtZW51 IGZvciB0aGlzIGV2ZW50LgotICAgIE5TRXZlbnQqIGV2ZW50ID0gW05TRXZlbnQgbW91c2VFdmVu dFdpdGhUeXBlOk5TUmlnaHRNb3VzZURvd24gbG9jYXRpb246bnNTY3JlZW5Qb2ludCBtb2RpZmll ckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOltbdmlldyB3aW5kb3ddIHdpbmRvd051 bWJlcl0gY29udGV4dDowIGV2ZW50TnVtYmVyOjAgY2xpY2tDb3VudDoxIHByZXNzdXJlOjFdOwot ICAgIE5TTWVudSogbWVudSA9IFt2aWV3IG1lbnVGb3JFdmVudDpldmVudF07CiAgICAgCi0gICAg aWYgKG1lbnUpCi0gICAgICAgIFtOU01lbnUgcG9wVXBDb250ZXh0TWVudTptZW51IHdpdGhFdmVu dDpldmVudCBmb3JWaWV3OnZpZXddOyAgICAKKyAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgbW91c2VF dmVudChjbGlja1BvaW50LCBjbGlja1BvaW50LCBSaWdodEJ1dHRvbiwgTW91c2VFdmVudFByZXNz ZWQsIDEsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBjdXJyZW50VGltZSgpKTsKKyAgICBi b29sIGhhbmRsZWQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNlbmRDb250ZXh0TWVudUV2ZW50 KG1vdXNlRXZlbnQpOworICAgIGlmIChoYW5kbGVkKQorICAgICAgICBwYWdlLT5jaHJvbWUoKS0+ c2hvd0NvbnRleHRNZW51KCk7CiB9CiAKIC0gKHZvaWQpYWNjZXNzaWJpbGl0eVBlcmZvcm1BY3Rp b246KE5TU3RyaW5nKilhY3Rpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNjEw KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTcgQEAKKzIwMTEtMDMtMjEgIGNocmlzIGZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBWDog c2hvd0NvbnRleHRNZW51IG5vdCB3b3JraW5nIGluIFdLMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY3MzQKKworICAgICAgICBJbXBsZW1lbnQgc2hv d0NvbnRleHRNZW51KCkgc28gYWNjZXNzaWJpbGl0eSByZWxhdGVkIGNvZGUgY2FuIGNhbGwgdGhp cworICAgICAgICBpbmRlcGVuZGVudCBvZiB3aGV0aGVyIFdLMSBvciBXSzIgaXMgcnVubmluZy4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNocm9tZUNs aWVudDo6c2hvd0NvbnRleHRNZW51KToKKwogMjAxMS0wMy0yMSAgQ2hhbmcgU2h1ICA8Y3NodUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCklu ZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuaAkocmV2aXNpb24gODE1NjQpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJDaHJvbWVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTgwLDcgKzE4MCw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2VhcmNoUG9wdXBNZW51 PiBjcmVhdGVTZWFyY2hQb3B1cE1lbnUoV2ViQ29yZTo6UG9wdXBNZW51Q2xpZW50KikgY29uc3Q7 CiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKLSAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRl eHRNZW51KCkgeyB9CisgICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudSgpOwogI2VuZGlm CiBwcml2YXRlOgogICAgIFdlYlZpZXcgKm1fd2ViVmlldzsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0JKHJldmlzaW9u IDgxNTY0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MSwxNCArNTEsMTggQEAKICNpbXBvcnQgPFdlYkNv cmUvQmxvY2tFeGNlcHRpb25zLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0NvbnNvbGUuaD4KICNpbXBv cnQgPFdlYkNvcmUvQ3Vyc29yLmg+CisjaW1wb3J0IDxXZWJDb3JlL0NvbnRleHRNZW51Lmg+Cisj aW1wb3J0IDxXZWJDb3JlL0NvbnRleHRNZW51Q29udHJvbGxlci5oPgogI2ltcG9ydCA8V2ViQ29y ZS9FbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZpbGVDaG9vc2VyLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5oPgogI2ltcG9ydCA8 V2ViQ29yZS9GcmFtZUxvYWRSZXF1ZXN0Lmg+CisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lVmlldy5o PgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MTmFtZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvSGl0VGVz dFJlc3VsdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9JY29uLmg+CisjaW1wb3J0IDxXZWJDb3JlL0lu dFBvaW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ludFJlY3QuaD4KICNpbXBvcnQgPFdlYkNvcmUv TmF2aWdhdGlvbkFjdGlvbi5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CkBAIC04NzYsNiAr ODgwLDM5IEBAIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2VhcmNoUG9wdXBNZW51PiBXZWIKICAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IFNlYXJjaFBvcHVwTWVudU1hYyhjbGllbnQpKTsKIH0KIAorI2lm IEVOQUJMRShDT05URVhUX01FTlVTKQordm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNob3dDb250ZXh0 TWVudSgpCit7CisgICAgV2ViQ29yZTo6UGFnZSogcGFnZSA9IFttX3dlYlZpZXcgcGFnZV07Cisg ICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisgICAgQ29udGV4dE1lbnVDb250cm9sbGVy KiBjb250cm9sbGVyID0gcGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCk7CisgICAgaWYgKCFj b250cm9sbGVyKQorICAgICAgICByZXR1cm47CisgICAgQ29udGV4dE1lbnUqIG1lbnUgPSBjb250 cm9sbGVyLT5jb250ZXh0TWVudSgpOworICAgIGlmICghbWVudSkKKyAgICAgICAgcmV0dXJuOwor ICAgIE5vZGUqIG5vZGUgPSBjb250cm9sbGVyLT5oaXRUZXN0UmVzdWx0KCkuaW5uZXJOb25TaGFy ZWROb2RlKCk7CisgICAgaWYgKCFub2RlKQorICAgICAgICByZXR1cm47CisgICAgRnJhbWUqIGZy YW1lID0gbm9kZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAg ICByZXR1cm47CisgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZS0+dmlldygpOworICAg IGlmICghZnJhbWVWaWV3KQorICAgICAgICByZXR1cm47CisgICAgTlNWaWV3KiB2aWV3ID0gZnJh bWVWaWV3LT5kb2N1bWVudFZpZXcoKTsKKyAgICAKKyAgICBJbnRQb2ludCBwb2ludCA9IGZyYW1l Vmlldy0+Y29udGVudHNUb1dpbmRvdyhjb250cm9sbGVyLT5oaXRUZXN0UmVzdWx0KCkucG9pbnQo KSk7CisgICAgTlNQb2ludCBuc1NjcmVlblBvaW50ID0gW3ZpZXcgY29udmVydFBvaW50OnBvaW50 IHRvVmlldzpuaWxdOworICAgIC8vIFNob3cgdGhlIGNvbnRleHR1YWwgbWVudSBmb3IgdGhpcyBl dmVudC4KKyAgICBOU0V2ZW50KiBldmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlwZTpO U1JpZ2h0TW91c2VEb3duIGxvY2F0aW9uOm5zU2NyZWVuUG9pbnQgbW9kaWZpZXJGbGFnczowIHRp bWVzdGFtcDowIHdpbmRvd051bWJlcjpbW3ZpZXcgd2luZG93XSB3aW5kb3dOdW1iZXJdIGNvbnRl eHQ6MCBldmVudE51bWJlcjowIGNsaWNrQ291bnQ6MSBwcmVzc3VyZToxXTsKKyAgICBOU01lbnUq IG5zTWVudSA9IFt2aWV3IG1lbnVGb3JFdmVudDpldmVudF07CisgICAgaWYgKG5zTWVudSkKKyAg ICAgICAgW05TTWVudSBwb3BVcENvbnRleHRNZW51Om5zTWVudSB3aXRoRXZlbnQ6ZXZlbnQgZm9y Vmlldzp2aWV3XTsgICAgCit9CisjZW5kaWYKKwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmF0dGFjaFJvb3RHcmFwaGljc0xheWVyKEZy YW1lKiBmcmFtZSwgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllcikK