61543 2011-05-26 10:33:27 -0700 Inform ChromeClient touch events are not needed by the webpage when navigating away from the page instead of in both Document:detach/CachedFrame 2011-06-07 09:20:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dinu.jacob dinu.jacob benm dglazkov hausmann webkit.review.bot oldest_to_newest 410581 0 dinu.jacob 2011-05-26 10:33:27 -0700 Currently, the chrome client is informed that the touch events are not needed in Document::detach / CachedFramed constructor. When loading a new page, the old page is added to page cache and the chrome client is informed that touch events are not needed anymore in the CachedFrame constructor. However, if the page cache capacity has been reached, the oldest item is marked to be removed from the cache and a timer is started. The item is removed from cache when the timer expires. When the item is removed, Document:detach is called which informs (incorrectly) chrome client that touch events are not needed. If the current page loaded has touch event listeners, it will not get touch events anymore. As needTouchEvents method takes only a boolean, there is no indication that the flag was reset for the older document being detached. It might be better to reset the flag at the time we navigate away from the current page. Patch to follow shortly. 410587 1 95003 dinu.jacob 2011-05-26 10:45:23 -0700 Created attachment 95003 First attempt 412919 2 hausmann 2011-05-31 15:15:21 -0700 CC'ing Ben and Dimitry, as this code was added in bug #34215 413434 3 95003 benm 2011-06-01 09:29:39 -0700 Comment on attachment 95003 First attempt View in context: https://bugs.webkit.org/attachment.cgi?id=95003&action=review Thanks for spotting this bug! Have a question about the proposed patch. > Source/WebCore/loader/FrameLoader.cpp:2074 > + m_frame->page()->chrome()->client()->needTouchEvents(false); Will this now trigger clearing the flag on frame navigation? For example, imagine a page with an iframe and we perform a navigation inside the frame. What will happen to touch events in the parent frame? The old code ensured that it was the main frame performing the navigation before clearing the flag. Is it possible to write a layout test? It would be good to ensure the correct behavior in this scenario. 413490 4 dinu.jacob 2011-06-01 10:51:13 -0700 (In reply to comment #3) > (From update of attachment 95003 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95003&action=review > > Thanks for spotting this bug! Have a question about the proposed patch. > > > Source/WebCore/loader/FrameLoader.cpp:2074 > > + m_frame->page()->chrome()->client()->needTouchEvents(false); > > Will this now trigger clearing the flag on frame navigation? For example, imagine a page with an iframe and we perform a navigation inside the frame. What will happen to touch events in the parent frame? The old code ensured that it was the main frame performing the navigation before clearing the flag. > > Is it possible to write a layout test? It would be good to ensure the correct behavior in this scenario. Thanks for your feedback Ben. Yes, with the current patch it will reset the flag when we are navigating within an iframe. I can reset the flag only for the main frame to avoid resetting the flag for iframes. I started writing a layout test but realised that for WebKit2 I can't yet use the eventSender to send the touch events. Is there any other way I can achieve this for WebKit2? 414198 5 95770 dinu.jacob 2011-06-02 09:41:01 -0700 Created attachment 95770 Patch with fix for iframe navigation 416476 6 dinu.jacob 2011-06-07 06:56:18 -0700 Hi Ben/Dimitri, Can you please provide your input on the latest patch? Thanks, Dinu 416489 7 95770 benm 2011-06-07 07:32:50 -0700 Comment on attachment 95770 Patch with fix for iframe navigation View in context: https://bugs.webkit.org/attachment.cgi?id=95770&action=review > Source/WebCore/ChangeLog:5 > + Inform ChromeClient touch events are not needed by the webpage when navigating away from the page instead of in both Document:detach/CachedFrame Hi Dinu, I'm a little confused about the ChangeLog message - just want to make sure I have the flow of events right. You've added the new code to FrameLoader::transitionToCommitted. Does that not mean when we are "committed" to loading the new page rather than necessarily navigating away from the old one? So we're setting the flag to false after committing to loading a new page, but before that new page could have registered any new touch event handlers, right? 416491 8 dinu.jacob 2011-06-07 07:36:24 -0700 (In reply to comment #7) > (From update of attachment 95770 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95770&action=review > > > Source/WebCore/ChangeLog:5 > > + Inform ChromeClient touch events are not needed by the webpage when navigating away from the page instead of in both Document:detach/CachedFrame > > Hi Dinu, I'm a little confused about the ChangeLog message - just want to make sure I have the flow of events right. You've added the new code to FrameLoader::transitionToCommitted. Does that not mean when we are "committed" to loading the new page rather than necessarily navigating away from the old one? So we're setting the flag to false after committing to loading a new page, but before that new page could have registered any new touch event handlers, right? Hi Ben, Yes, that's exactly what is being done. If the use of "navigating away from the old page" is confusing I can replace it with "committed to loading a new page". Dinu 416537 9 benm 2011-06-07 08:57:07 -0700 That's OK - perhaps if you need to rebase the patch for landing then you could update it. The code LGTM, but it'd be really nice to add a test as this behavior depends on FrameLoader::transitionToCommitted getting called before CachedFrame::restore. Fine at the moment, but should something get refactored in the future it'd be really easy to break this behavior without noticing ... maybe we can have a test on a non-WebKit2 platform? I don't have powers to r+ so I will defer to someone who does :) 416538 10 95770 dglazkov 2011-06-07 08:58:12 -0700 Comment on attachment 95770 Patch with fix for iframe navigation rs=me. 416540 11 95770 dinu.jacob 2011-06-07 09:01:01 -0700 Comment on attachment 95770 Patch with fix for iframe navigation Forgot to request commit as well. Please commit for me. 416544 12 dinu.jacob 2011-06-07 09:05:56 -0700 (In reply to comment #9) > That's OK - perhaps if you need to rebase the patch for landing then you could update it. > > The code LGTM, but it'd be really nice to add a test as this behavior depends on FrameLoader::transitionToCommitted getting called before CachedFrame::restore. Fine at the moment, but should something get refactored in the future it'd be really easy to break this behavior without noticing ... maybe we can have a test on a non-WebKit2 platform? I don't have powers to r+ so I will defer to someone who does :) Thanks Ben. I will try to come up with a test that can be tested on a non-WebKit2 platform. Dinu 416549 13 95770 webkit.review.bot 2011-06-07 09:20:18 -0700 Comment on attachment 95770 Patch with fix for iframe navigation Clearing flags on attachment: 95770 Committed r88242: <http://trac.webkit.org/changeset/88242> 416550 14 webkit.review.bot 2011-06-07 09:20:24 -0700 All reviewed patches have been landed. Closing bug. 95003 2011-05-26 10:45:23 -0700 2011-06-02 09:41:01 -0700 First attempt 61543.patch text/plain 3425 dinu.jacob SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3Mzk5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMjYgIERpbnUgSmFj b2IgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbmZvcm0gQ2hyb21lQ2xpZW50IHRvdWNoIGV2ZW50cyBhcmUg bm90IG5lZWRlZCBieSB0aGUgd2VicGFnZSB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIHRoZSBw YWdlIGluc3RlYWQgb2YgaW4gYm90aCBEb2N1bWVudDpkZXRhY2gvQ2FjaGVkRnJhbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNTQzCisKKyAgICAg ICAgSW5mb3JtIGNocm9tZSBjbGllbnQgdGhhdCB0b3VjaCBldmVudHMgYXJlIG5vdCBuZWVkZWQg YnkgdGhlIHdlYnBhZ2Ugd2hlbiBuYXZpZ2F0aW5nIGF3YXkgZnJvbSB0aGUgcGFnZSBvbmx5IG9u Y2UgdG8gYXZvaWQgdGhlIGZsYWcgYmVpbmcgb3ZlcndyaXR0ZW4gbGF0ZXIgaWYgYSBwYWdlIGlz IHJlbW92ZWQgZnJvbSB0aGUgcGFnZSBjYWNoZQorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkZXRhY2gpOgorICAgICAgICAqIGhpc3Rv cnkvQ2FjaGVkRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6OkNhY2hl ZEZyYW1lKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6CisKIDIwMTEtMDUtMjYg IE1pY2hhZWwgU2NobmVpZGVyICA8bWljaHNjaG5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZp c2lvbiA4NzM4NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE3OTUsMTYgKzE3OTUsNiBAQCB2b2lkIERvY3VtZW50OjpkZXRhY2goKQogICAg ICAgICBpZiAodmlldykKICAgICAgICAgICAgIHZpZXctPmRldGFjaEN1c3RvbVNjcm9sbGJhcnMo KTsKIAotI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCi0gICAgICAgIFBhZ2UqIG93bmVyUGFnZSA9 IHBhZ2UoKTsKLSAgICAgICAgaWYgKG93bmVyUGFnZSAmJiAobV9mcmFtZSA9PSBvd25lclBhZ2Ut Pm1haW5GcmFtZSgpKSkgewotICAgICAgICAgICAgLy8gSW5mb3JtIHRoZSBDaHJvbWUgQ2xpZW50 IHRoYXQgaXQgbm8gbG9uZ2VyIG5lZWRzIHRvCi0gICAgICAgICAgICAvLyBmb3dhcmQgdG91Y2gg ZXZlbnRzIHRvIFdlYkNvcmUgYXMgdGhlIGRvY3VtZW50IGlzIGJlaW5nCi0gICAgICAgICAgICAv LyBkZXN0cm95ZWQuIEl0IG1heSBzdGFydCBhZ2FpbiBpZiBhIHN1YnNlcXVlbnQgcGFnZQotICAg ICAgICAgICAgLy8gcmVnaXN0ZXJzIGEgdG91Y2ggZXZlbnQgbGlzdGVuZXIuCi0gICAgICAgICAg ICBvd25lclBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+bmVlZFRvdWNoRXZlbnRzKGZhbHNlKTsK LSAgICAgICAgfQotI2VuZGlmCiAgICAgfQogCiAgICAgLy8gaW5kaWNhdGUgZGVzdHJ1Y3Rpb24g bW9kZSwgIGkuZS4gYXR0YWNoZWQoKSBidXQgcmVuZGVyZXIgPT0gMApJbmRleDogU291cmNlL1dl YkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHJldmlzaW9uIDg3Mzg2KQorKysgU291cmNlL1dl YkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MywxMCAr MTgzLDYgQEAgQ2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKEZyYW1lKiBmcmFtZSkKICAgICAgICAg TE9HKFBhZ2VDYWNoZSwgIkZpbmlzaGVkIGNyZWF0aW5nIENhY2hlZEZyYW1lIGZvciBjaGlsZCBm cmFtZSB3aXRoIHVybCAnJXMnIGFuZCBEb2N1bWVudExvYWRlciAlcFxuIiwgbV91cmwuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSwgbV9kb2N1bWVudExvYWRlci5nZXQoKSk7CiAjZW5kaWYKIAotI2lm IEVOQUJMRShUT1VDSF9FVkVOVFMpCi0gICAgaWYgKG1fZG9jdW1lbnQtPmhhc0xpc3RlbmVyVHlw ZShEb2N1bWVudDo6VE9VQ0hfTElTVEVORVIpKQotICAgICAgICBtX2RvY3VtZW50LT5wYWdlKCkt PmNocm9tZSgpLT5jbGllbnQoKS0+bmVlZFRvdWNoRXZlbnRzKGZhbHNlKTsKLSNlbmRpZgogfQog CiB2b2lkIENhY2hlZEZyYW1lOjpvcGVuKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAkocmV2aXNpb24gODczODYpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw5IEBACiAjaW5jbHVkZSAi Q2FjaGVkUGFnZS5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNlTG9hZGVyLmgiCiAjaW5jbHVk ZSAiQ2hyb21lLmgiCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKKyNpbmNsdWRlICJDaHJvbWVD bGllbnQuaCIKKyNlbmRpZgogI2luY2x1ZGUgIkNvbnNvbGUuaCIKICNpbmNsdWRlICJDb250ZW50 U2VjdXJpdHlQb2xpY3kuaCIKICNpbmNsdWRlICJET01JbXBsZW1lbnRhdGlvbi5oIgpAQCAtMjA2 Nyw2ICsyMDcwLDEwIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCgK ICAgICBzZXRQcm92aXNpb25hbERvY3VtZW50TG9hZGVyKDApOwogICAgIHNldFN0YXRlKEZyYW1l U3RhdGVDb21taXR0ZWRQYWdlKTsKIAorI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCisgICAgbV9m cmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPm5lZWRUb3VjaEV2ZW50cyhmYWxzZSk7 CisjZW5kaWYKKwogICAgIC8vIEhhbmRsZSBhZGRpbmcgdGhlIFVSTCB0byB0aGUgYmFjay9mb3J3 YXJkIGxpc3QuCiAgICAgRG9jdW1lbnRMb2FkZXIqIGRsID0gbV9kb2N1bWVudExvYWRlci5nZXQo KTsKIAo= 95770 2011-06-02 09:41:01 -0700 2011-06-07 09:20:18 -0700 Patch with fix for iframe navigation 61543_1.patch text/plain 3478 dinu.jacob SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3OTE5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMDIgIERpbnUgSmFj b2IgIDxkaW51LmphY29iQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbmZvcm0gQ2hyb21lQ2xpZW50IHRvdWNoIGV2ZW50cyBhcmUg bm90IG5lZWRlZCBieSB0aGUgd2VicGFnZSB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIHRoZSBw YWdlIGluc3RlYWQgb2YgaW4gYm90aCBEb2N1bWVudDpkZXRhY2gvQ2FjaGVkRnJhbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNTQzCisKKyAgICAg ICAgSW5mb3JtIGNocm9tZSBjbGllbnQgdGhhdCB0b3VjaCBldmVudHMgYXJlIG5vdCBuZWVkZWQg YnkgdGhlIHdlYnBhZ2UgCisgICAgICAgIHdoZW4gbmF2aWdhdGluZyBhd2F5IGZyb20gdGhlIHBh Z2Ugb25seSBvbmNlIHRvIGF2b2lkIHRoZSBmbGFnIGJlaW5nIAorICAgICAgICBvdmVyd3JpdHRl biBsYXRlciBpZiBhIHBhZ2UgaXMgcmVtb3ZlZCBmcm9tIHRoZSBwYWdlIGNhY2hlCisKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmRldGFj aCk6CisgICAgICAgICogaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDYWNoZWRGcmFtZTo6Q2FjaGVkRnJhbWUpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkKToKKwogMjAxMS0wNi0wMiAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCShyZXZpc2lvbiA4NzkwMikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3OTYsMTYgKzE3OTYsNiBAQCB2b2lkIERvY3Vt ZW50OjpkZXRhY2goKQogICAgICAgICBpZiAodmlldykKICAgICAgICAgICAgIHZpZXctPmRldGFj aEN1c3RvbVNjcm9sbGJhcnMoKTsKIAotI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCi0gICAgICAg IFBhZ2UqIG93bmVyUGFnZSA9IHBhZ2UoKTsKLSAgICAgICAgaWYgKG93bmVyUGFnZSAmJiAobV9m cmFtZSA9PSBvd25lclBhZ2UtPm1haW5GcmFtZSgpKSkgewotICAgICAgICAgICAgLy8gSW5mb3Jt IHRoZSBDaHJvbWUgQ2xpZW50IHRoYXQgaXQgbm8gbG9uZ2VyIG5lZWRzIHRvCi0gICAgICAgICAg ICAvLyBmb3dhcmQgdG91Y2ggZXZlbnRzIHRvIFdlYkNvcmUgYXMgdGhlIGRvY3VtZW50IGlzIGJl aW5nCi0gICAgICAgICAgICAvLyBkZXN0cm95ZWQuIEl0IG1heSBzdGFydCBhZ2FpbiBpZiBhIHN1 YnNlcXVlbnQgcGFnZQotICAgICAgICAgICAgLy8gcmVnaXN0ZXJzIGEgdG91Y2ggZXZlbnQgbGlz dGVuZXIuCi0gICAgICAgICAgICBvd25lclBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+bmVlZFRv dWNoRXZlbnRzKGZhbHNlKTsKLSAgICAgICAgfQotI2VuZGlmCiAgICAgfQogCiAgICAgLy8gaW5k aWNhdGUgZGVzdHJ1Y3Rpb24gbW9kZSwgIGkuZS4gYXR0YWNoZWQoKSBidXQgcmVuZGVyZXIgPT0g MApJbmRleDogU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHJldmlzaW9uIDg3 OTAyKQorKysgU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE4MywxMCArMTgzLDYgQEAgQ2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKEZyYW1l KiBmcmFtZSkKICAgICAgICAgTE9HKFBhZ2VDYWNoZSwgIkZpbmlzaGVkIGNyZWF0aW5nIENhY2hl ZEZyYW1lIGZvciBjaGlsZCBmcmFtZSB3aXRoIHVybCAnJXMnIGFuZCBEb2N1bWVudExvYWRlciAl cFxuIiwgbV91cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgbV9kb2N1bWVudExvYWRlci5nZXQo KSk7CiAjZW5kaWYKIAotI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCi0gICAgaWYgKG1fZG9jdW1l bnQtPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6VE9VQ0hfTElTVEVORVIpKQotICAgICAgICBt X2RvY3VtZW50LT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+bmVlZFRvdWNoRXZlbnRzKGZh bHNlKTsKLSNlbmRpZgogfQogCiB2b2lkIENhY2hlZEZyYW1lOjpvcGVuKCkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gODc5MDIpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0 MSw5IEBACiAjaW5jbHVkZSAiQ2FjaGVkUGFnZS5oIgogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNl TG9hZGVyLmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykK KyNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKKyNlbmRpZgogI2luY2x1ZGUgIkNvbnNvbGUuaCIK ICNpbmNsdWRlICJDb250ZW50U2VjdXJpdHlQb2xpY3kuaCIKICNpbmNsdWRlICJET01JbXBsZW1l bnRhdGlvbi5oIgpAQCAtMjA2Nyw2ICsyMDcwLDExIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5z aXRpb25Ub0NvbW1pdHRlZCgKICAgICBzZXRQcm92aXNpb25hbERvY3VtZW50TG9hZGVyKDApOwog ICAgIHNldFN0YXRlKEZyYW1lU3RhdGVDb21taXR0ZWRQYWdlKTsKIAorI2lmIEVOQUJMRShUT1VD SF9FVkVOVFMpCisgICAgaWYgKGlzTG9hZGluZ01haW5GcmFtZSgpKQorICAgICAgICBtX2ZyYW1l LT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+bmVlZFRvdWNoRXZlbnRzKGZhbHNlKTsKKyNl bmRpZgorCiAgICAgLy8gSGFuZGxlIGFkZGluZyB0aGUgVVJMIHRvIHRoZSBiYWNrL2ZvcndhcmQg bGlzdC4KICAgICBEb2N1bWVudExvYWRlciogZGwgPSBtX2RvY3VtZW50TG9hZGVyLmdldCgpOwog Cg==