136260 2014-08-26 11:03:36 -0700 REGRESSION (r172771): Amazon product page becomes unresponsive after swiping back to it 2014-08-26 13:13:45 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton clopez commit-queue mitz ossy sam simon.fraser oldest_to_newest 1031412 0 thorton 2014-08-26 11:03:36 -0700 The snapshot gets stuck if swiping back causes a same document navigation. <rdar://problem/18107826> 1031423 1 237159 thorton 2014-08-26 11:18:23 -0700 Created attachment 237159 patch 1031424 2 commit-queue 2014-08-26 11:19:30 -0700 Attachment 237159 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/ViewGestureController.h:31: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 1031425 3 237159 mitz 2014-08-26 11:27:47 -0700 Comment on attachment 237159 patch View in context: https://bugs.webkit.org/attachment.cgi?id=237159&action=review > Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm:696 > +void PageClientImpl::didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) > +{ > +} > + Why doesn’t this require an iOS implementation? > Source/WebKit2/UIProcess/mac/ViewGestureController.h:31 > #include "WeakObjCPtr.h" > +#include "SameDocumentNavigationType.h" S < W 1031428 4 237159 thorton 2014-08-26 11:33:47 -0700 Comment on attachment 237159 patch View in context: https://bugs.webkit.org/attachment.cgi?id=237159&action=review >> Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm:696 >> + > > Why doesn’t this require an iOS implementation? iOS's ViewGestureController is a wildly different implementation that takes advantage of UI-side compositing and the transaction system to do this all in a different way. We should converge them eventually, but not today. 1031431 5 thorton 2014-08-26 11:42:28 -0700 http://trac.webkit.org/changeset/172966 1031442 6 clopez 2014-08-26 12:01:28 -0700 (In reply to comment #5) > http://trac.webkit.org/changeset/172966 This broke both the GTK and EFL builds: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/50434/steps/compile-webkit/logs/stdio/text 1031444 7 thorton 2014-08-26 12:06:32 -0700 (In reply to comment #6) > (In reply to comment #5) > > http://trac.webkit.org/changeset/172966 > > This broke both the GTK and EFL builds: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/50434/steps/compile-webkit/logs/stdio/text You guys probably need empty an PageClient override for didSameDocumentNavigationForMainFrame 1031460 8 clopez 2014-08-26 13:03:03 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > http://trac.webkit.org/changeset/172966 > > > > This broke both the GTK and EFL builds: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/50434/steps/compile-webkit/logs/stdio/text > > You guys probably need empty an PageClient override for didSameDocumentNavigationForMainFrame Fixed the GTK build on http://trac.webkit.org/changeset/172971 1031464 9 ossy 2014-08-26 13:13:45 -0700 EFL fix landed in https://trac.webkit.org/changeset/172972 237159 2014-08-26 11:18:23 -0700 2014-08-26 11:33:47 -0700 patch swipe-remove-pushState.diff text/plain 16059 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOTcyZjE1Li45NDAyODEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNzcg QEAKKzIwMTQtMDgtMjUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTiAocjE3Mjc3MSk6IEFtYXpvbiBwcm9kdWN0IHBhZ2UgYmVjb21l cyB1bnJlc3BvbnNpdmUgYWZ0ZXIgc3dpcGluZyBiYWNrIHRvIGl0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYyNjAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzE4MTA3ODI2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByZXZpb3VzbHksIHdoZW4gYSBzd2lwZSBlbmRlZCB1cCBwZXJmb3JtaW5nIGEg c2FtZS1kb2N1bWVudCBuYXZpZ2F0aW9uLAorICAgICAgICB3ZSB3b3VsZCBuZXZlciBnZXQgZGlk RmluaXNoTG9hZEZvck1haW5GcmFtZSBub3IgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0 Rm9yTWFpbkZyYW1lCisgICAgICAgIG5vciB3b3VsZCB3ZSBldmVuIGdldCBkaWRIaXRSZW5kZXJU cmVlU2l6ZVRocmVzaG9sZCBpbiBhbGwgY2FzZXMsIHNvIHdlIHdvdWxkIG5ldmVyCisgICAgICAg IHJlbW92ZSB0aGUgc3dpcGUgc25hcHNob3QuIFByZXZpb3VzIGltcGxlbWVudGF0aW9ucyByZW1v dmVkIHRoZSBzbmFwc2hvdCBvbgorICAgICAgICBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uIGZv ciB0aGUgbWFpbiBmcmFtZSBpZiB0aGUgbmF2aWdhdGlvbiB0eXBlIHdhcyBSZXBsYWNlIG9yIFBv cCwKKyAgICAgICAgc28gd2Ugd2lsbCBtYXRjaCB0aGF0IGJlaGF2aW9yLgorCisgICAgICAgIEFs c28sIHJlaW5zdGF0ZSB0aGUgd2F0Y2hkb2cgdGhhdCBzdGFydHMgYXQgc3dpcGUtZW5kIHdoaWNo IHdvdWxkIGhhdmUgcHJldmVudGVkCisgICAgICAgIHRoaXMgYnVnIGZyb20gZm9yZXZlciBicmVh a2luZyB0aGUgdmlldyBpdCB3YXMgYXNzb2NpYXRlZCB3aXRoLgorCisgICAgICAgIEFsc28sIGRl ZmVuZCBhZ2FpbnN0IHJlbW92aW5nIHRoZSBzbmFwc2hvdCBiZWZvcmUgdGhlIHN3aXBlIGhhcyBm aW5pc2hlZCAoYmVmb3JlCisgICAgICAgIHdlIGhhdmUgZXZlbiBjYXVzZWQgdGhlIG5hdmlnYXRp b24gdGhhdCB3ZSdyZSB3YXRjaGluZyBmb3IgdGhlIGVmZmVjdHMgb2YpLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgX2RpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9tYWMvV0tWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGll bnRJbXBsOjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lKToKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL21h Yy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmRp ZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUpOgorICAgICAgICBQbHVtYiBtYWlu LWZyYW1lIHNhbWUtZG9jdW1lbnQgbmF2aWdhdGlvbiBub3RpZmljYXRpb24gZnJvbSBXZWJQYWdl UHJveHkKKyAgICAgICAgdG8gVmlld0dlc3R1cmVDb250cm9sbGVyTWFjIHZpYSBQYWdlQ2xpZW50 IGFuZCBXS1ZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJv bGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFj Lm1tOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJl Q29udHJvbGxlcik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVn aW5Td2lwZUdlc3R1cmUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6 OmVuZFN3aXBlR2VzdHVyZSk6CisgICAgICAgIEtlZXAgdHJhY2sgb2Ygd2hldGhlciBhIHN3aXBl IGlzIGN1cnJlbnRseSBvY2N1cnJpbmcuIFdlIGNhbid0IHVzZQorICAgICAgICBhY3RpdmVHZXN0 dXJlVHlwZSBmb3IgdGhpcyBiZWNhdXNlIHRoZSBzd2lwZSBjdXJyZW50bHkgcmVtYWlucyB0aGUg ImFjdGl2ZSIKKyAgICAgICAgZ2VzdHVyZSB1bnRpbCB0aGUgc25hcHNob3QgaXMgcmVtb3ZlZC4K KworICAgICAgICBSZWludHJvZHVjZSB0aGUgb2xkIHN3aXBlV2F0Y2hkb2dUaW1lciAoYW5kIHJl bmFtZSB0aGUgc2hvcnRlciB0aW1lciB0aGF0IHN0YXJ0cworICAgICAgICB3aGVuIHdlIGdldCBh IHZpc3VhbGx5IG5vbi1lbXB0eSBsYXlvdXQpIHNvIHRoYXQgd2Ugd2lsbCBhbHdheXMgcmVtb3Zl IHRoZQorICAgICAgICBzbmFwc2hvdCBhZnRlciA1IHNlY29uZHMsIGV2ZW4gaWYgd2UgaGF2ZW4n dCBjb21taXR0ZWQgdGhlIGxvYWQuCisgICAgICAgIFRoaXMgY291bGQgbGVhZCB0byBmbGFzaGlu ZyBiYWNrIHRvIHRoZSBvbGQgY29udGVudCBpZiB3ZSBmYWlsIHRvIGdldCBhIHNpbmdsZQorICAg ICAgICBieXRlIGZvciA1IHNlY29uZHMsIGJ1dCB0aGF0IGlzIGEgcmFyZSBjYXNlIGFuZCBzaG91 bGQgZXZlbnR1YWxseSBnZXQgYWRkaXRpb25hbAorICAgICAgICBzcGVjaWFsIHRyZWF0bWVudCAo ZHJvcHBpbmcgdGhlIHRpbGVzIHVudGlsIHdlIGRvIGdldCBjb250ZW50LCBvciBzb21lIHN1Y2gp LgorCisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkSGl0UmVuZGVy VHJlZVNpemVUaHJlc2hvbGQpOgorICAgICAgICBJZiBhIHN3aXBlIGlzIHN0aWxsIGluIHByb2dy ZXNzLCB3ZSBoYXZlbid0IGRvbmUgb3VyIG5hdmlnYXRpb24gYW5kIHRodXMKKyAgICAgICAgZG9u J3QgY2FyZSBhYm91dCByZW5kZXIgdHJlZSBzaXplIGNoYW5nZXMuCisKKyAgICAgICAgKFdlYktp dDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRG b3JNYWluRnJhbWUpOgorICAgICAgICBJZiBhIHN3aXBlIGlzIHN0aWxsIGluIHByb2dyZXNzLCB3 ZSBoYXZlbid0IGRvbmUgb3VyIG5hdmlnYXRpb24gYW5kIHRodXMKKyAgICAgICAgZG9uJ3QgY2Fy ZSBhYm91dCBsYXlvdXRzLgorCisgICAgICAgIFN0b3AgdGhlIDUgc2Vjb25kIG92ZXJhbGwgd2F0 Y2hkb2cgaWYgd2Ugc3RhcnQgdGhlIDMgc2Vjb25kIGFmdGVyLXZpc3VhbGx5Tm9uRW1wdHlMYXlv dXQKKyAgICAgICAgd2F0Y2hkb2cuIFRoaXMgbWVhbnMgdGhhdCB0aGUgc25hcHNob3QgY291bGQg c3RheSB1cCBmb3IgYSBtYXhpbXVtIG9mIDggc2Vjb25kcworICAgICAgICBmb3IgYSB2ZXJ5LCB2 ZXJ5IHNsb3cgbG9hZC4KKworICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6 OmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUpOgorICAgICAgICBJZiBhIHN3aXBlIGlzIHN0aWxs IGluIHByb2dyZXNzLCB3ZSBoYXZlbid0IGRvbmUgb3VyIG5hdmlnYXRpb24gYW5kIHRodXMKKyAg ICAgICAgZG9uJ3QgY2FyZSBhYm91dCBsb2FkcyB0aGF0IGNvbXBsZXRlLgorCisgICAgICAgIChX ZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZv ck1haW5GcmFtZSk6CisgICAgICAgIFJlbW92ZSB0aGUgc3dpcGUgc25hcHNob3QgYWZ0ZXIgcGFp bnRpbmcgaWYgd2UgZG8gcmVwbGFjZVN0YXRlIG9yIHBvcFN0YXRlLgorCisgICAgICAgIChXZWJL aXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dpcGVTbmFwc2hvdEFmdGVyUmVwYWlu dCk6CisgICAgICAgIElmIGEgc3dpcGUgaXMgc3RpbGwgaW4gcHJvZ3Jlc3MsIHdlIHNob3VsZG4n dCByZW1vdmUgdGhlIHNuYXBzaG90IHlldC4KKwogMjAxNC0wOC0yNSAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGxvYWQgc2NoZWR1bGluZyBjb2Rl IGZyb20gbmV0d29yayBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0KaW5kZXggYmYzMTc2Ny4uYmJkZTdmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMzYxMCw2ICszNjEwLDEyIEBAIC0gKHZvaWQpX2Rp ZEZpbmlzaExvYWRGb3JNYWluRnJhbWUKICAgICAgICAgX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxl ci0+ZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSgpOwogfQogCistICh2b2lkKV9kaWRTYW1lRG9j dW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lOihTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSl0 eXBlCit7CisgICAgaWYgKF9kYXRhLT5fZ2VzdHVyZUNvbnRyb2xsZXIpCisgICAgICAgIF9kYXRh LT5fZ2VzdHVyZUNvbnRyb2xsZXItPmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJh bWUodHlwZSk7Cit9CisKIC0gKHZvaWQpX3JlbW92ZU5hdmlnYXRpb25HZXN0dXJlU25hcHNob3QK IHsKICAgICBpZiAoX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCmluZGV4IDg0MGU1YzAuLmRh N2I2MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll d0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 SW50ZXJuYWwuaApAQCAtMjYsNiArMjYsNyBAQAogI2ltcG9ydCAiV0tWaWV3UHJpdmF0ZS5oIgog CiAjaW1wb3J0ICJQbHVnaW5Db21wbGV4VGV4dElucHV0U3RhdGUuaCIKKyNpbXBvcnQgIlNhbWVE b2N1bWVudE5hdmlnYXRpb25UeXBlLmgiCiAjaW1wb3J0ICJXZWJGaW5kT3B0aW9ucy5oIgogI2lt cG9ydCA8d3RmL0ZvcndhcmQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTEwOSw2 ICsxMTAsNyBAQCBzdHJ1Y3QgV2ViUGFnZUNvbmZpZ3VyYXRpb247CiAKIC0gKHZvaWQpX2RpZEZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvck1haW5GcmFtZTsKIC0gKHZvaWQpX2RpZEZpbmlz aExvYWRGb3JNYWluRnJhbWU7CistICh2b2lkKV9kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9y TWFpbkZyYW1lOihXZWJLaXQ6OlNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlKXR5cGU7CiAtICh2 b2lkKV9yZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90OwogCiAjaWYgV0tfQVBJX0VOQUJM RUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCmluZGV4IDU0MzhkNzMuLmQ3ODFm Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaApAQCAtMzA1LDYgKzMwNSw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRGb3JNYWluRnJhbWUoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRG b3JNYWluRnJhbWUoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmln YXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpID0gMDsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAppbmRleCAyYzE5MTQ5Li5iYzM3MDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjcxNCwxNCArMjcxNCwyMCBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90CiAKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5z YWN0aW9uKCk7CiAKLSAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCisgICAgYm9vbCBpc01h aW5GcmFtZSA9IGZyYW1lLT5pc01haW5GcmFtZSgpOworICAgIGlmIChpc01haW5GcmFtZSkKICAg ICAgICAgbV9wYWdlTG9hZFN0YXRlLmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb24odHJhbnNhY3Rp b24sIHVybCk7CiAKICAgICBtX3BhZ2VMb2FkU3RhdGUuY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVS TCh0cmFuc2FjdGlvbik7CiAgICAgZnJhbWUtPmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb24odXJs KTsKIAogICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7Ci0gICAgbV9sb2FkZXJD bGllbnQtPmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh0aGlzLCBmcmFtZSwgbmF2 aWdhdGlvbklELCBzdGF0aWNfY2FzdDxTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZT4ob3BhcXVl U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpLCB1c2VyRGF0YS5nZXQoKSk7CisKKyAgICBTYW1l RG9jdW1lbnROYXZpZ2F0aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZSA9IHN0YXRpY19jYXN0PFNhbWVE b2N1bWVudE5hdmlnYXRpb25UeXBlPihvcGFxdWVTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSk7 CisgICAgbV9sb2FkZXJDbGllbnQtPmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSh0 aGlzLCBmcmFtZSwgbmF2aWdhdGlvbklELCBuYXZpZ2F0aW9uVHlwZSwgdXNlckRhdGEuZ2V0KCkp OworCisgICAgaWYgKGlzTWFpbkZyYW1lKQorICAgICAgICBtX3BhZ2VDbGllbnQuZGlkU2FtZURv Y3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZShuYXZpZ2F0aW9uVHlwZSk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBj b25zdCBTdHJpbmcmIHRpdGxlLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oCmluZGV4IDA5 ZDUxODYuLjEzNmM2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv UGFnZUNsaWVudEltcGxJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Bh Z2VDbGllbnRJbXBsSU9TLmgKQEAgLTE3Nyw2ICsxNzcsNyBAQCBwcml2YXRlOgogCiAgICAgdmly dHVhbCB2b2lkIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvck1haW5GcmFtZSgpIG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lKCkgb3Zl cnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWlu RnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpIG92ZXJyaWRlOwogCiAgICAgV0tDb250 ZW50VmlldyAqbV9jb250ZW50VmlldzsKICAgICBXS1dlYlZpZXcgKm1fd2ViVmlldzsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCmluZGV4 IGE3NTBmZDYuLmQ0NDk3ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUGFnZUNsaWVudEltcGxJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5tbQpAQCAtNjkwLDYgKzY5MCwxMCBAQCB2b2lkIFBhZ2VDbGll bnRJbXBsOjpkaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lKCkKIHsKIH0KIAordm9pZCBQYWdlQ2xp ZW50SW1wbDo6ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZShTYW1lRG9jdW1l bnROYXZpZ2F0aW9uVHlwZSkKK3sKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRp ZiAvLyBQTEFURk9STShJT1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VD bGllbnRJbXBsLmgKaW5kZXggYzhhNTM5Ni4uNzVlYjIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaApAQCAtMTgxLDYgKzE4MSw3IEBAIHByaXZh dGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9y TWFpbkZyYW1lKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRGb3JN YWluRnJhbWUoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvck1haW5GcmFtZShTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSkgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZU5hdmlnYXRpb25HZXN0dXJlU25hcHNob3QoKSBvdmVy cmlkZTsKIAogICAgIFdLVmlldyAqbV93a1ZpZXc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCA2ZmU2MWIzLi4zYzk2ZTdlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KQEAgLTczMiw2 ICs3MzIsMTEgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmluaXNoTG9hZEZvck1haW5GcmFt ZSgpCiAgICAgW21fd2tWaWV3IF9kaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lXTsKIH0KIAordm9p ZCBQYWdlQ2xpZW50SW1wbDo6ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZShT YW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSB0eXBlKQoreworICAgIFttX3drVmlldyBfZGlkU2Ft ZURvY3VtZW50TmF2aWdhdGlvbkZvck1haW5GcmFtZTp0eXBlXTsKK30KKwogdm9pZCBQYWdlQ2xp ZW50SW1wbDo6cmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCgpCiB7CiAgICAgW21fd2tW aWV3IF9yZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90XTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IDJkMGQy ZGYuLmQzM2JjZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmll d0dlc3R1cmVDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaApAQCAtMjgsNiArMjgsNyBAQAogCiAjaW5jbHVkZSAiTWVz c2FnZVJlY2VpdmVyLmgiCiAjaW5jbHVkZSAiV2Vha09iakNQdHIuaCIKKyNpbmNsdWRlICJTYW1l RG9jdW1lbnROYXZpZ2F0aW9uVHlwZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRSZWN0Lmg+ CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CkBA IC0xMDcsNiArMTA4LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXRGb3JNYWluRnJhbWUoKTsKICAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JNYWlu RnJhbWUoKTsKKyAgICB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUo U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpOwogI2Vsc2UKICAgICB2b2lkIGluc3RhbGxTd2lw ZUhhbmRsZXIoVUlWaWV3ICpnZXN0dXJlUmVjb2duaXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1Zp ZXcpOwogICAgIHZvaWQgc2V0QWx0ZXJuYXRlQmFja0ZvcndhcmRMaXN0U291cmNlVmlldyhXS1dl YlZpZXcgKik7CkBAIC0xNTgsNiArMTYwLDggQEAgcHJpdmF0ZToKICNlbmRpZgogCiAjaWYgUExB VEZPUk0oTUFDKQorICAgIFJ1bkxvb3A6OlRpbWVyPFZpZXdHZXN0dXJlQ29udHJvbGxlcj4gbV9z d2lwZVdhdGNoZG9nQWZ0ZXJGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRUaW1lcjsKKwogICAg IGRvdWJsZSBtX21hZ25pZmljYXRpb247CiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX21hZ25p ZmljYXRpb25PcmlnaW47CiAKQEAgLTE5MCw2ICsxOTQsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9zd2lwZVdhaXRpbmdGb3JWaXN1YWxseU5vbkVtcHR5TGF5b3V0OwogICAgIGJvb2wgbV9zd2lw ZVdhaXRpbmdGb3JSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZDsKICAgICBib29sIG1fc3dpcGVXYWl0 aW5nRm9yUmVwYWludDsKKyAgICBib29sIG1fc3dpcGVJblByb2dyZXNzOwogI2Vsc2UgICAgCiAg ICAgVUlWaWV3ICptX2xpdmVTd2lwZVZpZXc7CiAgICAgUmV0YWluUHRyPFVJVmlldz4gbV9saXZl U3dpcGVWaWV3Q2xpcHBpbmdWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbQppbmRleCBhNjNmM2ZjLi42Yzdl Y2FhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJl Q29udHJvbGxlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdH ZXN0dXJlQ29udHJvbGxlck1hYy5tbQpAQCAtNzcsNyArNzcsOCBAQCBzdGF0aWMgY29uc3QgQ0dG bG9hdCBtaW5pbXVtSG9yaXpvbnRhbFN3aXBlRGlzdGFuY2UgPSAxNTsKIHN0YXRpYyBjb25zdCBm bG9hdCBtaW5pbXVtU2Nyb2xsRXZlbnRSYXRpb0ZvclN3aXBlID0gMC41OwogCiBzdGF0aWMgY29u c3QgZmxvYXQgc3dpcGVTbmFwc2hvdFJlbW92YWxSZW5kZXJUcmVlU2l6ZVRhcmdldEZyYWN0aW9u ID0gMC41Owotc3RhdGljIGNvbnN0IHN0ZDo6Y2hyb25vOjpzZWNvbmRzIHN3aXBlU25hcHNob3RS ZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbiA9IDNfczsKK3N0YXRpYyBjb25zdCBzdGQ6OmNocm9ubzo6 c2Vjb25kcyBzd2lwZVNuYXBzaG90UmVtb3ZhbFdhdGNoZG9nRHVyYXRpb24gPSA1X3M7CitzdGF0 aWMgY29uc3Qgc3RkOjpjaHJvbm86OnNlY29uZHMgc3dpcGVTbmFwc2hvdFJlbW92YWxXYXRjaGRv Z0FmdGVyRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0RHVyYXRpb24gPSAzX3M7CiAKIEBpbnRl cmZhY2UgV0tTd2lwZUNhbmNlbGxhdGlvblRyYWNrZXIgOiBOU09iamVjdCB7CiBAcHJpdmF0ZQpA QCAtOTgsNiArOTksNyBAQCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJv bGxlcihXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKICAgICA6IG1fd2ViUGFnZVByb3h5KHdl YlBhZ2VQcm94eSkKICAgICAsIG1fYWN0aXZlR2VzdHVyZVR5cGUoVmlld0dlc3R1cmVUeXBlOjpO b25lKQogICAgICwgbV9zd2lwZVdhdGNoZG9nVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAm Vmlld0dlc3R1cmVDb250cm9sbGVyOjpzd2lwZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZpcmVkKQor ICAgICwgbV9zd2lwZVdhdGNoZG9nQWZ0ZXJGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRUaW1l cihSdW5Mb29wOjptYWluKCksIHRoaXMsICZWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25h cHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQpCiAgICAgLCBtX2xhc3RNYWduaWZpY2F0aW9uR2VzdHVy ZVdhc1NtYXJ0TWFnbmlmaWNhdGlvbihmYWxzZSkKICAgICAsIG1fdmlzaWJsZUNvbnRlbnRSZWN0 SXNWYWxpZChmYWxzZSkKICAgICAsIG1fZnJhbWVIYW5kbGVzTWFnbmlmaWNhdGlvbkdlc3R1cmUo ZmFsc2UpCkBAIC0xMDgsNiArMTEwLDcgQEAgVmlld0dlc3R1cmVDb250cm9sbGVyOjpWaWV3R2Vz dHVyZUNvbnRyb2xsZXIoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiAgICAgLCBtX3N3aXBl V2FpdGluZ0ZvclZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoZmFsc2UpCiAgICAgLCBtX3N3aXBlV2Fp dGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKGZhbHNlKQogICAgICwgbV9zd2lwZVdhaXRp bmdGb3JSZXBhaW50KGZhbHNlKQorICAgICwgbV9zd2lwZUluUHJvZ3Jlc3MoZmFsc2UpCiB7CiAg ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6 Vmlld0dlc3R1cmVDb250cm9sbGVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2ViUGFnZVBy b3h5LnBhZ2VJRCgpLCAqdGhpcyk7CiB9CkBAIC01MDUsNiArNTA4LDcgQEAgdm9pZCBWaWV3R2Vz dHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0q IHRhcmdldEl0ZW0KICAgICBtX3dlYlBhZ2VQcm94eS5uYXZpZ2F0aW9uR2VzdHVyZURpZEJlZ2lu KCk7CiAKICAgICBtX2FjdGl2ZUdlc3R1cmVUeXBlID0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZTsK KyAgICBtX3N3aXBlSW5Qcm9ncmVzcyA9IHRydWU7CiAKICAgICBDQUxheWVyICpyb290Q29udGVu dExheWVyID0gbV93ZWJQYWdlUHJveHkuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jvb3RMYXllcigp OwogCkBAIC02MjcsNiArNjMxLDggQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3 aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtLAogCiAgICAgbV9z d2lwZUNhbmNlbGxhdGlvblRyYWNrZXIgPSBudWxscHRyOwogCisgICAgbV9zd2lwZUluUHJvZ3Jl c3MgPSBmYWxzZTsKKwogICAgIENBTGF5ZXIgKnJvb3RMYXllciA9IG1fd2ViUGFnZVByb3h5LmFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdSb290TGF5ZXIoKTsKIAogICAgIFtyb290TGF5ZXIgc2V0U2hh ZG93T3BhY2l0eTowXTsKQEAgLTY0OSwxMSArNjU1LDEzIEBAIHZvaWQgVmlld0dlc3R1cmVDb250 cm9sbGVyOjplbmRTd2lwZUdlc3R1cmUoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogdGFyZ2V0SXRl bSwKIAogICAgIG1fd2ViUGFnZVByb3h5Lm5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKHRydWUsICp0 YXJnZXRJdGVtKTsKICAgICBtX3dlYlBhZ2VQcm94eS5nb1RvQmFja0ZvcndhcmRJdGVtKHRhcmdl dEl0ZW0pOworCisgICAgbV9zd2lwZVdhdGNoZG9nVGltZXIuc3RhcnRPbmVTaG90KHN3aXBlU25h cHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbi5jb3VudCgpKTsKIH0KIAogdm9pZCBWaWV3R2Vz dHVyZUNvbnRyb2xsZXI6OmRpZEhpdFJlbmRlclRyZWVTaXplVGhyZXNob2xkKCkKIHsKLSAgICBp ZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAhPSBWaWV3R2VzdHVyZVR5cGU6OlN3aXBlKQorICAgIGlm IChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUgfHwgbV9zd2lw ZUluUHJvZ3Jlc3MpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fc3dpcGVXYWl0aW5nRm9yUmVu ZGVyVHJlZVNpemVUaHJlc2hvbGQgPSBmYWxzZTsKQEAgLTY2NCwyMCArNjcyLDI3IEBAIHZvaWQg Vmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRIaXRSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCgpCiAK IHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXRGb3JNYWluRnJhbWUoKQogewotICAgIGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdH ZXN0dXJlVHlwZTo6U3dpcGUpCisgICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dl c3R1cmVUeXBlOjpTd2lwZSB8fCBtX3N3aXBlSW5Qcm9ncmVzcykKICAgICAgICAgcmV0dXJuOwog CiAgICAgbV9zd2lwZVdhaXRpbmdGb3JWaXN1YWxseU5vbkVtcHR5TGF5b3V0ID0gZmFsc2U7CiAK ICAgICBpZiAoIW1fc3dpcGVXYWl0aW5nRm9yUmVuZGVyVHJlZVNpemVUaHJlc2hvbGQpCiAgICAg ICAgIHJlbW92ZVN3aXBlU25hcHNob3RBZnRlclJlcGFpbnQoKTsKLSAgICBlbHNlCi0gICAgICAg IG1fc3dpcGVXYXRjaGRvZ1RpbWVyLnN0YXJ0T25lU2hvdChzd2lwZVNuYXBzaG90UmVtb3ZhbFdh dGNoZG9nRHVyYXRpb24uY291bnQoKSk7CisgICAgZWxzZSB7CisgICAgICAgIG1fc3dpcGVXYXRj aGRvZ0FmdGVyRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0VGltZXIuc3RhcnRPbmVTaG90KHN3 aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dBZnRlckZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91 dER1cmF0aW9uLmNvdW50KCkpOworICAgICAgICBtX3N3aXBlV2F0Y2hkb2dUaW1lci5zdG9wKCk7 CisgICAgfQogfQogCiB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkRmluaXNoTG9hZEZv ck1haW5GcmFtZSgpCiB7Ci0gICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dlc3R1 cmVUeXBlOjpTd2lwZSkKKyAgICByZW1vdmVTd2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCk7Cit9 CisKK3ZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9u Rm9yTWFpbkZyYW1lKFNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlIHR5cGUpCit7CisgICAgaWYg KHR5cGUgIT0gU2FtZURvY3VtZW50TmF2aWdhdGlvblNlc3Npb25TdGF0ZVJlcGxhY2UgJiYgdHlw ZSAhPSBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uU2Vzc2lvblN0YXRlUG9wKQogICAgICAgICByZXR1 cm47CiAKICAgICByZW1vdmVTd2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCk7CkBAIC02OTAsNyAr NzA1LDcgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNob3RXYXRjaGRv Z1RpbWVyRmlyZWQoKQogCiB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dpcGVT bmFwc2hvdEFmdGVyUmVwYWludCgpCiB7Ci0gICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0g Vmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKKyAgICBpZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAhPSBW aWV3R2VzdHVyZVR5cGU6OlN3aXBlIHx8IG1fc3dpcGVJblByb2dyZXNzKQogICAgICAgICByZXR1 cm47CiAKICAgICBpZiAobV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50KQpAQCAtNzA5LDYgKzcyNCw3 IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpyZW1vdmVTd2lwZVNuYXBzaG90KCkKICAg ICBtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQgPSBmYWxzZTsKIAogICAgIG1fc3dpcGVXYXRjaGRv Z1RpbWVyLnN0b3AoKTsKKyAgICBtX3N3aXBlV2F0Y2hkb2dBZnRlckZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dFRpbWVyLnN0b3AoKTsKIAogICAgIGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9 IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUpCiAgICAgICAgIHJldHVybjsK