135951 2014-08-14 14:03:29 -0700 REGRESSION (WebKit2 Gestures): White flash when swiping back to cnn.com's homepage from an article 2014-08-15 11:42:48 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton dino kdecker mitz sam simon.fraser oldest_to_newest 1029200 0 thorton 2014-08-14 14:03:29 -0700 <rdar://problem/18006149> 1029205 1 236618 thorton 2014-08-14 14:10:56 -0700 Created attachment 236618 patch 1029338 2 236618 simon.fraser 2014-08-15 08:36:12 -0700 Comment on attachment 236618 patch View in context: https://bugs.webkit.org/attachment.cgi?id=236618&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:3617 > +- (void)_removeNavigationGestureSnapshot > +{ > + if (_data->_gestureController) > + _data->_gestureController->removeSwipeSnapshot(); > +} swipe vs. gesture: can we use the same terminology everywhere? 1029403 3 thorton 2014-08-15 11:41:30 -0700 (In reply to comment #2) > (From update of attachment 236618 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236618&action=review > > > Source/WebKit2/UIProcess/API/mac/WKView.mm:3617 > > +- (void)_removeNavigationGestureSnapshot > > +{ > > + if (_data->_gestureController) > > + _data->_gestureController->removeSwipeSnapshot(); > > +} > > swipe vs. gesture: can we use the same terminology everywhere? I don't know how it happened (probably because we spent more time on naming for the API), but the API/view level is all about "navigation gestures" and the internals are all about "swipe" (though the SPI doesn't follow this rule). We can fix it, but for now I'm just going to follow along. 1029404 4 thorton 2014-08-15 11:42:48 -0700 http://trac.webkit.org/changeset/172635 236618 2014-08-14 14:10:56 -0700 2014-08-15 08:36:11 -0700 patch flash.diff text/plain 17151 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ZTE4M2UyLi4zZThlMmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNzAg QEAKKzIwMTQtMDgtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTiAoV2ViS2l0MiBHZXN0dXJlcyk6IFdoaXRlIGZsYXNoIHdoZW4g c3dpcGluZyBiYWNrIHRvIGNubi5jb20ncyBob21lcGFnZSBmcm9tIGFuIGFydGljbGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTk1MQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTgwMDYxNDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2FpdCBmb3IgKHRoZSBmaXJzdCB2aXN1YWxseSBub24tZW1w dHkgbGF5b3V0IEFORCB0aGUgcmVuZGVyIHRyZWUgc2l6ZSB0aHJlc2hvbGQgdG8gYmUgaGl0KSwK KyAgICAgICAgT1IgZGlkRmluaXNoTG9hZEZvckZyYW1lLCB3aGljaGV2ZXIgY29tZXMgZmlyc3Qu IE9uY2Ugd2UndmUgZG9uZSB0aGUgZmlyc3QgdmlzdWFsbHkgbm9uLWVtcHR5IGxheW91dCwKKyAg ICAgICAgd2UnbGwgc3RhcnQgdGhlIHdhdGNoZG9nIGFuZCB0ZWFyIGRvd24gdGhlIHNuYXBzaG90 IGluIHRocmVlIHNlY29uZHMgbm8gbWF0dGVyIHdoYXQuCisgICAgICAgIEFsc28sIGZvcmNlIGEg cmVwYWludCBzbyB3ZSBjYW4gYXN5bmNocm9ub3VzbHkgd2FpdCBmb3IgdGhlIFdlYiBQcm9jZXNz IHRvIHBhaW50IGFuZCByZXR1cm4gdG8gdXMKKyAgICAgICAgYmVmb3JlIHJlbW92aW5nIHRoZSBz bmFwc2hvdCwgd2hpY2ggaW1wcm92ZXMgb3VyIGNoYW5jZXMgdGhhdCBzb21ldGhpbmcgaXMgYWN0 dWFsbHkgb24gdGhlIHNjcmVlbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRG b3JNYWluRnJhbWVdKToKKyAgICAgICAgKC1bV0tWaWV3IF9kaWRGaW5pc2hMb2FkRm9yTWFpbkZy YW1lXSk6CisgICAgICAgICgtW1dLVmlldyBfcmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hv dF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2Fk Rm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpyZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElP Uy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXRGb3JNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZGlkRmlu aXNoTG9hZEZvck1haW5GcmFtZSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50 SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW06CisgICAg ICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXRGb3JNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6ZGlkRmlu aXNoTG9hZEZvck1haW5GcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpy ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KToKKyAgICAgICAgUGx1bWIgZGlkRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lIGFuZCBkaWRGaW5pc2hMb2FkRm9yTWFp bkZyYW1lCisgICAgICAgIHRocm91Z2ggdG8gVmlld0dlc3R1cmVDb250cm9sbGVyIGZyb20gV2Vi UGFnZVByb3h5IHZpYSB0aGUgUGFnZUNsaWVudCwgZXRjLgorCisgICAgICAgIERpdHRvIGZvciBy ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90LCB0aG91Z2ggaXQgaXMgY2FsbGVkIGZyb20g YQorICAgICAgICBWb2lkQ2FsbGJhY2sgaW4gVmlld0dlc3R1cmVDb250cm9sbGVyIGluc3RlYWQg b2YgZnJvbSBXZWJGcmFtZUxvYWRlckNsaWVudCBhbmQgZnJpZW5kcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW06CisgICAgICAgIChXZWJLaXQ6OlZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6Vmlld0dlc3R1cmVDb250cm9sbGVyKToKKyAgICAgICAgKFdlYktp dDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lwZUdlc3R1cmUpOgorICAgICAgICBXaGVu IGZpbmlzaGluZyBhIHN3aXBlLCB3ZSB3YW50IHRvIHdhaXQgZm9yIGJvdGggdGhlIGZpcnN0IHZp c3VhbGx5IG5vbi1lbXB0eSBsYXlvdXQKKyAgICAgICAgYW5kIHRoZSByZW5kZXIgdHJlZSBzaXpl IHRocmVzaG9sZCBiZWluZyBoaXQuCisKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250 cm9sbGVyOjpkaWRIaXRSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCk6CisgICAgICAgIChXZWJLaXQ6 OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9y TWFpbkZyYW1lKToKKyAgICAgICAgV2hlbiBib3RoIG9mIHRoZXNlIHRoaW5ncyBoYXZlIGhhcHBl bmVkLCByZW1vdmUgdGhlIHN3aXBlIHNuYXBzaG90IChhZnRlciBmb3JjaW5nIGEgcmVwYWludCku CisgICAgICAgIEZvciBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJhbWUs IHdlIHdpbGwgYWxzbyBzdGFydCBhIHdhdGNoZG9nCisgICAgICAgIGVuc3VyaW5nIHRoYXQgd2Ug cmVtb3ZlIHRoZSBzbmFwc2hvdCBpbiB0aHJlZSBzZWNvbmRzLgorCisgICAgICAgIChXZWJLaXQ6 OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSk6CisgICAg ICAgIFdoZW4gZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSBoYXBwZW5zLCByZW1vdmUgdGhlIHN3 aXBlIHNuYXBzaG90IChhZnRlciBmb3JjaW5nIGEgcmVwYWludCkuCisKKyAgICAgICAgKFdlYktp dDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpzd2lwZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZpcmVk KToKKyAgICAgICAgSWYgdGhlIHdhdGNoZG9nIHRpbWVyIGZpcmVzLCByZW1vdmUgdGhlIHN3aXBl IHNuYXBzaG90IChhZnRlciBmb3JjaW5nIGEgcmVwYWludCkuCisKKyAgICAgICAgKFdlYktpdDo6 Vmlld0dlc3R1cmVDb250cm9sbGVyOjpyZW1vdmVTd2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KToK KyAgICAgICAgRm9yY2UgYSByZXBhaW50IGFuZCB3YWl0IGZvciB0aGUgYXN5bmMgY2FsbGJhY2sg YmVmb3JlIHJlbW92aW5nIHRoZSBzbmFwc2hvdC4KKyAgICAgICAgSXQgaXMgc2FmZSB0byBob2xk IG9uIHRvIHRoZSBXZWJQYWdlUHJveHkgaGVyZSBiZWNhdXNlIGl0IHdpbGwgYWx3YXlzCisgICAg ICAgIGNhbGwgYWxsIG9mIGl0cyBjYWxsYmFja3MgYmVmb3JlIGl0IGlzIGRlc3Ryb3llZC4KKyAg ICAgICAgQXZvaWQgZW5xdWV1aW5nIG11bHRpcGxlIGZvcmNlLXJlcGFpbnRzLgorCisgICAgICAg IChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dpcGVTbmFwc2hvdCk6CisK IDIwMTQtMDgtMTMgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAg ICAgIFtFRkxdIEFkZCBBUEkgdG8gc2V0IGFwcGxpY2F0aW9uIG5hbWUgZm9yIHRoZSB1c2VyIGFn ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggZTY4 NmI4ZC4uYmYzMTc2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQpAQCAtMzU5OCw2ICszNTk4LDI0IEBAIC0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0 aDooTlNTdHJpbmcgKilrZXlQYXRoIG9mT2JqZWN0OihpZClvYmplY3QgY2hhbmdlOihOCiAKICNl bmRpZgogCistICh2b2lkKV9kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJh bWUKK3sKKyAgICBpZiAoX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlcikKKyAgICAgICAgX2RhdGEt Pl9nZXN0dXJlQ29udHJvbGxlci0+ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFp bkZyYW1lKCk7Cit9CisKKy0gKHZvaWQpX2RpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUKK3sKKyAg ICBpZiAoX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlcikKKyAgICAgICAgX2RhdGEtPl9nZXN0dXJl Q29udHJvbGxlci0+ZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSgpOworfQorCistICh2b2lkKV9y ZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90Cit7CisgICAgaWYgKF9kYXRhLT5fZ2VzdHVy ZUNvbnRyb2xsZXIpCisgICAgICAgIF9kYXRhLT5fZ2VzdHVyZUNvbnRyb2xsZXItPnJlbW92ZVN3 aXBlU25hcHNob3QoKTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tWaWV3IChQcml2 YXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVy bmFsLmgKaW5kZXggN2ZmYTlkNy4uODQwZTVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRlcm5hbC5oCkBAIC0xMDcsNiArMTA3LDEwIEBAIHN0 cnVjdCBXZWJQYWdlQ29uZmlndXJhdGlvbjsKIC0gKHZvaWQpX3NldFN1cHByZXNzVmlzaWJpbGl0 eVVwZGF0ZXM6KEJPT0wpc3VwcHJlc3NWaXNpYmlsaXR5VXBkYXRlczsKIC0gKEJPT0wpX3N1cHBy ZXNzVmlzaWJpbGl0eVVwZGF0ZXM7CiAKKy0gKHZvaWQpX2RpZEZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dEZvck1haW5GcmFtZTsKKy0gKHZvaWQpX2RpZEZpbmlzaExvYWRGb3JNYWluRnJhbWU7 CistICh2b2lkKV9yZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90OworCiAjaWYgV0tfQVBJ X0VOQUJMRUQKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFRodW1ibmFpbFZpZXc6 KSBfV0tUaHVtYm5haWxWaWV3ICpfdGh1bWJuYWlsVmlldzsKIC0gKHZvaWQpX3JlcGFyZW50TGF5 ZXJUcmVlSW5UaHVtYm5haWxWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK aW5kZXggZjhhOGQwOC4uNTQzOGQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCkBAIC0yMjksNiArMjI5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIGRpc21p c3NDb3JyZWN0aW9uUGFuZWxTb29uKFdlYkNvcmU6OlJlYXNvbkZvckRpc21pc3NpbmdBbHRlcm5h dGl2ZVRleHQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgcmVjb3JkQXV0b2NvcnJlY3Rpb25SZXNw b25zZShXZWJDb3JlOjpBdXRvY29ycmVjdGlvblJlc3BvbnNlVHlwZSwgY29uc3QgU3RyaW5nJiBy ZXBsYWNlZFN0cmluZywgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVudFN0cmluZykgPSAwOwogICAg IHZpcnR1YWwgdm9pZCByZWNvbW1lbmRlZFNjcm9sbGJhclN0eWxlRGlkQ2hhbmdlKGludDMyX3Qg bmV3U3R5bGUpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVT bmFwc2hvdCgpID0gMDsKIAogICAgIHZpcnR1YWwgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZSgp ID0gMDsKIApAQCAtMzAxLDYgKzMwMiw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbmF2 aWdhdGlvbkdlc3R1cmVXaWxsRW5kKGJvb2wgd2lsbE5hdmlnYXRlLCBXZWJCYWNrRm9yd2FyZExp c3RJdGVtJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBuYXZpZ2F0aW9uR2VzdHVyZURpZEVuZChi b29sIHdpbGxOYXZpZ2F0ZSwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgd2lsbFJlY29yZE5hdmlnYXRpb25TbmFwc2hvdChXZWJCYWNrRm9yd2FyZExpc3RJ dGVtJikgPSAwOworCisgICAgdmlydHVhbCB2b2lkIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dEZvck1haW5GcmFtZSgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZEZv ck1haW5GcmFtZSgpID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAzYTZmMGJkLi4wYTg3NjA5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjY1MCwxMyAr MjY1MCwxNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRAogCiAgICAgYXV0byB0cmFuc2FjdGlv biA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCi0gICAgaWYgKGZyYW1lLT5pc01h aW5GcmFtZSgpKQorICAgIGJvb2wgaXNNYWluRnJhbWUgPSBmcmFtZS0+aXNNYWluRnJhbWUoKTsK KyAgICBpZiAoaXNNYWluRnJhbWUpCiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWRGaW5pc2hM b2FkKHRyYW5zYWN0aW9uKTsKIAogICAgIGZyYW1lLT5kaWRGaW5pc2hMb2FkKCk7CiAKICAgICBt X3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdlcygpOwogICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRG aW5pc2hMb2FkRm9yRnJhbWUodGhpcywgZnJhbWUsIG5hdmlnYXRpb25JRCwgdXNlckRhdGEuZ2V0 KCkpOworCisgICAgaWYgKGlzTWFpbkZyYW1lKQorICAgICAgICBtX3BhZ2VDbGllbnQuZGlkRmlu aXNoTG9hZEZvck1haW5GcmFtZSgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbExv YWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IFJlc291cmNlRXJyb3ImIGVycm9yLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQpAQCAt Mjc1MCw2ICsyNzU0LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIElQQzoKICAgICBNRVNTQUdFX0NI RUNLKGZyYW1lKTsKIAogICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXRGb3JGcmFtZSh0aGlzLCBmcmFtZSwgdXNlckRhdGEuZ2V0KCkpOworCisgICAgaWYg KGZyYW1lLT5pc01haW5GcmFtZSgpKQorICAgICAgICBtX3BhZ2VDbGllbnQuZGlkRmlyc3RWaXN1 YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWRMYXlvdXQodWludDMyX3QgbGF5b3V0TWlsZXN0b25lcywgSVBDOjpNZXNzYWdlRGVjb2Rl ciYgZGVjb2RlcikKQEAgLTUxNzAsNCArNTE3Nyw5IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3aWxs Q2hhbmdlQ3VycmVudEhpc3RvcnlJdGVtRm9yTWFpbkZyYW1lKCkKICAgICByZWNvcmROYXZpZ2F0 aW9uU25hcHNob3QoKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnJlbW92ZU5hdmlnYXRpb25H ZXN0dXJlU25hcHNob3QoKQoreworICAgIG1fcGFnZUNsaWVudC5yZW1vdmVOYXZpZ2F0aW9uR2Vz dHVyZVNuYXBzaG90KCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDk2NWYzYzguLmNmMzdiZmMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTkxMCw2ICs5MTAsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCB3aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0mKTsKIAogICAgIGJvb2wgaXNTaG93aW5nTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hv dCgpIGNvbnN0IHsgcmV0dXJuIG1faXNTaG93aW5nTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdDsg fQorICAgIHZvaWQgcmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCgpOwogCiBwcml2YXRl OgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiwgV2ViUHJvY2Vzc1Byb3h5JiwgdWludDY0 X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ29uZmlndXJhdGlvbiYpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5oCmluZGV4IDM4Y2YwYTkuLjA5 ZDUxODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVu dEltcGxJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJ bXBsSU9TLmgKQEAgLTE3NSw2ICsxNzUsOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBu YXZpZ2F0aW9uR2VzdHVyZURpZEVuZChib29sIHdpbGxOYXZpZ2F0ZSwgV2ViQmFja0ZvcndhcmRM aXN0SXRlbSYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVjb3JkTmF2aWdhdGlv blNuYXBzaG90KFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKSBvdmVycmlkZTsKIAorICAgIHZpcnR1 YWwgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJhbWUoKSBvdmVy cmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSgpIG92ZXJy aWRlOworCiAgICAgV0tDb250ZW50VmlldyAqbV9jb250ZW50VmlldzsKICAgICBXS1dlYlZpZXcg Km1fd2ViVmlldzsKICAgICBSZXRhaW5QdHI8V0tFZGl0b3JVbmRvVGFyZ2V0T2JqQz4gbV91bmRv VGFyZ2V0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xp ZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudElt cGxJT1MubW0KaW5kZXggYjg5ZDA0Mi4uYTc1MGZkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCkBAIC02ODIsNiArNjgyLDE0IEBA IHZvaWQgUGFnZUNsaWVudEltcGw6OndpbGxSZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoV2ViQmFj a0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkKICAgICBOYXZpZ2F0aW9uU3RhdGU6OmZyb21XZWJQYWdl KCptX3dlYlZpZXctPl9wYWdlKS53aWxsUmVjb3JkTmF2aWdhdGlvblNuYXBzaG90KGl0ZW0pOwog fQogCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRG b3JNYWluRnJhbWUoKQoreworfQorCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWRGaW5pc2hMb2Fk Rm9yTWFpbkZyYW1lKCkKK3sKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAv LyBQTEFURk9STShJT1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsLmgKaW5kZXggMzRmOGQzMy4uYzhhNTM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaApAQCAtMTc5LDYgKzE3OSwxMCBAQCBwcml2YXRl OgogCiAgICAgTlNWaWV3ICphY3RpdmVWaWV3KCkgY29uc3Q7CiAKKyAgICB2aXJ0dWFsIHZvaWQg ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCkgb3ZlcnJpZGU7Cisg ICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKSBvdmVycmlkZTsKKyAg ICB2aXJ0dWFsIHZvaWQgcmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hvdCgpIG92ZXJyaWRl OworCiAgICAgV0tWaWV3ICptX3drVmlldzsKICAgICBXS1dlYlZpZXcgKm1fd2ViVmlldzsKICAg ICBSZXRhaW5QdHI8V0tFZGl0b3JVbmRvVGFyZ2V0T2JqQz4gbV91bmRvVGFyZ2V0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KaW5kZXggZWZiZWIw NS4uNmZlNjFiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdl Q2xpZW50SW1wbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsLm1tCkBAIC03MjIsNiArNzIyLDIxIEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OndpbGxS ZWNvcmROYXZpZ2F0aW9uU25hcHNob3QoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkKICNl bmRpZgogfQogCit2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRGb3JNYWluRnJhbWUoKQoreworICAgIFttX3drVmlldyBfZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lXTsKK30KKwordm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlk RmluaXNoTG9hZEZvck1haW5GcmFtZSgpCit7CisgICAgW21fd2tWaWV3IF9kaWRGaW5pc2hMb2Fk Rm9yTWFpbkZyYW1lXTsKK30KKwordm9pZCBQYWdlQ2xpZW50SW1wbDo6cmVtb3ZlTmF2aWdhdGlv bkdlc3R1cmVTbmFwc2hvdCgpCit7CisgICAgW21fd2tWaWV3IF9yZW1vdmVOYXZpZ2F0aW9uR2Vz dHVyZVNuYXBzaG90XTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQ TEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Zp ZXdHZXN0dXJlQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIuaAppbmRleCBlOGU5YmFiLi4yZDBkMmRmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKQEAg LTEwNCw2ICsxMDQsOSBAQCBwdWJsaWM6CiAKICAgICBib29sIHNob3VsZElnbm9yZVBpbm5lZFN0 YXRlKCkgeyByZXR1cm4gbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZTsgfQogICAgIHZvaWQgc2V0 U2hvdWxkSWdub3JlUGlubmVkU3RhdGUoYm9vbCBpZ25vcmUpIHsgbV9zaG91bGRJZ25vcmVQaW5u ZWRTdGF0ZSA9IGlnbm9yZTsgfQorCisgICAgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRGb3JNYWluRnJhbWUoKTsKKyAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUo KTsKICNlbHNlCiAgICAgdm9pZCBpbnN0YWxsU3dpcGVIYW5kbGVyKFVJVmlldyAqZ2VzdHVyZVJl Y29nbml6ZXJWaWV3LCBVSVZpZXcgKnN3aXBpbmdWaWV3KTsKICAgICB2b2lkIHNldEFsdGVybmF0 ZUJhY2tGb3J3YXJkTGlzdFNvdXJjZVZpZXcoV0tXZWJWaWV3ICopOwpAQCAtMTE0LDExICsxMTcs MTIgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVuZGVyVHJlZVNpemUodWludDY0X3QpOwogI2Vu ZGlmCiAKKyAgICB2b2lkIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKKwogcHJpdmF0ZToKICAgICAv LyBJUEM6Ok1lc3NhZ2VSZWNlaXZlci4KICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZU1lc3Nh Z2UoSVBDOjpDb25uZWN0aW9uKiwgSVBDOjpNZXNzYWdlRGVjb2RlciYpIG92ZXJyaWRlOwotICAg IAotICAgIHZvaWQgcmVtb3ZlU3dpcGVTbmFwc2hvdCgpOworCiAgICAgdm9pZCBzd2lwZVNuYXBz aG90V2F0Y2hkb2dUaW1lckZpcmVkKCk7CiAKICNpZiBQTEFURk9STShNQUMpCkBAIC0xMjYsNiAr MTMwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENvbGxlY3RHZW9tZXRyeUZvck1hZ25pZmlj YXRpb25HZXN0dXJlKFdlYkNvcmU6OkZsb2F0UmVjdCB2aXNpYmxlQ29udGVudEJvdW5kcywgYm9v bCBmcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVyZSk7CiAgICAgdm9pZCBkaWRDb2xsZWN0 R2VvbWV0cnlGb3JTbWFydE1hZ25pZmljYXRpb25HZXN0dXJlKFdlYkNvcmU6OkZsb2F0UG9pbnQg b3JpZ2luLCBXZWJDb3JlOjpGbG9hdFJlY3QgcmVuZGVyUmVjdCwgV2ViQ29yZTo6RmxvYXRSZWN0 IHZpc2libGVDb250ZW50Qm91bmRzLCBib29sIGlzUmVwbGFjZWRFbGVtZW50LCBkb3VibGUgdmll d3BvcnRNaW5pbXVtU2NhbGUsIGRvdWJsZSB2aWV3cG9ydE1heGltdW1TY2FsZSk7CiAgICAgdm9p ZCBkaWRIaXRSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCgpOworICAgIHZvaWQgcmVtb3ZlU3dpcGVT bmFwc2hvdEFmdGVyUmVwYWludCgpOwogCiAgICAgdm9pZCBlbmRNYWduaWZpY2F0aW9uR2VzdHVy ZSgpOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgc2NhbGVkTWFnbmlmaWNhdGlvbk9yaWdpbihX ZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbiwgZG91YmxlIHNjYWxlKTsKQEAgLTE0NSw3ICsxNTAs NyBAQCBwcml2YXRlOgogCiAgICAgV2ViUGFnZVByb3h5JiBtX3dlYlBhZ2VQcm94eTsKICAgICBW aWV3R2VzdHVyZVR5cGUgbV9hY3RpdmVHZXN0dXJlVHlwZTsKLSAgICAKKwogICAgIFJ1bkxvb3A6 OlRpbWVyPFZpZXdHZXN0dXJlQ29udHJvbGxlcj4gbV9zd2lwZVdhdGNoZG9nVGltZXI7CiAKICNp ZiBVU0UoSU9TVVJGQUNFKQpAQCAtMTgxLDYgKzE4NiwxMCBAQCBwcml2YXRlOgogICAgIFdlYkNv cmU6OkZsb2F0U2l6ZSBtX2N1bXVsYXRpdmVEZWx0YUZvclBlbmRpbmdTd2lwZTsKIAogICAgIGJv b2wgbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZTsKKworICAgIGJvb2wgbV9zd2lwZVdhaXRpbmdG b3JWaXN1YWxseU5vbkVtcHR5TGF5b3V0OworICAgIGJvb2wgbV9zd2lwZVdhaXRpbmdGb3JSZW5k ZXJUcmVlU2l6ZVRocmVzaG9sZDsKKyAgICBib29sIG1fc3dpcGVXYWl0aW5nRm9yUmVwYWludDsK ICNlbHNlICAgIAogICAgIFVJVmlldyAqbV9saXZlU3dpcGVWaWV3OwogICAgIFJldGFpblB0cjxV SVZpZXc+IG1fbGl2ZVN3aXBlVmlld0NsaXBwaW5nVmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KaW5kZXgg ZDIzODZjYi4uYTYzZjNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KQEAgLTEwNSw2ICsxMDUsOSBAQCBW aWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJvbGxlcihXZWJQYWdlUHJveHkm IHdlYlBhZ2VQcm94eSkKICAgICAsIG1fY3VzdG9tU3dpcGVWaWV3c1RvcENvbnRlbnRJbnNldCgw KQogICAgICwgbV9wZW5kaW5nU3dpcGVSZWFzb24oUGVuZGluZ1N3aXBlUmVhc29uOjpOb25lKQog ICAgICwgbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZShmYWxzZSkKKyAgICAsIG1fc3dpcGVXYWl0 aW5nRm9yVmlzdWFsbHlOb25FbXB0eUxheW91dChmYWxzZSkKKyAgICAsIG1fc3dpcGVXYWl0aW5n Rm9yUmVuZGVyVHJlZVNpemVUaHJlc2hvbGQoZmFsc2UpCisgICAgLCBtX3N3aXBlV2FpdGluZ0Zv clJlcGFpbnQoZmFsc2UpCiB7CiAgICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLmFkZE1lc3Nh Z2VSZWNlaXZlcihNZXNzYWdlczo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpLCAqdGhpcyk7CiB9CkBAIC02NDEsMjkg KzY0NCw3MCBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sCiAKICAgICBtX3dlYlBhZ2VQcm94eS5w cm9jZXNzKCkuc2VuZChNZXNzYWdlczo6Vmlld0dlc3R1cmVHZW9tZXRyeUNvbGxlY3Rvcjo6U2V0 UmVuZGVyVHJlZVNpemVOb3RpZmljYXRpb25UaHJlc2hvbGQocmVuZGVyVHJlZVNpemUgKiBzd2lw ZVNuYXBzaG90UmVtb3ZhbFJlbmRlclRyZWVTaXplVGFyZ2V0RnJhY3Rpb24pLCBtX3dlYlBhZ2VQ cm94eS5wYWdlSUQoKSk7CiAKKyAgICBtX3N3aXBlV2FpdGluZ0ZvclZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQgPSB0cnVlOworICAgIG1fc3dpcGVXYWl0aW5nRm9yUmVuZGVyVHJlZVNpemVUaHJlc2hv bGQgPSB0cnVlOworCiAgICAgbV93ZWJQYWdlUHJveHkubmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQo dHJ1ZSwgKnRhcmdldEl0ZW0pOwogICAgIG1fd2ViUGFnZVByb3h5LmdvVG9CYWNrRm9yd2FyZEl0 ZW0odGFyZ2V0SXRlbSk7Cit9CiAKLSAgICBpZiAoIXJlbmRlclRyZWVTaXplKSB7Ci0gICAgICAg IHJlbW92ZVN3aXBlU25hcHNob3QoKTsKK3ZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRI aXRSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCgpCit7CisgICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5 cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKICAgICAgICAgcmV0dXJuOwotICAgIH0KIAot ICAgIG1fc3dpcGVXYXRjaGRvZ1RpbWVyLnN0YXJ0T25lU2hvdChzd2lwZVNuYXBzaG90UmVtb3Zh bFdhdGNoZG9nRHVyYXRpb24uY291bnQoKSk7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JSZW5kZXJU cmVlU2l6ZVRocmVzaG9sZCA9IGZhbHNlOworCisgICAgaWYgKCFtX3N3aXBlV2FpdGluZ0ZvclZp c3VhbGx5Tm9uRW1wdHlMYXlvdXQpCisgICAgICAgIHJlbW92ZVN3aXBlU25hcHNob3RBZnRlclJl cGFpbnQoKTsKIH0KIAotdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmRpZEhpdFJlbmRlclRy ZWVTaXplVGhyZXNob2xkKCkKK3ZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJhbWUoKQoreworICAgIGlmIChtX2FjdGl2ZUdl c3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fc3dpcGVXYWl0aW5nRm9yVmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNlOworCisg ICAgaWYgKCFtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKQorICAgICAg ICByZW1vdmVTd2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCk7CisgICAgZWxzZQorICAgICAgICBt X3N3aXBlV2F0Y2hkb2dUaW1lci5zdGFydE9uZVNob3Qoc3dpcGVTbmFwc2hvdFJlbW92YWxXYXRj aGRvZ0R1cmF0aW9uLmNvdW50KCkpOworfQorCit2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6 ZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSgpCiB7Ci0gICAgcmVtb3ZlU3dpcGVTbmFwc2hvdCgp OworICAgIGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUp CisgICAgICAgIHJldHVybjsKKworICAgIHJlbW92ZVN3aXBlU25hcHNob3RBZnRlclJlcGFpbnQo KTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNob3RXYXRjaGRv Z1RpbWVyRmlyZWQoKQogewotICAgIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKKyAgICByZW1vdmVT d2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCk7Cit9CisKK3ZvaWQgVmlld0dlc3R1cmVDb250cm9s bGVyOjpyZW1vdmVTd2lwZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCkKK3sKKyAgICBpZiAobV9hY3Rp dmVHZXN0dXJlVHlwZSAhPSBWaWV3R2VzdHVyZVR5cGU6OlN3aXBlKQorICAgICAgICByZXR1cm47 CisKKyAgICBpZiAobV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50KQorICAgICAgICByZXR1cm47CisK KyAgICBtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQgPSB0cnVlOworCisgICAgV2ViUGFnZVByb3h5 KiB3ZWJQYWdlUHJveHkgPSAmbV93ZWJQYWdlUHJveHk7CisgICAgbV93ZWJQYWdlUHJveHkuZm9y Y2VSZXBhaW50KFZvaWRDYWxsYmFjazo6Y3JlYXRlKFt3ZWJQYWdlUHJveHldIChDYWxsYmFja0Jh c2U6OkVycm9yIGVycm9yKSB7CisgICAgICAgIHdlYlBhZ2VQcm94eS0+cmVtb3ZlTmF2aWdhdGlv bkdlc3R1cmVTbmFwc2hvdCgpOworICAgIH0pKTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRy b2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3QoKQogeworICAgIG1fc3dpcGVXYWl0aW5nRm9yUmVw YWludCA9IGZhbHNlOworCiAgICAgbV9zd2lwZVdhdGNoZG9nVGltZXIuc3RvcCgpOwogCiAgICAg aWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkK