75506 2012-01-03 17:10:16 -0800 Improve touch handling performance by reusing the hitTest result 2012-03-22 13:30:22 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 qinmin webkit-unassigned abarth allan.jensen ap webkit.review.bot yong.li.webkit oldest_to_newest 529180 0 qinmin 2012-01-03 17:10:16 -0800 Currently we are doing a hit test for every touch events, this is unnecessary. For TouchRelease and TouchMove events, the touchTarget is always the same as the TouchPressed event. Even worse, performing a hitTest on a TouchMove could give us a new containing frame as finger moves. This could totally mess up the touch handling. One good example for this is scrolling http://www.nme.com/reviews/young-knives/11931 on android browser with galaxy nexus. Touch the first paragraph and start scrolling upwards. When finger reaches the video area, flickering will appear. This change reuses the hit test results from TouchPressed for further touch events. 529192 1 121025 qinmin 2012-01-03 17:18:05 -0800 Created attachment 121025 Patch 529702 2 ap 2012-01-04 13:27:45 -0800 > For TouchRelease and TouchMove events, the touchTarget is always the same as the TouchPressed event. Is it really the case? Page content may move, so another element will be at the touch position. The original element may even be removed already. 529726 3 qinmin 2012-01-04 13:52:03 -0800 Yes, this is the case. TouchTarget should not change before finger is released. In the current EventHandler.cc, for example, the touchTarget for TouchRelease and TouchMove is always the node given by TouchPressed. Yes, the touchTarget could be removed during touch moves. But since it is ref counted, so as long as eventHandler maintains a pointer to it, it will not be GCed. And subsequent events send to it should do nothing. (In reply to comment #2) > > For TouchRelease and TouchMove events, the touchTarget is always the same as the TouchPressed event. > > Is it really the case? Page content may move, so another element will be at the touch position. The original element may even be removed already. 529746 4 qinmin 2012-01-04 14:14:48 -0800 From the spec: https://dvcs.w3.org/hg/webevents/raw-file/tip/touchevents.html 5.6 The touchmove event The target of this event must be the same Element on which the touch point started when it was first placed on the surface, even if the touch point has since moved outside the interactive area of the target element. (In reply to comment #3) > Yes, this is the case. TouchTarget should not change before finger is released. In the current EventHandler.cc, for example, the touchTarget for TouchRelease and TouchMove is always the node given by TouchPressed. > Yes, the touchTarget could be removed during touch moves. But since it is ref counted, so as long as eventHandler maintains a pointer to it, it will not be GCed. And subsequent events send to it should do nothing. > > (In reply to comment #2) > > > For TouchRelease and TouchMove events, the touchTarget is always the same as the TouchPressed event. > > > > Is it really the case? Page content may move, so another element will be at the touch position. The original element may even be removed already. 538088 5 121025 abarth 2012-01-18 12:54:45 -0800 Comment on attachment 121025 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121025&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) We won't be able to land this patch with this line in the ChangeLog. In cases like this, we usually replace this line with a sentence saying that that patch is a performance optimization only and shouldn't have any behavior changes. 538108 6 122981 qinmin 2012-01-18 13:32:17 -0800 Created attachment 122981 Patch 538801 7 qinmin 2012-01-19 10:45:18 -0800 ChangeLog fixed 538999 8 122981 abarth 2012-01-19 13:48:22 -0800 Comment on attachment 122981 Patch Thanks. 539064 9 122981 webkit.review.bot 2012-01-19 15:07:26 -0800 Comment on attachment 122981 Patch Clearing flags on attachment: 122981 Committed r105453: <http://trac.webkit.org/changeset/105453> 539065 10 webkit.review.bot 2012-01-19 15:07:31 -0800 All reviewed patches have been landed. Closing bug. 540515 11 allan.jensen 2012-01-23 06:41:45 -0800 We already have code that avoids moving the frame on hittests that are read-only. Was this really necessary in trunk to fix this bug? While this patch is still an optimization. It makes it impossible to improve the :active handling to for instance stop showing :active if the finger moves off the target. :active is used to show the user what is activated, but once the finger ends off the target this link will no longer be activated, and thus the :active feedback to user will be wrong. 540536 12 qinmin 2012-01-23 07:43:44 -0800 Why is it hard to show :active? Since the touchTarget won't change, the last hittest results could be reused as finger moves off the target. So your :active link won't change during a touch down->touch move->touch release On some pages, doing a hittest on each touchMove can be really expensive. the espn blog page is a good example. It invokes a layout each time when a move happens. each layout could take more than 500 msec to do. And this change also avoids the problem that finger could move to another element after touchDown. One good example for this is scrolling http://www.nme.com/reviews/young-knives/11931 on android browser. Touch the first paragraph and start scrolling upwards. When finger reaches the video area, flickering will appear as a new hittest will return a different pagePoint as the condition of if statement becomes true. if (m_frame != doc->frame()) { // pagePoint should always be relative to the target elements contai ning frame. pagePoint = documentPointForWindowPoint(doc->frame(), point.pos()); } (In reply to comment #11) > We already have code that avoids moving the frame on hittests that are read-only. Was this really necessary in trunk to fix this bug? > > While this patch is still an optimization. It makes it impossible to improve the :active handling to for instance stop showing :active if the finger moves off the target. > > :active is used to show the user what is activated, but once the finger ends off the target this link will no longer be activated, and thus the :active feedback to user will be wrong. 540546 13 qinmin 2012-01-23 07:58:51 -0800 And one more thing on finger moves off the target: From the spec: https://dvcs.w3.org/hg/webevents/raw-file/tip/touchevents.html: 5.6 The touchmove event The target of this event must be the same Element on which the touch point started when it was first placed on the surface, even if the touch point has since moved outside the interactive area of the target element. Even if the finger is off the target, the :active should still remain on the touch down target. Until touch is released. So user should still see the original touch target is activated. (In reply to comment #11) > We already have code that avoids moving the frame on hittests that are read-only. Was this really necessary in trunk to fix this bug? > > While this patch is still an optimization. It makes it impossible to improve the :active handling to for instance stop showing :active if the finger moves off the target. > > :active is used to show the user what is activated, but once the finger ends off the target this link will no longer be activated, and thus the :active feedback to user will be wrong. 540547 14 allan.jensen 2012-01-23 08:03:11 -0800 (In reply to comment #12) > Why is it hard to show :active? Since the touchTarget won't change, the last hittest results could be reused as finger moves off the target. So your :active link won't change during a touch down->touch move->touch release > The point was to cancel :active and :hover if the activated object no longer is going to be activated by the current gesture. You make a good case for optimizing touch move, but are activated and hovered elements updated on TouchReleased or TouchCancelled? I believe maintaining the active- and hovered elements is usually done by the hitTest. If hitTest is not performed on touch-release the active or hovered elements will stick to the last hitTested result. Actually hover already stick, but I was going to fix that, but will need a hit-test on touch-release/cancel to do so. 585455 15 yong.li.webkit 2012-03-22 10:37:48 -0700 Document* doc = node->document(); 3264 if (!doc) 3265 continue; This check is moved to if (pointState == PlatformTouchPoint::TouchPressed) block. And we no longer check it for the other two cases. I know the node is locked by a RefPtr, however that doesn't prevent it from being evicted from the document. Will this cause potential crash? 585640 16 yong.li.webkit 2012-03-22 13:30:22 -0700 Bug 81958 is created for the regression. 121025 2012-01-03 17:18:05 -0800 2012-01-18 13:32:14 -0800 Patch bug-75506-20120103171804.patch text/plain 4297 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzOTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjNDlmOTI3Y2NhODQz YWUzNDg4MGJmMWE2M2E3NDkyYTBiYTJjZi4uNTA1NzYyN2ZkNjZiYjVmYzQ1NTllMzQ4ZjQzNmJl N2ViYjA3MDc4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTAzICBNaW4g UWluICA8cWlubWluQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSB0b3VjaCBoYW5kbGlu ZyBwZXJmb3JtYW5jZSBieSByZXVzaW5nIHRoZSBoaXRUZXN0IHJlc3VsdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU1MDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkK KworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hFdmVudCk6CisKIDIwMTItMDEtMDMgIFl1emh1IFNoZW4g IDx5enNoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIHY4IGJpbmRpbmc6IG5wQ3JlYXRlVjhT Y3JpcHRPYmplY3QoKSBzaG91bGQgbm90IHJldHVybmVkIGFuIGV4aXN0aW5nIFY4TlBPYmplY3Qg aWYgdGhlIHJvb3RPYmplY3QgZG9lc24ndCBtYXRjaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCmluZGV4IGMyMWViN2UyNWMxZDlkY2E0ODA2NGQyOTgzOTViMzM0YWJlZTUyNDYuLmFj ZTRkZDQ4OGRkZGU1NTM5ZjJmYjdiNjcwZGE3YzUwNmY5NDAzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKQEAgLTMyMzcsMzQgKzMyMzcsMjQgQEAgYm9vbCBFdmVudEhhbmRs ZXI6OmhhbmRsZVRvdWNoRXZlbnQoY29uc3QgUGxhdGZvcm1Ub3VjaEV2ZW50JiBldmVudCkKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgSGl0VGVzdFJlc3VsdCByZXN1 bHQgPSBoaXRUZXN0UmVzdWx0QXRQb2ludChwYWdlUG9pbnQsIC8qYWxsb3dTaGFkb3dDb250ZW50 Ki8gZmFsc2UsIGZhbHNlLCBEb250SGl0VGVzdFNjcm9sbGJhcnMsIGhpdFR5cGUpOwotICAgICAg ICBOb2RlKiBub2RlID0gcmVzdWx0LmlubmVyTm9kZSgpOwotICAgICAgICBBU1NFUlQobm9kZSk7 Ci0KLSAgICAgICAgLy8gVG91Y2ggZXZlbnRzIHNob3VsZCBub3QgZ28gdG8gdGV4dCBub2Rlcwot ICAgICAgICBpZiAobm9kZS0+aXNUZXh0Tm9kZSgpKQotICAgICAgICAgICAgbm9kZSA9IG5vZGUt PnBhcmVudE5vZGUoKTsKLQotICAgICAgICBEb2N1bWVudCogZG9jID0gbm9kZS0+ZG9jdW1lbnQo KTsKLSAgICAgICAgaWYgKCFkb2MpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYg KCFkb2MtPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6VE9VQ0hfTElTVEVORVIpKQotICAgICAg ICAgICAgY29udGludWU7Ci0KLSAgICAgICAgaWYgKG1fZnJhbWUgIT0gZG9jLT5mcmFtZSgpKSB7 Ci0gICAgICAgICAgICAvLyBwYWdlUG9pbnQgc2hvdWxkIGFsd2F5cyBiZSByZWxhdGl2ZSB0byB0 aGUgdGFyZ2V0IGVsZW1lbnRzIGNvbnRhaW5pbmcgZnJhbWUuCi0gICAgICAgICAgICBwYWdlUG9p bnQgPSBkb2N1bWVudFBvaW50Rm9yV2luZG93UG9pbnQoZG9jLT5mcmFtZSgpLCBwb2ludC5wb3Mo KSk7Ci0gICAgICAgIH0KLQotICAgICAgICBmbG9hdCBzY2FsZUZhY3RvciA9IG1fZnJhbWUtPnBh Z2Vab29tRmFjdG9yKCkgKiBtX2ZyYW1lLT5mcmFtZVNjYWxlRmFjdG9yKCk7Ci0KLSAgICAgICAg aW50IGFkanVzdGVkUGFnZVggPSBscm91bmRmKHBhZ2VQb2ludC54KCkgLyBzY2FsZUZhY3Rvcik7 Ci0gICAgICAgIGludCBhZGp1c3RlZFBhZ2VZID0gbHJvdW5kZihwYWdlUG9pbnQueSgpIC8gc2Nh bGVGYWN0b3IpOwotCiAgICAgICAgIC8vIEluY3JlbWVudCB0aGUgcGxhdGZvcm0gdG91Y2ggaWQg YnkgMSB0byBhdm9pZCBzdG9yaW5nIGEga2V5IG9mIDAgaW4gdGhlIGhhc2htYXAuCiAgICAgICAg IHVuc2lnbmVkIHRvdWNoUG9pbnRUYXJnZXRLZXkgPSBwb2ludC5pZCgpICsgMTsKICAgICAgICAg UmVmUHRyPEV2ZW50VGFyZ2V0PiB0b3VjaFRhcmdldDsKICAgICAgICAgaWYgKHBvaW50U3RhdGUg PT0gUGxhdGZvcm1Ub3VjaFBvaW50OjpUb3VjaFByZXNzZWQpIHsKKyAgICAgICAgICAgIEhpdFRl c3RSZXN1bHQgcmVzdWx0ID0gaGl0VGVzdFJlc3VsdEF0UG9pbnQocGFnZVBvaW50LCAvKmFsbG93 U2hhZG93Q29udGVudCovIGZhbHNlLCBmYWxzZSwgRG9udEhpdFRlc3RTY3JvbGxiYXJzLCBoaXRU eXBlKTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGUgPSByZXN1bHQuaW5uZXJOb2RlKCk7CisgICAg ICAgICAgICBBU1NFUlQobm9kZSk7CisKKyAgICAgICAgICAgIC8vIFRvdWNoIGV2ZW50cyBzaG91 bGQgbm90IGdvIHRvIHRleHQgbm9kZXMKKyAgICAgICAgICAgIGlmIChub2RlLT5pc1RleHROb2Rl KCkpCisgICAgICAgICAgICAgICAgbm9kZSA9IG5vZGUtPnBhcmVudE5vZGUoKTsKKworICAgICAg ICAgICAgRG9jdW1lbnQqIGRvYyA9IG5vZGUtPmRvY3VtZW50KCk7CisgICAgICAgICAgICBpZiAo IWRvYykKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmICghZG9jLT5o YXNMaXN0ZW5lclR5cGUoRG9jdW1lbnQ6OlRPVUNIX0xJU1RFTkVSKSkKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKwogICAgICAgICAgICAgbV9vcmlnaW5hdGluZ1RvdWNoUG9pbnRUYXJnZXRz LnNldCh0b3VjaFBvaW50VGFyZ2V0S2V5LCBub2RlKTsKICAgICAgICAgICAgIHRvdWNoVGFyZ2V0 ID0gbm9kZTsKICAgICAgICAgfSBlbHNlIGlmIChwb2ludFN0YXRlID09IFBsYXRmb3JtVG91Y2hQ b2ludDo6VG91Y2hSZWxlYXNlZCB8fCBwb2ludFN0YXRlID09IFBsYXRmb3JtVG91Y2hQb2ludDo6 VG91Y2hDYW5jZWxsZWQpIHsKQEAgLTMyNzcsNyArMzI2NywxOCBAQCBib29sIEV2ZW50SGFuZGxl cjo6aGFuZGxlVG91Y2hFdmVudChjb25zdCBQbGF0Zm9ybVRvdWNoRXZlbnQmIGV2ZW50KQogICAg ICAgICBpZiAoIXRvdWNoVGFyZ2V0LmdldCgpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAg ICAgICAgUmVmUHRyPFRvdWNoPiB0b3VjaCA9IFRvdWNoOjpjcmVhdGUoZG9jLT5mcmFtZSgpLCB0 b3VjaFRhcmdldC5nZXQoKSwgcG9pbnQuaWQoKSwKKyAgICAgICAgRnJhbWUqIHRhcmdldEZyYW1l ID0gdG91Y2hUYXJnZXQtPnRvTm9kZSgpLT5kb2N1bWVudCgpLT5mcmFtZSgpOworICAgICAgICBp ZiAobV9mcmFtZSAhPSB0YXJnZXRGcmFtZSkgeworICAgICAgICAgICAgLy8gcGFnZVBvaW50IHNo b3VsZCBhbHdheXMgYmUgcmVsYXRpdmUgdG8gdGhlIHRhcmdldCBlbGVtZW50cyBjb250YWluaW5n IGZyYW1lLgorICAgICAgICAgICAgcGFnZVBvaW50ID0gZG9jdW1lbnRQb2ludEZvcldpbmRvd1Bv aW50KHRhcmdldEZyYW1lLCBwb2ludC5wb3MoKSk7CisgICAgICAgIH0KKworICAgICAgICBmbG9h dCBzY2FsZUZhY3RvciA9IHRhcmdldEZyYW1lLT5wYWdlWm9vbUZhY3RvcigpICogdGFyZ2V0RnJh bWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKKworICAgICAgICBpbnQgYWRqdXN0ZWRQYWdlWCA9IGxy b3VuZGYocGFnZVBvaW50LngoKSAvIHNjYWxlRmFjdG9yKTsKKyAgICAgICAgaW50IGFkanVzdGVk UGFnZVkgPSBscm91bmRmKHBhZ2VQb2ludC55KCkgLyBzY2FsZUZhY3Rvcik7CisKKyAgICAgICAg UmVmUHRyPFRvdWNoPiB0b3VjaCA9IFRvdWNoOjpjcmVhdGUodGFyZ2V0RnJhbWUsIHRvdWNoVGFy Z2V0LmdldCgpLCBwb2ludC5pZCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwb2ludC5zY3JlZW5Qb3MoKS54KCksIHBvaW50LnNjcmVlblBvcygpLnkoKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRqdXN0ZWRQYWdl WCwgYWRqdXN0ZWRQYWdlWSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcG9pbnQucmFkaXVzWCgpLCBwb2ludC5yYWRpdXNZKCksIHBvaW50LnJvdGF0aW9uQW5n bGUoKSwgcG9pbnQuZm9yY2UoKSk7Cg== 122981 2012-01-18 13:32:17 -0800 2012-01-19 15:07:26 -0800 Patch bug-75506-20120118133216.patch text/plain 4381 qinmin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzOTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjNDlmOTI3Y2NhODQz YWUzNDg4MGJmMWE2M2E3NDkyYTBiYTJjZi4uZDAzYWY0OTRkMTNiZWMxZWY0ZWQ3ZTg4Nzk0M2Rl ZmRkNTVkOGY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTE4ICBNaW4g UWluICA8cWlubWluQGdvb2dsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSB0b3VjaCBoYW5kbGlu ZyBwZXJmb3JtYW5jZSBieSByZXVzaW5nIHRoZSBoaXRUZXN0IHJlc3VsdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU1MDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGEgcGVyZm9ybWFuY2Ug b3B0aW1pemF0aW9uIGFuZCBzaG91bGQgbm90IGNhdXNlIGJlaGF2aW9yIGNoYW5nZXMuIEV4aXN0 aW5nIHRlc3RzIHNob3VsZCBjb3ZlciBpdC4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hFdmVudCk6 CisKIDIwMTItMDEtMDMgIFl1emh1IFNoZW4gIDx5enNoZW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIHY4IGJpbmRpbmc6IG5wQ3JlYXRlVjhTY3JpcHRPYmplY3QoKSBzaG91bGQgbm90IHJldHVy bmVkIGFuIGV4aXN0aW5nIFY4TlBPYmplY3QgaWYgdGhlIHJvb3RPYmplY3QgZG9lc24ndCBtYXRj aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IGMyMWViN2UyNWMxZDlkY2E0 ODA2NGQyOTgzOTViMzM0YWJlZTUyNDYuLmFjZTRkZDQ4OGRkZGU1NTM5ZjJmYjdiNjcwZGE3YzUw NmY5NDAzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTMyMzcsMzQg KzMyMzcsMjQgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQoY29uc3QgUGxh dGZvcm1Ub3VjaEV2ZW50JiBldmVudCkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAK LSAgICAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQgPSBoaXRUZXN0UmVzdWx0QXRQb2ludChwYWdl UG9pbnQsIC8qYWxsb3dTaGFkb3dDb250ZW50Ki8gZmFsc2UsIGZhbHNlLCBEb250SGl0VGVzdFNj cm9sbGJhcnMsIGhpdFR5cGUpOwotICAgICAgICBOb2RlKiBub2RlID0gcmVzdWx0LmlubmVyTm9k ZSgpOwotICAgICAgICBBU1NFUlQobm9kZSk7Ci0KLSAgICAgICAgLy8gVG91Y2ggZXZlbnRzIHNo b3VsZCBub3QgZ28gdG8gdGV4dCBub2RlcwotICAgICAgICBpZiAobm9kZS0+aXNUZXh0Tm9kZSgp KQotICAgICAgICAgICAgbm9kZSA9IG5vZGUtPnBhcmVudE5vZGUoKTsKLQotICAgICAgICBEb2N1 bWVudCogZG9jID0gbm9kZS0+ZG9jdW1lbnQoKTsKLSAgICAgICAgaWYgKCFkb2MpCi0gICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFkb2MtPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVu dDo6VE9VQ0hfTElTVEVORVIpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgaWYg KG1fZnJhbWUgIT0gZG9jLT5mcmFtZSgpKSB7Ci0gICAgICAgICAgICAvLyBwYWdlUG9pbnQgc2hv dWxkIGFsd2F5cyBiZSByZWxhdGl2ZSB0byB0aGUgdGFyZ2V0IGVsZW1lbnRzIGNvbnRhaW5pbmcg ZnJhbWUuCi0gICAgICAgICAgICBwYWdlUG9pbnQgPSBkb2N1bWVudFBvaW50Rm9yV2luZG93UG9p bnQoZG9jLT5mcmFtZSgpLCBwb2ludC5wb3MoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBmbG9h dCBzY2FsZUZhY3RvciA9IG1fZnJhbWUtPnBhZ2Vab29tRmFjdG9yKCkgKiBtX2ZyYW1lLT5mcmFt ZVNjYWxlRmFjdG9yKCk7Ci0KLSAgICAgICAgaW50IGFkanVzdGVkUGFnZVggPSBscm91bmRmKHBh Z2VQb2ludC54KCkgLyBzY2FsZUZhY3Rvcik7Ci0gICAgICAgIGludCBhZGp1c3RlZFBhZ2VZID0g bHJvdW5kZihwYWdlUG9pbnQueSgpIC8gc2NhbGVGYWN0b3IpOwotCiAgICAgICAgIC8vIEluY3Jl bWVudCB0aGUgcGxhdGZvcm0gdG91Y2ggaWQgYnkgMSB0byBhdm9pZCBzdG9yaW5nIGEga2V5IG9m IDAgaW4gdGhlIGhhc2htYXAuCiAgICAgICAgIHVuc2lnbmVkIHRvdWNoUG9pbnRUYXJnZXRLZXkg PSBwb2ludC5pZCgpICsgMTsKICAgICAgICAgUmVmUHRyPEV2ZW50VGFyZ2V0PiB0b3VjaFRhcmdl dDsKICAgICAgICAgaWYgKHBvaW50U3RhdGUgPT0gUGxhdGZvcm1Ub3VjaFBvaW50OjpUb3VjaFBy ZXNzZWQpIHsKKyAgICAgICAgICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gaGl0VGVzdFJlc3Vs dEF0UG9pbnQocGFnZVBvaW50LCAvKmFsbG93U2hhZG93Q29udGVudCovIGZhbHNlLCBmYWxzZSwg RG9udEhpdFRlc3RTY3JvbGxiYXJzLCBoaXRUeXBlKTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGUg PSByZXN1bHQuaW5uZXJOb2RlKCk7CisgICAgICAgICAgICBBU1NFUlQobm9kZSk7CisKKyAgICAg ICAgICAgIC8vIFRvdWNoIGV2ZW50cyBzaG91bGQgbm90IGdvIHRvIHRleHQgbm9kZXMKKyAgICAg ICAgICAgIGlmIChub2RlLT5pc1RleHROb2RlKCkpCisgICAgICAgICAgICAgICAgbm9kZSA9IG5v ZGUtPnBhcmVudE5vZGUoKTsKKworICAgICAgICAgICAgRG9jdW1lbnQqIGRvYyA9IG5vZGUtPmRv Y3VtZW50KCk7CisgICAgICAgICAgICBpZiAoIWRvYykKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIGlmICghZG9jLT5oYXNMaXN0ZW5lclR5cGUoRG9jdW1lbnQ6OlRPVUNI X0xJU1RFTkVSKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKwogICAgICAgICAgICAgbV9v cmlnaW5hdGluZ1RvdWNoUG9pbnRUYXJnZXRzLnNldCh0b3VjaFBvaW50VGFyZ2V0S2V5LCBub2Rl KTsKICAgICAgICAgICAgIHRvdWNoVGFyZ2V0ID0gbm9kZTsKICAgICAgICAgfSBlbHNlIGlmIChw b2ludFN0YXRlID09IFBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hSZWxlYXNlZCB8fCBwb2ludFN0 YXRlID09IFBsYXRmb3JtVG91Y2hQb2ludDo6VG91Y2hDYW5jZWxsZWQpIHsKQEAgLTMyNzcsNyAr MzI2NywxOCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hFdmVudChjb25zdCBQbGF0 Zm9ybVRvdWNoRXZlbnQmIGV2ZW50KQogICAgICAgICBpZiAoIXRvdWNoVGFyZ2V0LmdldCgpKQog ICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgUmVmUHRyPFRvdWNoPiB0b3VjaCA9IFRv dWNoOjpjcmVhdGUoZG9jLT5mcmFtZSgpLCB0b3VjaFRhcmdldC5nZXQoKSwgcG9pbnQuaWQoKSwK KyAgICAgICAgRnJhbWUqIHRhcmdldEZyYW1lID0gdG91Y2hUYXJnZXQtPnRvTm9kZSgpLT5kb2N1 bWVudCgpLT5mcmFtZSgpOworICAgICAgICBpZiAobV9mcmFtZSAhPSB0YXJnZXRGcmFtZSkgewor ICAgICAgICAgICAgLy8gcGFnZVBvaW50IHNob3VsZCBhbHdheXMgYmUgcmVsYXRpdmUgdG8gdGhl IHRhcmdldCBlbGVtZW50cyBjb250YWluaW5nIGZyYW1lLgorICAgICAgICAgICAgcGFnZVBvaW50 ID0gZG9jdW1lbnRQb2ludEZvcldpbmRvd1BvaW50KHRhcmdldEZyYW1lLCBwb2ludC5wb3MoKSk7 CisgICAgICAgIH0KKworICAgICAgICBmbG9hdCBzY2FsZUZhY3RvciA9IHRhcmdldEZyYW1lLT5w YWdlWm9vbUZhY3RvcigpICogdGFyZ2V0RnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKKworICAg ICAgICBpbnQgYWRqdXN0ZWRQYWdlWCA9IGxyb3VuZGYocGFnZVBvaW50LngoKSAvIHNjYWxlRmFj dG9yKTsKKyAgICAgICAgaW50IGFkanVzdGVkUGFnZVkgPSBscm91bmRmKHBhZ2VQb2ludC55KCkg LyBzY2FsZUZhY3Rvcik7CisKKyAgICAgICAgUmVmUHRyPFRvdWNoPiB0b3VjaCA9IFRvdWNoOjpj cmVhdGUodGFyZ2V0RnJhbWUsIHRvdWNoVGFyZ2V0LmdldCgpLCBwb2ludC5pZCgpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwb2ludC5zY3JlZW5Qb3MoKS54 KCksIHBvaW50LnNjcmVlblBvcygpLnkoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYWRqdXN0ZWRQYWdlWCwgYWRqdXN0ZWRQYWdlWSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9pbnQucmFkaXVzWCgpLCBwb2ludC5y YWRpdXNZKCksIHBvaW50LnJvdGF0aW9uQW5nbGUoKSwgcG9pbnQuZm9yY2UoKSk7Cg==