143199 2015-03-29 14:37:21 -0700 Swipe snapshot removed too early (jumps around) on arstechnica and NYT 2015-03-30 12:04:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca mitz sam simon.fraser oldest_to_newest 1081048 0 thorton 2015-03-29 14:37:21 -0700 REGRESSION: Swipe snapshot removed too early (jumps around) on arstechnica and NYT 1081049 1 249700 thorton 2015-03-29 14:37:43 -0700 Created attachment 249700 Patch 1081051 2 249700 mitz 2015-03-29 15:48:12 -0700 Comment on attachment 249700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249700&action=review > Source/WebKit2/ChangeLog:3 > + REGRESSION: Swipe snapshot removed too early (jumps around) on arstechnica and NYT Regression or not a regression? 1081052 3 249700 darin 2015-03-29 15:57:17 -0700 Comment on attachment 249700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249700&action=review > Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm:151 > + , m_swipeWaitingForRenderTreeSizeThreshold(false) > + , m_swipeWaitingForRepaint(false) > + , m_swipeWaitingForDidFinishLoad(false) > + , m_swipeWaitingForSubresourceLoads(false) > + , m_swipeWaitingForScrollPositionRestoration(false) Should initialize these in the header instead of the constructor. Should do the same for other scalars that are being initialized to an “obvious” default such as “false” or “0”. Helps keep changes in the different per-platform .mm files to a minimum and makes it harder to forget to initialize one. 1081054 4 thorton 2015-03-29 16:27:47 -0700 Not a regression in the WebKit sense. Will remove from the changelog (I realized after I uploaded the patch). 1081055 5 thorton 2015-03-29 16:28:46 -0700 (In reply to comment #3) > Comment on attachment 249700 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=249700&action=review > > > Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm:151 > > + , m_swipeWaitingForRenderTreeSizeThreshold(false) > > + , m_swipeWaitingForRepaint(false) > > + , m_swipeWaitingForDidFinishLoad(false) > > + , m_swipeWaitingForSubresourceLoads(false) > > + , m_swipeWaitingForScrollPositionRestoration(false) > > Should initialize these in the header instead of the constructor. Should do > the same for other scalars that are being initialized to an “obvious” > default such as “false” or “0”. Helps keep changes in the different > per-platform .mm files to a minimum and makes it harder to forget to > initialize one. Yes! Will fix. Thanks! 1081084 6 249706 thorton 2015-03-29 19:50:31 -0700 Created attachment 249706 Patch for landing 1081267 7 thorton 2015-03-30 12:04:02 -0700 http://trac.webkit.org/changeset/182150 249700 2015-03-29 14:37:43 -0700 2015-03-29 19:50:26 -0700 Patch bug-143199-20150329143702.patch text/plain 18764 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQwZjk3NWMyMzJkNzUy NWYzNjYxMGYyNWU0YmI1ZmVhNzAxZGE2NC4uZTc5NWZkMTBhNmY2ZDAxMmJjODIwYTQxNTQxZmJl ZTdjYmJmNWU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDE1LTAzLTI5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046 IFN3aXBlIHNuYXBzaG90IHJlbW92ZWQgdG9vIGVhcmx5IChqdW1wcyBhcm91bmQpIG9uIGFyc3Rl Y2huaWNhIGFuZCBOWVQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0MzE5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTg0MjA0Njc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBWaWV3R2VzdHVy ZUNvbnRyb2xsZXJJT1MncyBzbmFwc2hvdCByZW1vdmFsIHRpbWluZyBiZWhhdmUgbW9yZSBsaWtl IHRoZSBNYWMgdmVyc2lvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpdKToKKyAg ICAgICAgTGV0IFZpZXdHZXN0dXJlQ29udHJvbGxlciBrbm93IHdoZW4gdGhlIHBhZ2UgaGFzIGZp bmlzaGVkIHN0YXRlIHJlc3RvcmF0aW9uLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkRmlu aXNoTG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZFNhbWVEb2N1 bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6XSk6CisgICAgICAgIEZvcndhcmQgdGhlc2UgdG8g Vmlld0dlc3R1cmVDb250cm9sbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXdJbnRlcm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudElt cGxJT1MubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRGaW5pc2hMb2Fk Rm9yTWFpbkZyYW1lKToKKyAgICAgICAgRm9yd2FyZCBkaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1l IHRvIFdLV2ViVmlldy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250 cm9sbGVySU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZp ZXdHZXN0dXJlQ29udHJvbGxlcik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJv bGxlcjo6ZW5kU3dpcGVHZXN0dXJlKToKKyAgICAgICAgU3BsaXQgdGhlIHN3aXBlIHNuYXBzaG90 IHJlbW92YWwgc3RhdGUgaW50byBhIGJ1bmNoIG9mIGJvb2xzLgorCisgICAgICAgIChXZWJLaXQ6 OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6d2lsbENvbW1pdFBvc3RTd2lwZVRyYW5zaXRpb25MYXll clRyZWUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnNldFJlbmRl clRyZWVTaXplKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpyZW1v dmVTd2lwZVNuYXBzaG90SWZSZWFkeSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6cmVtb3ZlU3dpcGVTbmFwc2hvdCk6CisgICAgICAgIFVuaWZ5IHRoZSBzbmFwc2hv dCByZW1vdmFsIGxvZ2ljIGludG8gb25lIGZ1bmN0aW9uOyByZW1vdmVTd2lwZVNuYXBzaG90SWZS ZWFkeQorICAgICAgICBjb21wbGV0ZWx5IG93bnMgdGhlIGRlY2lzaW9uLiBGb3Igbm93LCB3ZSdy ZSB3YWl0aW5nIGZvciBldmVyeXRoaW5nLCBidXQKKyAgICAgICAgd2UgY2FuIGRvIGJldHRlciBp biB0aGUgZnV0dXJlICh1c2luZyBmaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgbGlrZSBNYWMg dXNlZCB0bykuCisKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRS ZXN0b3JlU2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRy b2xsZXI6OmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUp OgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmFjdGl2ZUxvYWRNb25p dG9yaW5nVGltZXJGaXJlZCk6CisgICAgICAgIEFkZCBtb3JlIGNvbmRpdGlvbnMgZm9yIHN3aXBl IHNuYXBzaG90IHJlbW92YWwuIFdlJ2xsIG5vdyB3YWl0IGZvcgorICAgICAgICBkaWRGaW5pc2hM b2FkRm9yTWFpbkZyYW1lIChvciBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1l KSwKKyAgICAgICAgZm9yIGFjdGl2ZSBsb2FkcyB0byBmaW5pc2gsIGFuZCBmb3IgdGhlIHNjcm9s bCBwb3NpdGlvbiB0byBiZSByZXN0b3JlZC4KKyAgICAgICAgVGhpcyBicmluZ3MgdGhlIGlPUyBp bXBsZW1lbnRhdGlvbiBpbiBsaW5lIHdpdGggdGhlIHNsaWdodGx5IGJldHRlciBNYWMKKyAgICAg ICAgaW1wbGVtZW50YXRpb24sIGFuZCBhbHNvIHNldHMgdGhlIHN0YWdlIGZvciBkZWR1cGxpY2F0 aW9uIG9mIGFsbCBvZiB0aGlzIGNvZGUuCisgICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9t YWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXJNYWMubW06CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6Vmlld0dlc3R1cmVDb250cm9sbGVyKToKKwogMjAxNS0wMy0yNyAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgZG8gdGhlIENvbm5l Y3Rpb246OnNldFNob3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMoKSBoYWNrIHdo ZXJlIG5lY2Vzc2FyeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbQppbmRleCAzNjRmMjIwN2I4NzE3ZTdiZGMwYzIwNDM5NjEzM2M2MzI3MDQ0MGIx Li4zZDYxNzRkMGI1N2YwZWQyYTU0MWE4NzgxNWU1MDNhNDk1YzdmZjI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtOTA3LDcgKzkw Nyw5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBhcmVFc3NlbnRpYWxseUVxdWFsQXNGbG9hdChmbG9h dCBhLCBmbG9hdCBiKQogICAgICAgICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107 CiAgICAgfQogCi0gICAgaWYgKF9uZWVkc1RvUmVzdG9yZUV4cG9zZWRSZWN0ICYmIGxheWVyVHJl ZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSA+PSBfZmlyc3RUcmFuc2FjdGlvbklEQWZ0ZXJQ YWdlUmVzdG9yZSkgeworICAgIGJvb2wgaXNUcmFuc2FjdGlvbkFmdGVyUGFnZVJlc3RvcmUgPSBs YXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCkgPj0gX2ZpcnN0VHJhbnNhY3Rpb25J REFmdGVyUGFnZVJlc3RvcmU7CisKKyAgICBpZiAoX25lZWRzVG9SZXN0b3JlRXhwb3NlZFJlY3Qg JiYgaXNUcmFuc2FjdGlvbkFmdGVyUGFnZVJlc3RvcmUpIHsKICAgICAgICAgX25lZWRzVG9SZXN0 b3JlRXhwb3NlZFJlY3QgPSBOTzsKIAogICAgICAgICBpZiAoYXJlRXNzZW50aWFsbHlFcXVhbEFz RmxvYXQoY29udGVudFpvb21TY2FsZShzZWxmKSwgX3NjYWxlVG9SZXN0b3JlKSkgewpAQCAtOTE1 LDExICs5MTcsMTIgQEAgc3RhdGljIGlubGluZSBib29sIGFyZUVzc2VudGlhbGx5RXF1YWxBc0Zs b2F0KGZsb2F0IGEsIGZsb2F0IGIpCiAgICAgICAgICAgICBleHBvc2VkUG9zaXRpb24uc2NhbGUo X3NjYWxlVG9SZXN0b3JlLCBfc2NhbGVUb1Jlc3RvcmUpOwogCiAgICAgICAgICAgICBjaGFuZ2VD b250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShfc2Nyb2xsVmlldy5nZXQoKSwgZXhwb3Nl ZFBvc2l0aW9uKTsKKyAgICAgICAgICAgIF9nZXN0dXJlQ29udHJvbGxlci0+ZGlkUmVzdG9yZVNj cm9sbFBvc2l0aW9uKCk7CiAgICAgICAgIH0KICAgICAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVD b250ZW50UmVjdHNdOwogICAgIH0KIAotICAgIGlmIChfbmVlZHNUb1Jlc3RvcmVVbm9ic2N1cmVk Q2VudGVyICYmIGxheWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSA+PSBfZmlyc3RU cmFuc2FjdGlvbklEQWZ0ZXJQYWdlUmVzdG9yZSkgeworICAgIGlmIChfbmVlZHNUb1Jlc3RvcmVV bm9ic2N1cmVkQ2VudGVyICYmIGlzVHJhbnNhY3Rpb25BZnRlclBhZ2VSZXN0b3JlKSB7CiAgICAg ICAgIF9uZWVkc1RvUmVzdG9yZVVub2JzY3VyZWRDZW50ZXIgPSBOTzsKIAogICAgICAgICBpZiAo YXJlRXNzZW50aWFsbHlFcXVhbEFzRmxvYXQoY29udGVudFpvb21TY2FsZShzZWxmKSwgX3NjYWxl VG9SZXN0b3JlKSkgewpAQCAtOTMxLDYgKzkzNCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBhcmVF c3NlbnRpYWxseUVxdWFsQXNGbG9hdChmbG9hdCBhLCBmbG9hdCBiKQogICAgICAgICAgICAgdG9w TGVmdEluRG9jdW1lbnRDb29yZGluYXRlLm1vdmVCeShXZWJDb3JlOjpGbG9hdFBvaW50KC1fb2Jz Y3VyZWRJbnNldHMubGVmdCwgLV9vYnNjdXJlZEluc2V0cy50b3ApKTsKIAogICAgICAgICAgICAg Y2hhbmdlQ29udGVudE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoX3Njcm9sbFZpZXcuZ2V0KCks IHRvcExlZnRJbkRvY3VtZW50Q29vcmRpbmF0ZSk7CisgICAgICAgICAgICBfZ2VzdHVyZUNvbnRy b2xsZXItPmRpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOwogICAgICAgICB9CiAgICAgICAgIFtz ZWxmIF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXTsKICAgICB9CkBAIC0xNDk2LDkgKzE1MDAs MTggQEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChX ZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICAgICAgaW5TdGFibGVTdGF0ZTppc1N0 YWJsZVN0YXRlIGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHk6X2lzQ2hhbmdp bmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHldOwogfQogCistICh2b2lkKV9kaWRGaW5pc2hM b2FkRm9yTWFpbkZyYW1lCit7CisgICAgaWYgKF9nZXN0dXJlQ29udHJvbGxlcikKKyAgICAgICAg X2dlc3R1cmVDb250cm9sbGVyLT5kaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lKCk7Cit9CisKIC0g KHZvaWQpX2RpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6KFdlYktpdDo6U2Ft ZURvY3VtZW50TmF2aWdhdGlvblR5cGUpbmF2aWdhdGlvblR5cGUKIHsKICAgICBbX2N1c3RvbUNv bnRlbnRWaWV3IHdlYl9kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uOnRvQVBJKG5hdmlnYXRpb25U eXBlKV07CisKKyAgICBpZiAoX2dlc3R1cmVDb250cm9sbGVyKQorICAgICAgICBfZ2VzdHVyZUNv bnRyb2xsZXItPmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUobmF2aWdhdGlv blR5cGUpOwogfQogCiAtICh2b2lkKV9rZXlib2FyZENoYW5nZWRXaXRoSW5mbzooTlNEaWN0aW9u YXJ5ICopa2V5Ym9hcmRJbmZvIGFkanVzdFNjcm9sbFZpZXc6KEJPT0wpYWRqdXN0U2Nyb2xsVmll dwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oCmluZGV4IDlmY2NjNjQ4OGU1YTBmNGJiMzlmZmFmODhlY2I1NzcxN2QyZjBh NjYuLjUwOWU4ZWIyNTBmMGZjYTE3NjU5NjhkMDRmYzQ0N2FhZmJkMGE3YzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFs LmgKQEAgLTkzLDYgKzkzLDcgQEAgc3RydWN0IFByaW50SW5mbzsKIAogLSAodm9pZClfdXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0czsKIAorLSAodm9pZClfZGlkRmluaXNoTG9hZEZvck1haW5GcmFt ZTsKIC0gKHZvaWQpX2RpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6KFdlYktp dDo6U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpbmF2aWdhdGlvblR5cGU7CiAKIC0gKEJPT0wp X2lzU2hvd2luZ1ZpZGVvT3B0aW1pemVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0KaW5kZXggOWI1NmFhNDNkOTliZDgwNjAyNmZmZjc1 ZDMwOGYwZjZjNjIwZjNkMi4uMjgwOTE3OTI3NDJhYmY5Yjk4ZDhhZjQ3MTM2ZDUyOWY2NTVkZjlm ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1w bElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBs SU9TLm1tCkBAIC03MDUsNiArNzA1LDcgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCkKIAogdm9pZCBQYWdlQ2xpZW50SW1w bDo6ZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZSgpCiB7CisgICAgW21fd2ViVmlldyBfZGlkRmlu aXNoTG9hZEZvck1haW5GcmFtZV07CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OmRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUg bmF2aWdhdGlvblR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tCmluZGV4IDQzNWIwMWEwMzE3MWZlZTU0MzJh MDY4ZDMxM2Q0MzlkODVlZGJhYjEuLjg3OGMxNWI3MmNlYTExODU4NmRjYzJlOTI1NzNkYmM2YTMy ZDk2NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1 cmVDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmll d0dlc3R1cmVDb250cm9sbGVySU9TLm1tCkBAIC02NCw2ICs2NCw3IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBzdGF0aWMgY29uc3QgZmxvYXQgc3dpcGVTbmFwc2hvdFJlbW92YWxSZW5k ZXJUcmVlU2l6ZVRhcmdldEZyYWN0aW9uID0gMC41Owogc3RhdGljIGNvbnN0IHN0ZDo6Y2hyb25v OjpzZWNvbmRzIHN3aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbiA9IDNfczsKK3N0 YXRpYyBjb25zdCBzdGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzIHN3aXBlU25hcHNob3RSZW1vdmFs QWN0aXZlTG9hZE1vbml0b3JpbmdJbnRlcnZhbCA9IDI1MF9tczsKIAogLy8gVGhlIGtleSBpbiB0 aGlzIG1hcCBpcyB0aGUgYXNzb2NpYXRlZCBwYWdlIElELgogc3RhdGljIEhhc2hNYXA8dWludDY0 X3QsIFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyKj4mIHZpZXdHZXN0dXJlQ29udHJvbGxl cnNGb3JBbGxQYWdlcygpCkBAIC0xNDAsOSArMTQxLDE0IEBAIFZpZXdHZXN0dXJlQ29udHJvbGxl cjo6Vmlld0dlc3R1cmVDb250cm9sbGVyKFdlYlBhZ2VQcm94eSYgd2ViUGFnZVByb3h5KQogICAg IDogbV93ZWJQYWdlUHJveHkod2ViUGFnZVByb3h5KQogICAgICwgbV9hY3RpdmVHZXN0dXJlVHlw ZShWaWV3R2VzdHVyZVR5cGU6Ok5vbmUpCiAgICAgLCBtX3N3aXBlV2F0Y2hkb2dUaW1lcihSdW5M b29wOjptYWluKCksIHRoaXMsICZWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNob3RX YXRjaGRvZ1RpbWVyRmlyZWQpCisgICAgLCBtX3N3aXBlQWN0aXZlTG9hZE1vbml0b3JpbmdUaW1l cihSdW5Mb29wOjptYWluKCksIHRoaXMsICZWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmFjdGl2ZUxv YWRNb25pdG9yaW5nVGltZXJGaXJlZCkKICAgICAsIG1fc25hcHNob3RSZW1vdmFsVGFyZ2V0UmVu ZGVyVHJlZVNpemUoMCkKLSAgICAsIG1fc2hvdWxkUmVtb3ZlU25hcHNob3RXaGVuVGFyZ2V0UmVu ZGVyVHJlZVNpemVIaXQoZmFsc2UpCiAgICAgLCBtX2dlc3R1cmVQZW5kaW5nU25hcHNob3RSZW1v dmFsKDApCisgICAgLCBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKGZh bHNlKQorICAgICwgbV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50KGZhbHNlKQorICAgICwgbV9zd2lw ZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkKGZhbHNlKQorICAgICwgbV9zd2lwZVdhaXRpbmdGb3JT dWJyZXNvdXJjZUxvYWRzKGZhbHNlKQorICAgICwgbV9zd2lwZVdhaXRpbmdGb3JTY3JvbGxQb3Np dGlvblJlc3RvcmF0aW9uKGZhbHNlKQogewogICAgIHZpZXdHZXN0dXJlQ29udHJvbGxlcnNGb3JB bGxQYWdlcygpLmFkZCh3ZWJQYWdlUHJveHkucGFnZUlEKCksIHRoaXMpOwogfQpAQCAtMzAxLDYg KzMwNywxMiBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKKyAgICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gdHJ1ZTsK KyAgICBtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQgPSB0cnVlOworICAgIG1fc3dpcGVXYWl0aW5n Rm9yRGlkRmluaXNoTG9hZCA9IHRydWU7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJj ZUxvYWRzID0gdHJ1ZTsKKyAgICBtX3N3aXBlV2FpdGluZ0ZvclNjcm9sbFBvc2l0aW9uUmVzdG9y YXRpb24gPSB0cnVlOworCiAgICAgbV9zd2lwZVdhdGNoZG9nVGltZXIuc3RhcnRPbmVTaG90KHN3 aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbi5jb3VudCgpKTsKIH0KIApAQCAtMzE0 LDcgKzMyNiwxMSBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6d2lsbENvbW1pdFBvc3RT d2lwZVRyYW5zaXRpb25MYXllclRyZWUoYm9vbCBzdWNjZXNzZgogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgbV9zaG91bGRSZW1vdmVTbmFwc2hvdFdoZW5UYXJnZXRSZW5kZXJUcmVlU2l6 ZUhpdCA9IHRydWU7CisgICAgaWYgKCFtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQpCisgICAgICAg IHJldHVybjsKKworICAgIG1fc3dpcGVXYWl0aW5nRm9yUmVwYWludCA9IGZhbHNlOworICAgIHJl bW92ZVN3aXBlU25hcHNob3RJZlJlYWR5KCk7CiB9CiAKIHZvaWQgVmlld0dlc3R1cmVDb250cm9s bGVyOjpzZXRSZW5kZXJUcmVlU2l6ZSh1aW50NjRfdCByZW5kZXJUcmVlU2l6ZSkKQEAgLTMyMiwx MSArMzM4LDY3IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpzZXRSZW5kZXJUcmVlU2l6 ZSh1aW50NjRfdCByZW5kZXJUcmVlU2l6ZSkKICAgICBpZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAh PSBWaWV3R2VzdHVyZVR5cGU6OlN3aXBlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1f c2hvdWxkUmVtb3ZlU25hcHNob3RXaGVuVGFyZ2V0UmVuZGVyVHJlZVNpemVIaXQpCisgICAgaWYg KCFtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKQogICAgICAgICByZXR1 cm47CiAKLSAgICBpZiAoIW1fc25hcHNob3RSZW1vdmFsVGFyZ2V0UmVuZGVyVHJlZVNpemUgfHwg cmVuZGVyVHJlZVNpemUgPiBtX3NuYXBzaG90UmVtb3ZhbFRhcmdldFJlbmRlclRyZWVTaXplKQot ICAgICAgICByZW1vdmVTd2lwZVNuYXBzaG90KCk7CisgICAgaWYgKCFtX3NuYXBzaG90UmVtb3Zh bFRhcmdldFJlbmRlclRyZWVTaXplIHx8IHJlbmRlclRyZWVTaXplID4gbV9zbmFwc2hvdFJlbW92 YWxUYXJnZXRSZW5kZXJUcmVlU2l6ZSkgeworICAgICAgICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRl clRyZWVTaXplVGhyZXNob2xkID0gZmFsc2U7CisgICAgICAgIHJlbW92ZVN3aXBlU25hcHNob3RJ ZlJlYWR5KCk7CisgICAgfQorfQorCit2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkUmVz dG9yZVNjcm9sbFBvc2l0aW9uKCkKK3sKKyAgICBpZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAhPSBW aWV3R2VzdHVyZVR5cGU6OlN3aXBlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIW1fc3dp cGVXYWl0aW5nRm9yU2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbikKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTY3JvbGxQb3NpdGlvblJlc3RvcmF0aW9uID0gZmFsc2U7 CisgICAgcmVtb3ZlU3dpcGVTbmFwc2hvdElmUmVhZHkoKTsKK30KKwordm9pZCBWaWV3R2VzdHVy ZUNvbnRyb2xsZXI6OmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKQoreworICAgIGlmIChtX2Fj dGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUpCisgICAgICAgIHJldHVy bjsKKworICAgIGlmICghbV9zd2lwZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkKQorICAgICAgICBy ZXR1cm47CisKKyAgICBtX3N3aXBlV2FpdGluZ0ZvckRpZEZpbmlzaExvYWQgPSBmYWxzZTsKKwor ICAgIGlmIChtX3dlYlBhZ2VQcm94eS5wYWdlTG9hZFN0YXRlKCkuaXNMb2FkaW5nKCkpIHsKKyAg ICAgICAgbV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXIuc3RhcnRSZXBlYXRpbmcoc3dp cGVTbmFwc2hvdFJlbW92YWxBY3RpdmVMb2FkTW9uaXRvcmluZ0ludGVydmFsKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKworICAgIG1fc3dpcGVXYWl0aW5nRm9yU3VicmVzb3VyY2VMb2FkcyA9 IGZhbHNlOworICAgIHJlbW92ZVN3aXBlU25hcHNob3RJZlJlYWR5KCk7Cit9CisKK3ZvaWQgVmll d0dlc3R1cmVDb250cm9sbGVyOjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1l KFNhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlIHR5cGUpCit7CisgICAgaWYgKG1fYWN0aXZlR2Vz dHVyZVR5cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgLy8gVGhpcyBpcyBuZWFybHkgZXF1aXZhbGVudCB0byBkaWRGaW5pc2hMb2FkIGluIHRoZSBz YW1lIGRvY3VtZW50IG5hdmlnYXRpb24gY2FzZS4KKyAgICBtX3N3aXBlV2FpdGluZ0ZvckRpZEZp bmlzaExvYWQgPSBmYWxzZTsKKworICAgIGlmICh0eXBlICE9IFNhbWVEb2N1bWVudE5hdmlnYXRp b25TZXNzaW9uU3RhdGVSZXBsYWNlICYmIHR5cGUgIT0gU2FtZURvY3VtZW50TmF2aWdhdGlvblNl c3Npb25TdGF0ZVBvcCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zd2lwZUFjdGl2ZUxvYWRN b25pdG9yaW5nVGltZXIuc3RhcnRSZXBlYXRpbmcoc3dpcGVTbmFwc2hvdFJlbW92YWxBY3RpdmVM b2FkTW9uaXRvcmluZ0ludGVydmFsKTsKK30KKwordm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6 OmFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXJGaXJlZCgpCit7CisgICAgaWYgKG1fd2ViUGFnZVBy b3h5LnBhZ2VMb2FkU3RhdGUoKS5pc0xvYWRpbmcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9zd2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJjZUxvYWRzID0gZmFsc2U7CisgICAgcmVtb3ZlU3dp cGVTbmFwc2hvdElmUmVhZHkoKTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3 aXBlU25hcHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQoKQpAQCAtMzM0LDExICs0MDYsMjQgQEAgdm9p ZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQo KQogICAgIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKIH0KIAordm9pZCBWaWV3R2VzdHVyZUNvbnRy b2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3RJZlJlYWR5KCkKK3sKKyAgICBpZiAobV9zd2lwZVdh aXRpbmdGb3JSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCB8fCBtX3N3aXBlV2FpdGluZ0ZvclJlcGFp bnQgfHwgbV9zd2lwZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkIHx8IG1fc3dpcGVXYWl0aW5nRm9y U3VicmVzb3VyY2VMb2FkcyB8fCBtX3N3aXBlV2FpdGluZ0ZvclNjcm9sbFBvc2l0aW9uUmVzdG9y YXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKK30K Kwogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3QoKQogewot ICAgIG1fc2hvdWxkUmVtb3ZlU25hcHNob3RXaGVuVGFyZ2V0UmVuZGVyVHJlZVNpemVIaXQgPSBm YWxzZTsKKyAgICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gZmFs c2U7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50ID0gZmFsc2U7CisgICAgbV9zd2lwZVdh aXRpbmdGb3JEaWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTdWJy ZXNvdXJjZUxvYWRzID0gZmFsc2U7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTY3JvbGxQb3NpdGlv blJlc3RvcmF0aW9uID0gZmFsc2U7CiAKICAgICBtX3N3aXBlV2F0Y2hkb2dUaW1lci5zdG9wKCk7 CisgICAgbV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXIuc3RvcCgpOwogCiAgICAgaWYg KG1fYWN0aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2Vz dHVyZUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1 cmVDb250cm9sbGVyLmgKaW5kZXggN2YzNzljNzNhMzNmYzc3NGU5YWUxMjI0N2ZiOGQ3Y2JmNTcx ZWRmYy4uMjUxYTgwOGUxOTFlODdhNGIyMjk2YzExYzgxOTE3YTFkMDcwNmMyZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5o CkBAIC0xMDksOCArMTA5LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2hvdWxkSWdub3JlUGlu bmVkU3RhdGUoYm9vbCBpZ25vcmUpIHsgbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZSA9IGlnbm9y ZTsgfQogCiAgICAgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJh bWUoKTsKLSAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsKLSAgICB2b2lkIGRp ZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlv blR5cGUpOwogI2Vsc2UKICAgICB2b2lkIGluc3RhbGxTd2lwZUhhbmRsZXIoVUlWaWV3ICpnZXN0 dXJlUmVjb2duaXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1ZpZXcpOwogICAgIHZvaWQgc2V0QWx0 ZXJuYXRlQmFja0ZvcndhcmRMaXN0U291cmNlVmlldyhXS1dlYlZpZXcgKik7CkBAIC0xMTksMTUg KzExNywxOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBlbmRTd2lwZUdlc3R1cmUoV2ViQmFja0Zvcndh cmRMaXN0SXRlbSogdGFyZ2V0SXRlbSwgX1VJVmlld0NvbnRyb2xsZXJUcmFuc2l0aW9uQ29udGV4 dCAqLCBib29sIGNhbmNlbGxlZCk7CiAgICAgdm9pZCB3aWxsQ29tbWl0UG9zdFN3aXBlVHJhbnNp dGlvbkxheWVyVHJlZShib29sKTsKICAgICB2b2lkIHNldFJlbmRlclRyZWVTaXplKHVpbnQ2NF90 KTsKKyAgICB2b2lkIGRpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOwogI2VuZGlmCiAKKyAgICB2 b2lkIGRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsKICAgICB2b2lkIHJlbW92ZVN3aXBlU25h cHNob3QoKTsKKyAgICB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUo U2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUpOwogCiBwcml2YXRlOgogICAgIC8vIElQQzo6TWVz c2FnZVJlY2VpdmVyLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNv bm5lY3Rpb24mLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIHN3 aXBlU25hcHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQoKTsKKyAgICB2b2lkIGFjdGl2ZUxvYWRNb25p dG9yaW5nVGltZXJGaXJlZCgpOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIC8vIE1lc3NhZ2Ug aGFuZGxlcnMuCkBAIC0xMzUsNyArMTM3LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENvbGxl Y3RHZW9tZXRyeUZvclNtYXJ0TWFnbmlmaWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6RmxvYXRQb2lu dCBvcmlnaW4sIFdlYkNvcmU6OkZsb2F0UmVjdCByZW5kZXJSZWN0LCBXZWJDb3JlOjpGbG9hdFJl Y3QgdmlzaWJsZUNvbnRlbnRCb3VuZHMsIGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQsIGRvdWJsZSB2 aWV3cG9ydE1pbmltdW1TY2FsZSwgZG91YmxlIHZpZXdwb3J0TWF4aW11bVNjYWxlKTsKICAgICB2 b2lkIGRpZEhpdFJlbmRlclRyZWVTaXplVGhyZXNob2xkKCk7CiAgICAgdm9pZCByZW1vdmVTd2lw ZVNuYXBzaG90QWZ0ZXJSZXBhaW50KCk7Ci0gICAgdm9pZCBhY3RpdmVMb2FkTW9uaXRvcmluZ1Rp bWVyRmlyZWQoKTsKIAogICAgIHZvaWQgZW5kTWFnbmlmaWNhdGlvbkdlc3R1cmUoKTsKICAgICBX ZWJDb3JlOjpGbG9hdFBvaW50IHNjYWxlZE1hZ25pZmljYXRpb25PcmlnaW4oV2ViQ29yZTo6Rmxv YXRQb2ludCBvcmlnaW4sIGRvdWJsZSBzY2FsZSk7CkBAIC0xNTIsMTggKzE1MywyMCBAQCBwcml2 YXRlOgogICAgIENBTGF5ZXIgKmRldGVybWluZUxheWVyQWRqYWNlbnRUb1NuYXBzaG90Rm9yUGFy ZW50KFN3aXBlRGlyZWN0aW9uLCBDQUxheWVyICpzbmFwc2hvdExheWVyUGFyZW50KSBjb25zdDsK ICAgICB2b2lkIGFwcGx5RGVidWdnaW5nUHJvcGVydGllc1RvU3dpcGVWaWV3cygpOwogICAgIHZv aWQgZGlkTW92ZVN3aXBlU25hcHNob3RMYXllcigpOworI2Vsc2UKKyAgICB2b2lkIHJlbW92ZVN3 aXBlU25hcHNob3RJZlJlYWR5KCk7CiAjZW5kaWYKIAogICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQ YWdlUHJveHk7CiAgICAgVmlld0dlc3R1cmVUeXBlIG1fYWN0aXZlR2VzdHVyZVR5cGU7CiAKICAg ICBSdW5Mb29wOjpUaW1lcjxWaWV3R2VzdHVyZUNvbnRyb2xsZXI+IG1fc3dpcGVXYXRjaGRvZ1Rp bWVyOworICAgIFJ1bkxvb3A6OlRpbWVyPFZpZXdHZXN0dXJlQ29udHJvbGxlcj4gbV9zd2lwZUFj dGl2ZUxvYWRNb25pdG9yaW5nVGltZXI7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgUmVmUHRy PFZpZXdTbmFwc2hvdD4gbV9jdXJyZW50U3dpcGVTbmFwc2hvdDsKIAogICAgIFJ1bkxvb3A6OlRp bWVyPFZpZXdHZXN0dXJlQ29udHJvbGxlcj4gbV9zd2lwZVdhdGNoZG9nQWZ0ZXJGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXRUaW1lcjsKLSAgICBSdW5Mb29wOjpUaW1lcjxWaWV3R2VzdHVyZUNv bnRyb2xsZXI+IG1fc3dpcGVBY3RpdmVMb2FkTW9uaXRvcmluZ1RpbWVyOwogCiAgICAgZG91Ymxl IG1fbWFnbmlmaWNhdGlvbjsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IG1fbWFnbmlmaWNhdGlv bk9yaWdpbjsKQEAgLTE5NSwxMCArMTk4LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIChebV9kaWRN b3ZlU3dpcGVTbmFwc2hvdENhbGxiYWNrKShDR1JlY3QpOwogCiAgICAgYm9vbCBtX3Nob3VsZEln bm9yZVBpbm5lZFN0YXRlOwotCi0gICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvclZpc3VhbGx5Tm9u RW1wdHlMYXlvdXQ7Ci0gICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhy ZXNob2xkOwotICAgIGJvb2wgbV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50OwogICAgIGJvb2wgbV9z d2lwZUluUHJvZ3Jlc3M7CiAjZWxzZSAgICAKICAgICBVSVZpZXcgKm1fbGl2ZVN3aXBlVmlldzsK QEAgLTIwOCwxMSArMjA3LDE3IEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPFdLU3dpcGVUcmFu c2l0aW9uQ29udHJvbGxlcj4gbV9zd2lwZUludGVyYWN0aXZlVHJhbnNpdGlvbkRlbGVnYXRlOwog ICAgIFJldGFpblB0cjxfVUlWaWV3Q29udHJvbGxlck9uZVRvT25lVHJhbnNpdGlvbkNvbnRleHQ+ IG1fc3dpcGVUcmFuc2l0aW9uQ29udGV4dDsKICAgICB1aW50NjRfdCBtX3NuYXBzaG90UmVtb3Zh bFRhcmdldFJlbmRlclRyZWVTaXplOwotICAgIGJvb2wgbV9zaG91bGRSZW1vdmVTbmFwc2hvdFdo ZW5UYXJnZXRSZW5kZXJUcmVlU2l6ZUhpdDsKICAgICBXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IG1f YWx0ZXJuYXRlQmFja0ZvcndhcmRMaXN0U291cmNlVmlldzsKICAgICBSZWZQdHI8V2ViUGFnZVBy b3h5PiBtX3dlYlBhZ2VQcm94eUZvckJhY2tGb3J3YXJkTGlzdEZvckN1cnJlbnRTd2lwZTsKICAg ICB1aW50NjRfdCBtX2dlc3R1cmVQZW5kaW5nU25hcHNob3RSZW1vdmFsOwogI2VuZGlmCisKKyAg ICBib29sIG1fc3dpcGVXYWl0aW5nRm9yVmlzdWFsbHlOb25FbXB0eUxheW91dDsKKyAgICBib29s IG1fc3dpcGVXYWl0aW5nRm9yUmVuZGVyVHJlZVNpemVUaHJlc2hvbGQ7CisgICAgYm9vbCBtX3N3 aXBlV2FpdGluZ0ZvclJlcGFpbnQ7CisgICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvckRpZEZpbmlz aExvYWQ7CisgICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvclN1YnJlc291cmNlTG9hZHM7CisgICAg Ym9vbCBtX3N3aXBlV2FpdGluZ0ZvclNjcm9sbFBvc2l0aW9uUmVzdG9yYXRpb247CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KaW5kZXggYjkyZDkzMjdkZDdkZDMw YTNiYzI3NjE4ZDBiNmQ2NjMyZThhYWRlOC4uYWE3YjNlMmY2NGRhNjFkNDg0NjNiM2FmMzI4ZTk2 MDFhMThiYjFkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KQEAgLTg4LDggKzg4LDggQEAgVmlld0dlc3R1 cmVDb250cm9sbGVyOjpWaWV3R2VzdHVyZUNvbnRyb2xsZXIoV2ViUGFnZVByb3h5JiB3ZWJQYWdl UHJveHkpCiAgICAgOiBtX3dlYlBhZ2VQcm94eSh3ZWJQYWdlUHJveHkpCiAgICAgLCBtX2FjdGl2 ZUdlc3R1cmVUeXBlKFZpZXdHZXN0dXJlVHlwZTo6Tm9uZSkKICAgICAsIG1fc3dpcGVXYXRjaGRv Z1RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6c3dp cGVTbmFwc2hvdFdhdGNoZG9nVGltZXJGaXJlZCkKLSAgICAsIG1fc3dpcGVXYXRjaGRvZ0FmdGVy Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAm Vmlld0dlc3R1cmVDb250cm9sbGVyOjpzd2lwZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZpcmVkKQog ICAgICwgbV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0 aGlzLCAmVmlld0dlc3R1cmVDb250cm9sbGVyOjphY3RpdmVMb2FkTW9uaXRvcmluZ1RpbWVyRmly ZWQpCisgICAgLCBtX3N3aXBlV2F0Y2hkb2dBZnRlckZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91 dFRpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6c3dp cGVTbmFwc2hvdFdhdGNoZG9nVGltZXJGaXJlZCkKICAgICAsIG1fbGFzdE1hZ25pZmljYXRpb25H ZXN0dXJlV2FzU21hcnRNYWduaWZpY2F0aW9uKGZhbHNlKQogICAgICwgbV92aXNpYmxlQ29udGVu dFJlY3RJc1ZhbGlkKGZhbHNlKQogICAgICwgbV9mcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2Vz dHVyZShmYWxzZSkKQEAgLTk4LDEwICs5OCwxMyBAQCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZp ZXdHZXN0dXJlQ29udHJvbGxlcihXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKICAgICAsIG1f cGVuZGluZ1N3aXBlUmVhc29uKFBlbmRpbmdTd2lwZVJlYXNvbjo6Tm9uZSkKICAgICAsIG1fZGlk TW92ZVN3aXBlU25hcHNob3RDYWxsYmFjayhudWxscHRyKQogICAgICwgbV9zaG91bGRJZ25vcmVQ aW5uZWRTdGF0ZShmYWxzZSkKKyAgICAsIG1fc3dpcGVJblByb2dyZXNzKGZhbHNlKQogICAgICwg bV9zd2lwZVdhaXRpbmdGb3JWaXN1YWxseU5vbkVtcHR5TGF5b3V0KGZhbHNlKQogICAgICwgbV9z d2lwZVdhaXRpbmdGb3JSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZChmYWxzZSkKICAgICAsIG1fc3dp cGVXYWl0aW5nRm9yUmVwYWludChmYWxzZSkKLSAgICAsIG1fc3dpcGVJblByb2dyZXNzKGZhbHNl KQorICAgICwgbV9zd2lwZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkKGZhbHNlKQorICAgICwgbV9z d2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJjZUxvYWRzKGZhbHNlKQorICAgICwgbV9zd2lwZVdhaXRp bmdGb3JTY3JvbGxQb3NpdGlvblJlc3RvcmF0aW9uKGZhbHNlKQogewogICAgIG1fd2ViUGFnZVBy b3h5LnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwg KnRoaXMpOwogfQo= 249706 2015-03-29 19:50:31 -0700 2015-03-29 19:50:31 -0700 Patch for landing bug-143199-20150329194949.patch text/plain 20327 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQwZjk3NWMyMzJkNzUy NWYzNjYxMGYyNWU0YmI1ZmVhNzAxZGE2NC4uYmRmZDc0N2FhZTEyYmZmNjNhN2QxOTIxZTE2OTQ2 ZGM1YWVhYWMzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDE1LTAzLTI5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFN3aXBlIHNuYXBz aG90IHJlbW92ZWQgdG9vIGVhcmx5IChqdW1wcyBhcm91bmQpIG9uIGFyc3RlY2huaWNhIGFuZCBO WVQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzE5 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTg0MjA0Njc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBWaWV3R2VzdHVyZUNvbnRyb2xsZXJJ T1MncyBzbmFwc2hvdCByZW1vdmFsIHRpbWluZyBiZWhhdmUgbW9yZSBsaWtlIHRoZSBNYWMgdmVy c2lvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpdKToKKyAgICAgICAgTGV0IFZp ZXdHZXN0dXJlQ29udHJvbGxlciBrbm93IHdoZW4gdGhlIHBhZ2UgaGFzIGZpbmlzaGVkIHN0YXRl IHJlc3RvcmF0aW9uLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkRmluaXNoTG9hZEZvck1h aW5GcmFtZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZFNhbWVEb2N1bWVudE5hdmlnYXRp b25Gb3JNYWluRnJhbWU6XSk6CisgICAgICAgIEZvcndhcmQgdGhlc2UgdG8gVmlld0dlc3R1cmVD b250cm9sbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRl cm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06Cisg ICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1l KToKKyAgICAgICAgRm9yd2FyZCBkaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lIHRvIFdLV2ViVmll dy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1t OgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29u dHJvbGxlcik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dp cGVHZXN0dXJlKToKKyAgICAgICAgU3BsaXQgdGhlIHN3aXBlIHNuYXBzaG90IHJlbW92YWwgc3Rh dGUgaW50byBhIGJ1bmNoIG9mIGJvb2xzLgorCisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJl Q29udHJvbGxlcjo6d2lsbENvbW1pdFBvc3RTd2lwZVRyYW5zaXRpb25MYXllclRyZWUpOgorICAg ICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnNldFJlbmRlclRyZWVTaXplKToK KyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpyZW1vdmVTd2lwZVNuYXBz aG90SWZSZWFkeSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVt b3ZlU3dpcGVTbmFwc2hvdCk6CisgICAgICAgIFVuaWZ5IHRoZSBzbmFwc2hvdCByZW1vdmFsIGxv Z2ljIGludG8gb25lIGZ1bmN0aW9uOyByZW1vdmVTd2lwZVNuYXBzaG90SWZSZWFkeQorICAgICAg ICBjb21wbGV0ZWx5IG93bnMgdGhlIGRlY2lzaW9uLiBGb3Igbm93LCB3ZSdyZSB3YWl0aW5nIGZv ciBldmVyeXRoaW5nLCBidXQKKyAgICAgICAgd2UgY2FuIGRvIGJldHRlciBpbiB0aGUgZnV0dXJl ICh1c2luZyBmaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgbGlrZSBNYWMgdXNlZCB0bykuCisK KyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpkaWRSZXN0b3JlU2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmRpZEZp bmlzaExvYWRGb3JNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRy b2xsZXI6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUpOgorICAgICAgICAo V2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXJG aXJlZCk6CisgICAgICAgIEFkZCBtb3JlIGNvbmRpdGlvbnMgZm9yIHN3aXBlIHNuYXBzaG90IHJl bW92YWwuIFdlJ2xsIG5vdyB3YWl0IGZvcgorICAgICAgICBkaWRGaW5pc2hMb2FkRm9yTWFpbkZy YW1lIChvciBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lKSwKKyAgICAgICAg Zm9yIGFjdGl2ZSBsb2FkcyB0byBmaW5pc2gsIGFuZCBmb3IgdGhlIHNjcm9sbCBwb3NpdGlvbiB0 byBiZSByZXN0b3JlZC4KKyAgICAgICAgVGhpcyBicmluZ3MgdGhlIGlPUyBpbXBsZW1lbnRhdGlv biBpbiBsaW5lIHdpdGggdGhlIHNsaWdodGx5IGJldHRlciBNYWMKKyAgICAgICAgaW1wbGVtZW50 YXRpb24sIGFuZCBhbHNvIHNldHMgdGhlIHN0YWdlIGZvciBkZWR1cGxpY2F0aW9uIG9mIGFsbCBv ZiB0aGlzIGNvZGUuCisgICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvVmlld0dlc3R1 cmVDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRy b2xsZXJNYWMubW06CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6Vmll d0dlc3R1cmVDb250cm9sbGVyKToKKwogMjAxNS0wMy0yNyAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgZG8gdGhlIENvbm5lY3Rpb246OnNldFNo b3VsZENsb3NlQ29ubmVjdGlvbk9uTWFjaEV4Y2VwdGlvbnMoKSBoYWNrIHdoZXJlIG5lY2Vzc2Fy eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCAzNjRmMjIwN2I4NzE3ZTdiZGMwYzIwNDM5NjEzM2M2MzI3MDQ0MGIxLi4zZDYxNzRkMGI1 N2YwZWQyYTU0MWE4NzgxNWU1MDNhNDk1YzdmZjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtOTA3LDcgKzkwNyw5IEBAIHN0YXRp YyBpbmxpbmUgYm9vbCBhcmVFc3NlbnRpYWxseUVxdWFsQXNGbG9hdChmbG9hdCBhLCBmbG9hdCBi KQogICAgICAgICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107CiAgICAgfQogCi0g ICAgaWYgKF9uZWVkc1RvUmVzdG9yZUV4cG9zZWRSZWN0ICYmIGxheWVyVHJlZVRyYW5zYWN0aW9u LnRyYW5zYWN0aW9uSUQoKSA+PSBfZmlyc3RUcmFuc2FjdGlvbklEQWZ0ZXJQYWdlUmVzdG9yZSkg eworICAgIGJvb2wgaXNUcmFuc2FjdGlvbkFmdGVyUGFnZVJlc3RvcmUgPSBsYXllclRyZWVUcmFu c2FjdGlvbi50cmFuc2FjdGlvbklEKCkgPj0gX2ZpcnN0VHJhbnNhY3Rpb25JREFmdGVyUGFnZVJl c3RvcmU7CisKKyAgICBpZiAoX25lZWRzVG9SZXN0b3JlRXhwb3NlZFJlY3QgJiYgaXNUcmFuc2Fj dGlvbkFmdGVyUGFnZVJlc3RvcmUpIHsKICAgICAgICAgX25lZWRzVG9SZXN0b3JlRXhwb3NlZFJl Y3QgPSBOTzsKIAogICAgICAgICBpZiAoYXJlRXNzZW50aWFsbHlFcXVhbEFzRmxvYXQoY29udGVu dFpvb21TY2FsZShzZWxmKSwgX3NjYWxlVG9SZXN0b3JlKSkgewpAQCAtOTE1LDExICs5MTcsMTIg QEAgc3RhdGljIGlubGluZSBib29sIGFyZUVzc2VudGlhbGx5RXF1YWxBc0Zsb2F0KGZsb2F0IGEs IGZsb2F0IGIpCiAgICAgICAgICAgICBleHBvc2VkUG9zaXRpb24uc2NhbGUoX3NjYWxlVG9SZXN0 b3JlLCBfc2NhbGVUb1Jlc3RvcmUpOwogCiAgICAgICAgICAgICBjaGFuZ2VDb250ZW50T2Zmc2V0 Qm91bmRlZEluVmFsaWRSYW5nZShfc2Nyb2xsVmlldy5nZXQoKSwgZXhwb3NlZFBvc2l0aW9uKTsK KyAgICAgICAgICAgIF9nZXN0dXJlQ29udHJvbGxlci0+ZGlkUmVzdG9yZVNjcm9sbFBvc2l0aW9u KCk7CiAgICAgICAgIH0KICAgICAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNd OwogICAgIH0KIAotICAgIGlmIChfbmVlZHNUb1Jlc3RvcmVVbm9ic2N1cmVkQ2VudGVyICYmIGxh eWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKSA+PSBfZmlyc3RUcmFuc2FjdGlvbklE QWZ0ZXJQYWdlUmVzdG9yZSkgeworICAgIGlmIChfbmVlZHNUb1Jlc3RvcmVVbm9ic2N1cmVkQ2Vu dGVyICYmIGlzVHJhbnNhY3Rpb25BZnRlclBhZ2VSZXN0b3JlKSB7CiAgICAgICAgIF9uZWVkc1Rv UmVzdG9yZVVub2JzY3VyZWRDZW50ZXIgPSBOTzsKIAogICAgICAgICBpZiAoYXJlRXNzZW50aWFs bHlFcXVhbEFzRmxvYXQoY29udGVudFpvb21TY2FsZShzZWxmKSwgX3NjYWxlVG9SZXN0b3JlKSkg ewpAQCAtOTMxLDYgKzkzNCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBhcmVFc3NlbnRpYWxseUVx dWFsQXNGbG9hdChmbG9hdCBhLCBmbG9hdCBiKQogICAgICAgICAgICAgdG9wTGVmdEluRG9jdW1l bnRDb29yZGluYXRlLm1vdmVCeShXZWJDb3JlOjpGbG9hdFBvaW50KC1fb2JzY3VyZWRJbnNldHMu bGVmdCwgLV9vYnNjdXJlZEluc2V0cy50b3ApKTsKIAogICAgICAgICAgICAgY2hhbmdlQ29udGVu dE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoX3Njcm9sbFZpZXcuZ2V0KCksIHRvcExlZnRJbkRv Y3VtZW50Q29vcmRpbmF0ZSk7CisgICAgICAgICAgICBfZ2VzdHVyZUNvbnRyb2xsZXItPmRpZFJl c3RvcmVTY3JvbGxQb3NpdGlvbigpOwogICAgICAgICB9CiAgICAgICAgIFtzZWxmIF91cGRhdGVW aXNpYmxlQ29udGVudFJlY3RzXTsKICAgICB9CkBAIC0xNDk2LDkgKzE1MDAsMTggQEAgc3RhdGlj IFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9h dFBvaW50IGNvbnRlbnRPZmYKICAgICAgICAgaW5TdGFibGVTdGF0ZTppc1N0YWJsZVN0YXRlIGlz Q2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHk6X2lzQ2hhbmdpbmdPYnNjdXJlZElu c2V0c0ludGVyYWN0aXZlbHldOwogfQogCistICh2b2lkKV9kaWRGaW5pc2hMb2FkRm9yTWFpbkZy YW1lCit7CisgICAgaWYgKF9nZXN0dXJlQ29udHJvbGxlcikKKyAgICAgICAgX2dlc3R1cmVDb250 cm9sbGVyLT5kaWRGaW5pc2hMb2FkRm9yTWFpbkZyYW1lKCk7Cit9CisKIC0gKHZvaWQpX2RpZFNh bWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6KFdlYktpdDo6U2FtZURvY3VtZW50TmF2 aWdhdGlvblR5cGUpbmF2aWdhdGlvblR5cGUKIHsKICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdl Yl9kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uOnRvQVBJKG5hdmlnYXRpb25UeXBlKV07CisKKyAg ICBpZiAoX2dlc3R1cmVDb250cm9sbGVyKQorICAgICAgICBfZ2VzdHVyZUNvbnRyb2xsZXItPmRp ZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUobmF2aWdhdGlvblR5cGUpOwogfQog CiAtICh2b2lkKV9rZXlib2FyZENoYW5nZWRXaXRoSW5mbzooTlNEaWN0aW9uYXJ5ICopa2V5Ym9h cmRJbmZvIGFkanVzdFNjcm9sbFZpZXc6KEJPT0wpYWRqdXN0U2Nyb2xsVmlldwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o CmluZGV4IDlmY2NjNjQ4OGU1YTBmNGJiMzlmZmFmODhlY2I1NzcxN2QyZjBhNjYuLjUwOWU4ZWIy NTBmMGZjYTE3NjU5NjhkMDRmYzQ0N2FhZmJkMGE3YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKQEAgLTkzLDYg KzkzLDcgQEAgc3RydWN0IFByaW50SW5mbzsKIAogLSAodm9pZClfdXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0czsKIAorLSAodm9pZClfZGlkRmluaXNoTG9hZEZvck1haW5GcmFtZTsKIC0gKHZvaWQp X2RpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWU6KFdlYktpdDo6U2FtZURvY3Vt ZW50TmF2aWdhdGlvblR5cGUpbmF2aWdhdGlvblR5cGU7CiAKIC0gKEJPT0wpX2lzU2hvd2luZ1Zp ZGVvT3B0aW1pemVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNs aWVudEltcGxJT1MubW0KaW5kZXggOWI1NmFhNDNkOTliZDgwNjAyNmZmZjc1ZDMwOGYwZjZjNjIw ZjNkMi4uMjgwOTE3OTI3NDJhYmY5Yjk4ZDhhZjQ3MTM2ZDUyOWY2NTVkZjlmZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCkBAIC03 MDUsNiArNzA1LDcgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0Rm9yTWFpbkZyYW1lKCkKIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkRmluaXNo TG9hZEZvck1haW5GcmFtZSgpCiB7CisgICAgW21fd2ViVmlldyBfZGlkRmluaXNoTG9hZEZvck1h aW5GcmFtZV07CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OmRpZFNhbWVEb2N1bWVudE5hdmln YXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUgbmF2aWdhdGlvblR5 cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1ZpZXdHZXN0dXJl Q29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1 cmVDb250cm9sbGVySU9TLm1tCmluZGV4IDQzNWIwMWEwMzE3MWZlZTU0MzJhMDY4ZDMxM2Q0Mzlk ODVlZGJhYjEuLjBkZWU5MzFiMjhiMjVmZTUyODVhNDcwNmU1ZDQ0Y2NiNTViZDJjYmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVy SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250 cm9sbGVySU9TLm1tCkBAIC02NCw2ICs2NCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBzdGF0aWMgY29uc3QgZmxvYXQgc3dpcGVTbmFwc2hvdFJlbW92YWxSZW5kZXJUcmVlU2l6ZVRh cmdldEZyYWN0aW9uID0gMC41Owogc3RhdGljIGNvbnN0IHN0ZDo6Y2hyb25vOjpzZWNvbmRzIHN3 aXBlU25hcHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbiA9IDNfczsKK3N0YXRpYyBjb25zdCBz dGQ6OmNocm9ubzo6bWlsbGlzZWNvbmRzIHN3aXBlU25hcHNob3RSZW1vdmFsQWN0aXZlTG9hZE1v bml0b3JpbmdJbnRlcnZhbCA9IDI1MF9tczsKIAogLy8gVGhlIGtleSBpbiB0aGlzIG1hcCBpcyB0 aGUgYXNzb2NpYXRlZCBwYWdlIElELgogc3RhdGljIEhhc2hNYXA8dWludDY0X3QsIFdlYktpdDo6 Vmlld0dlc3R1cmVDb250cm9sbGVyKj4mIHZpZXdHZXN0dXJlQ29udHJvbGxlcnNGb3JBbGxQYWdl cygpCkBAIC0xMzgsMTEgKzEzOSw4IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBWaWV3R2VzdHVy ZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJvbGxlcihXZWJQYWdlUHJveHkmIHdlYlBhZ2VQ cm94eSkKICAgICA6IG1fd2ViUGFnZVByb3h5KHdlYlBhZ2VQcm94eSkKLSAgICAsIG1fYWN0aXZl R2VzdHVyZVR5cGUoVmlld0dlc3R1cmVUeXBlOjpOb25lKQogICAgICwgbV9zd2lwZVdhdGNoZG9n VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmVmlld0dlc3R1cmVDb250cm9sbGVyOjpzd2lw ZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZpcmVkKQotICAgICwgbV9zbmFwc2hvdFJlbW92YWxUYXJn ZXRSZW5kZXJUcmVlU2l6ZSgwKQotICAgICwgbV9zaG91bGRSZW1vdmVTbmFwc2hvdFdoZW5UYXJn ZXRSZW5kZXJUcmVlU2l6ZUhpdChmYWxzZSkKLSAgICAsIG1fZ2VzdHVyZVBlbmRpbmdTbmFwc2hv dFJlbW92YWwoMCkKKyAgICAsIG1fc3dpcGVBY3RpdmVMb2FkTW9uaXRvcmluZ1RpbWVyKFJ1bkxv b3A6Om1haW4oKSwgdGhpcywgJlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YWN0aXZlTG9hZE1vbml0 b3JpbmdUaW1lckZpcmVkKQogewogICAgIHZpZXdHZXN0dXJlQ29udHJvbGxlcnNGb3JBbGxQYWdl cygpLmFkZCh3ZWJQYWdlUHJveHkucGFnZUlEKCksIHRoaXMpOwogfQpAQCAtMzAxLDYgKzI5OSwx MiBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdlYkJhY2tG b3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gdHJ1ZTsKKyAgICBt X3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQgPSB0cnVlOworICAgIG1fc3dpcGVXYWl0aW5nRm9yRGlk RmluaXNoTG9hZCA9IHRydWU7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJjZUxvYWRz ID0gdHJ1ZTsKKyAgICBtX3N3aXBlV2FpdGluZ0ZvclNjcm9sbFBvc2l0aW9uUmVzdG9yYXRpb24g PSB0cnVlOworCiAgICAgbV9zd2lwZVdhdGNoZG9nVGltZXIuc3RhcnRPbmVTaG90KHN3aXBlU25h cHNob3RSZW1vdmFsV2F0Y2hkb2dEdXJhdGlvbi5jb3VudCgpKTsKIH0KIApAQCAtMzE0LDcgKzMx OCwxMSBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6d2lsbENvbW1pdFBvc3RTd2lwZVRy YW5zaXRpb25MYXllclRyZWUoYm9vbCBzdWNjZXNzZgogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgbV9zaG91bGRSZW1vdmVTbmFwc2hvdFdoZW5UYXJnZXRSZW5kZXJUcmVlU2l6ZUhpdCA9 IHRydWU7CisgICAgaWYgKCFtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQpCisgICAgICAgIHJldHVy bjsKKworICAgIG1fc3dpcGVXYWl0aW5nRm9yUmVwYWludCA9IGZhbHNlOworICAgIHJlbW92ZVN3 aXBlU25hcHNob3RJZlJlYWR5KCk7CiB9CiAKIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpz ZXRSZW5kZXJUcmVlU2l6ZSh1aW50NjRfdCByZW5kZXJUcmVlU2l6ZSkKQEAgLTMyMiwxMSArMzMw LDY3IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjpzZXRSZW5kZXJUcmVlU2l6ZSh1aW50 NjRfdCByZW5kZXJUcmVlU2l6ZSkKICAgICBpZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAhPSBWaWV3 R2VzdHVyZVR5cGU6OlN3aXBlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fc2hvdWxk UmVtb3ZlU25hcHNob3RXaGVuVGFyZ2V0UmVuZGVyVHJlZVNpemVIaXQpCisgICAgaWYgKCFtX3N3 aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoIW1fc25hcHNob3RSZW1vdmFsVGFyZ2V0UmVuZGVyVHJlZVNpemUgfHwgcmVuZGVy VHJlZVNpemUgPiBtX3NuYXBzaG90UmVtb3ZhbFRhcmdldFJlbmRlclRyZWVTaXplKQotICAgICAg ICByZW1vdmVTd2lwZVNuYXBzaG90KCk7CisgICAgaWYgKCFtX3NuYXBzaG90UmVtb3ZhbFRhcmdl dFJlbmRlclRyZWVTaXplIHx8IHJlbmRlclRyZWVTaXplID4gbV9zbmFwc2hvdFJlbW92YWxUYXJn ZXRSZW5kZXJUcmVlU2l6ZSkgeworICAgICAgICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVT aXplVGhyZXNob2xkID0gZmFsc2U7CisgICAgICAgIHJlbW92ZVN3aXBlU25hcHNob3RJZlJlYWR5 KCk7CisgICAgfQorfQorCit2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkUmVzdG9yZVNj cm9sbFBvc2l0aW9uKCkKK3sKKyAgICBpZiAobV9hY3RpdmVHZXN0dXJlVHlwZSAhPSBWaWV3R2Vz dHVyZVR5cGU6OlN3aXBlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIW1fc3dpcGVXYWl0 aW5nRm9yU2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbikKKyAgICAgICAgcmV0dXJuOworCisgICAg bV9zd2lwZVdhaXRpbmdGb3JTY3JvbGxQb3NpdGlvblJlc3RvcmF0aW9uID0gZmFsc2U7CisgICAg cmVtb3ZlU3dpcGVTbmFwc2hvdElmUmVhZHkoKTsKK30KKwordm9pZCBWaWV3R2VzdHVyZUNvbnRy b2xsZXI6OmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKQoreworICAgIGlmIChtX2FjdGl2ZUdl c3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUpCisgICAgICAgIHJldHVybjsKKwor ICAgIGlmICghbV9zd2lwZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkKQorICAgICAgICByZXR1cm47 CisKKyAgICBtX3N3aXBlV2FpdGluZ0ZvckRpZEZpbmlzaExvYWQgPSBmYWxzZTsKKworICAgIGlm IChtX3dlYlBhZ2VQcm94eS5wYWdlTG9hZFN0YXRlKCkuaXNMb2FkaW5nKCkpIHsKKyAgICAgICAg bV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXIuc3RhcnRSZXBlYXRpbmcoc3dpcGVTbmFw c2hvdFJlbW92YWxBY3RpdmVMb2FkTW9uaXRvcmluZ0ludGVydmFsKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIG1fc3dpcGVXYWl0aW5nRm9yU3VicmVzb3VyY2VMb2FkcyA9IGZhbHNl OworICAgIHJlbW92ZVN3aXBlU25hcHNob3RJZlJlYWR5KCk7Cit9CisKK3ZvaWQgVmlld0dlc3R1 cmVDb250cm9sbGVyOjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yTWFpbkZyYW1lKFNhbWVE b2N1bWVudE5hdmlnYXRpb25UeXBlIHR5cGUpCit7CisgICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5 cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8g VGhpcyBpcyBuZWFybHkgZXF1aXZhbGVudCB0byBkaWRGaW5pc2hMb2FkIGluIHRoZSBzYW1lIGRv Y3VtZW50IG5hdmlnYXRpb24gY2FzZS4KKyAgICBtX3N3aXBlV2FpdGluZ0ZvckRpZEZpbmlzaExv YWQgPSBmYWxzZTsKKworICAgIGlmICh0eXBlICE9IFNhbWVEb2N1bWVudE5hdmlnYXRpb25TZXNz aW9uU3RhdGVSZXBsYWNlICYmIHR5cGUgIT0gU2FtZURvY3VtZW50TmF2aWdhdGlvblNlc3Npb25T dGF0ZVBvcCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9y aW5nVGltZXIuc3RhcnRSZXBlYXRpbmcoc3dpcGVTbmFwc2hvdFJlbW92YWxBY3RpdmVMb2FkTW9u aXRvcmluZ0ludGVydmFsKTsKK30KKwordm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmFjdGl2 ZUxvYWRNb25pdG9yaW5nVGltZXJGaXJlZCgpCit7CisgICAgaWYgKG1fd2ViUGFnZVByb3h5LnBh Z2VMb2FkU3RhdGUoKS5pc0xvYWRpbmcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zd2lw ZVdhaXRpbmdGb3JTdWJyZXNvdXJjZUxvYWRzID0gZmFsc2U7CisgICAgcmVtb3ZlU3dpcGVTbmFw c2hvdElmUmVhZHkoKTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25h cHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQoKQpAQCAtMzM0LDExICszOTgsMjQgQEAgdm9pZCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQoKQogICAg IHJlbW92ZVN3aXBlU25hcHNob3QoKTsKIH0KIAordm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6 OnJlbW92ZVN3aXBlU25hcHNob3RJZlJlYWR5KCkKK3sKKyAgICBpZiAobV9zd2lwZVdhaXRpbmdG b3JSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZCB8fCBtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQgfHwg bV9zd2lwZVdhaXRpbmdGb3JEaWRGaW5pc2hMb2FkIHx8IG1fc3dpcGVXYWl0aW5nRm9yU3VicmVz b3VyY2VMb2FkcyB8fCBtX3N3aXBlV2FpdGluZ0ZvclNjcm9sbFBvc2l0aW9uUmVzdG9yYXRpb24p CisgICAgICAgIHJldHVybjsKKworICAgIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKK30KKwogdm9p ZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3QoKQogewotICAgIG1f c2hvdWxkUmVtb3ZlU25hcHNob3RXaGVuVGFyZ2V0UmVuZGVyVHJlZVNpemVIaXQgPSBmYWxzZTsK KyAgICBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkID0gZmFsc2U7Cisg ICAgbV9zd2lwZVdhaXRpbmdGb3JSZXBhaW50ID0gZmFsc2U7CisgICAgbV9zd2lwZVdhaXRpbmdG b3JEaWRGaW5pc2hMb2FkID0gZmFsc2U7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJj ZUxvYWRzID0gZmFsc2U7CisgICAgbV9zd2lwZVdhaXRpbmdGb3JTY3JvbGxQb3NpdGlvblJlc3Rv cmF0aW9uID0gZmFsc2U7CiAKICAgICBtX3N3aXBlV2F0Y2hkb2dUaW1lci5zdG9wKCk7CisgICAg bV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXIuc3RvcCgpOwogCiAgICAgaWYgKG1fYWN0 aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKICAgICAgICAgcmV0dXJu OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNv bnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250 cm9sbGVyLmgKaW5kZXggN2YzNzljNzNhMzNmYzc3NGU5YWUxMjI0N2ZiOGQ3Y2JmNTcxZWRmYy4u ZjQ4NDg2Mjg3NGNjNTZjZDc3ZGE3ODkzYWQwZDZkMWI0ODdjMDJjNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCkBAIC0x MDksOCArMTA5LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2hvdWxkSWdub3JlUGlubmVkU3Rh dGUoYm9vbCBpZ25vcmUpIHsgbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZSA9IGlnbm9yZTsgfQog CiAgICAgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JNYWluRnJhbWUoKTsK LSAgICB2b2lkIGRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsKLSAgICB2b2lkIGRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUoU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUp OwogI2Vsc2UKICAgICB2b2lkIGluc3RhbGxTd2lwZUhhbmRsZXIoVUlWaWV3ICpnZXN0dXJlUmVj b2duaXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1ZpZXcpOwogICAgIHZvaWQgc2V0QWx0ZXJuYXRl QmFja0ZvcndhcmRMaXN0U291cmNlVmlldyhXS1dlYlZpZXcgKik7CkBAIC0xMTksMTUgKzExNywx OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBlbmRTd2lwZUdlc3R1cmUoV2ViQmFja0ZvcndhcmRMaXN0 SXRlbSogdGFyZ2V0SXRlbSwgX1VJVmlld0NvbnRyb2xsZXJUcmFuc2l0aW9uQ29udGV4dCAqLCBi b29sIGNhbmNlbGxlZCk7CiAgICAgdm9pZCB3aWxsQ29tbWl0UG9zdFN3aXBlVHJhbnNpdGlvbkxh eWVyVHJlZShib29sKTsKICAgICB2b2lkIHNldFJlbmRlclRyZWVTaXplKHVpbnQ2NF90KTsKKyAg ICB2b2lkIGRpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOwogI2VuZGlmCiAKKyAgICB2b2lkIGRp ZEZpbmlzaExvYWRGb3JNYWluRnJhbWUoKTsKICAgICB2b2lkIHJlbW92ZVN3aXBlU25hcHNob3Qo KTsKKyAgICB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JNYWluRnJhbWUoU2FtZURv Y3VtZW50TmF2aWdhdGlvblR5cGUpOwogCiBwcml2YXRlOgogICAgIC8vIElQQzo6TWVzc2FnZVJl Y2VpdmVyLgogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rp b24mLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIHN3aXBlU25h cHNob3RXYXRjaGRvZ1RpbWVyRmlyZWQoKTsKKyAgICB2b2lkIGFjdGl2ZUxvYWRNb25pdG9yaW5n VGltZXJGaXJlZCgpOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIC8vIE1lc3NhZ2UgaGFuZGxl cnMuCkBAIC0xMzUsNyArMTM3LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZENvbGxlY3RHZW9t ZXRyeUZvclNtYXJ0TWFnbmlmaWNhdGlvbkdlc3R1cmUoV2ViQ29yZTo6RmxvYXRQb2ludCBvcmln aW4sIFdlYkNvcmU6OkZsb2F0UmVjdCByZW5kZXJSZWN0LCBXZWJDb3JlOjpGbG9hdFJlY3Qgdmlz aWJsZUNvbnRlbnRCb3VuZHMsIGJvb2wgaXNSZXBsYWNlZEVsZW1lbnQsIGRvdWJsZSB2aWV3cG9y dE1pbmltdW1TY2FsZSwgZG91YmxlIHZpZXdwb3J0TWF4aW11bVNjYWxlKTsKICAgICB2b2lkIGRp ZEhpdFJlbmRlclRyZWVTaXplVGhyZXNob2xkKCk7CiAgICAgdm9pZCByZW1vdmVTd2lwZVNuYXBz aG90QWZ0ZXJSZXBhaW50KCk7Ci0gICAgdm9pZCBhY3RpdmVMb2FkTW9uaXRvcmluZ1RpbWVyRmly ZWQoKTsKIAogICAgIHZvaWQgZW5kTWFnbmlmaWNhdGlvbkdlc3R1cmUoKTsKICAgICBXZWJDb3Jl OjpGbG9hdFBvaW50IHNjYWxlZE1hZ25pZmljYXRpb25PcmlnaW4oV2ViQ29yZTo6RmxvYXRQb2lu dCBvcmlnaW4sIGRvdWJsZSBzY2FsZSk7CkBAIC0xNTIsNjcgKzE1Myw3MSBAQCBwcml2YXRlOgog ICAgIENBTGF5ZXIgKmRldGVybWluZUxheWVyQWRqYWNlbnRUb1NuYXBzaG90Rm9yUGFyZW50KFN3 aXBlRGlyZWN0aW9uLCBDQUxheWVyICpzbmFwc2hvdExheWVyUGFyZW50KSBjb25zdDsKICAgICB2 b2lkIGFwcGx5RGVidWdnaW5nUHJvcGVydGllc1RvU3dpcGVWaWV3cygpOwogICAgIHZvaWQgZGlk TW92ZVN3aXBlU25hcHNob3RMYXllcigpOworI2Vsc2UKKyAgICB2b2lkIHJlbW92ZVN3aXBlU25h cHNob3RJZlJlYWR5KCk7CiAjZW5kaWYKIAogICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQYWdlUHJv eHk7Ci0gICAgVmlld0dlc3R1cmVUeXBlIG1fYWN0aXZlR2VzdHVyZVR5cGU7CisgICAgVmlld0dl c3R1cmVUeXBlIG1fYWN0aXZlR2VzdHVyZVR5cGUgeyBWaWV3R2VzdHVyZVR5cGU6Ok5vbmUgfTsK IAogICAgIFJ1bkxvb3A6OlRpbWVyPFZpZXdHZXN0dXJlQ29udHJvbGxlcj4gbV9zd2lwZVdhdGNo ZG9nVGltZXI7CisgICAgUnVuTG9vcDo6VGltZXI8Vmlld0dlc3R1cmVDb250cm9sbGVyPiBtX3N3 aXBlQWN0aXZlTG9hZE1vbml0b3JpbmdUaW1lcjsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBS ZWZQdHI8Vmlld1NuYXBzaG90PiBtX2N1cnJlbnRTd2lwZVNuYXBzaG90OwogCiAgICAgUnVuTG9v cDo6VGltZXI8Vmlld0dlc3R1cmVDb250cm9sbGVyPiBtX3N3aXBlV2F0Y2hkb2dBZnRlckZpcnN0 VmlzdWFsbHlOb25FbXB0eUxheW91dFRpbWVyOwotICAgIFJ1bkxvb3A6OlRpbWVyPFZpZXdHZXN0 dXJlQ29udHJvbGxlcj4gbV9zd2lwZUFjdGl2ZUxvYWRNb25pdG9yaW5nVGltZXI7CiAKICAgICBk b3VibGUgbV9tYWduaWZpY2F0aW9uOwogICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgbV9tYWduaWZp Y2F0aW9uT3JpZ2luOwogCiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IG1fbGFzdFNtYXJ0TWFnbmlm aWNhdGlvblVuc2NhbGVkVGFyZ2V0UmVjdDsKLSAgICBib29sIG1fbGFzdE1hZ25pZmljYXRpb25H ZXN0dXJlV2FzU21hcnRNYWduaWZpY2F0aW9uOworICAgIGJvb2wgbV9sYXN0TWFnbmlmaWNhdGlv bkdlc3R1cmVXYXNTbWFydE1hZ25pZmljYXRpb24geyBmYWxzZSB9OwogICAgIFdlYkNvcmU6OkZs b2F0UG9pbnQgbV9sYXN0U21hcnRNYWduaWZpY2F0aW9uT3JpZ2luOwogCiAgICAgV2ViQ29yZTo6 RmxvYXRSZWN0IG1fdmlzaWJsZUNvbnRlbnRSZWN0OwotICAgIGJvb2wgbV92aXNpYmxlQ29udGVu dFJlY3RJc1ZhbGlkOwotICAgIGJvb2wgbV9mcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVy ZTsKKyAgICBib29sIG1fdmlzaWJsZUNvbnRlbnRSZWN0SXNWYWxpZCB7IGZhbHNlIH07CisgICAg Ym9vbCBtX2ZyYW1lSGFuZGxlc01hZ25pZmljYXRpb25HZXN0dXJlIHsgZmFsc2UgfTsKIAogICAg IFJldGFpblB0cjxXS1N3aXBlQ2FuY2VsbGF0aW9uVHJhY2tlcj4gbV9zd2lwZUNhbmNlbGxhdGlv blRyYWNrZXI7CiAgICAgUmV0YWluUHRyPENBTGF5ZXI+IG1fc3dpcGVMYXllcjsKICAgICBSZXRh aW5QdHI8Q0FMYXllcj4gbV9zd2lwZVNuYXBzaG90TGF5ZXI7CiAgICAgVmVjdG9yPFJldGFpblB0 cjxDQUxheWVyPj4gbV9jdXJyZW50U3dpcGVMaXZlTGF5ZXJzOwogCi0gICAgU3dpcGVUcmFuc2l0 aW9uU3R5bGUgbV9zd2lwZVRyYW5zaXRpb25TdHlsZTsKKyAgICBTd2lwZVRyYW5zaXRpb25TdHls ZSBtX3N3aXBlVHJhbnNpdGlvblN0eWxlIHsgU3dpcGVUcmFuc2l0aW9uU3R5bGU6Ok92ZXJsYXAg fTsKICAgICBWZWN0b3I8UmV0YWluUHRyPE5TVmlldz4+IG1fY3VzdG9tU3dpcGVWaWV3czsKLSAg ICBmbG9hdCBtX2N1c3RvbVN3aXBlVmlld3NUb3BDb250ZW50SW5zZXQ7CisgICAgZmxvYXQgbV9j dXN0b21Td2lwZVZpZXdzVG9wQ29udGVudEluc2V0IHsgMCB9OwogICAgIFdlYkNvcmU6OkZsb2F0 UmVjdCBtX2N1cnJlbnRTd2lwZUN1c3RvbVZpZXdCb3VuZHM7CiAKICAgICAvLyBJZiB3ZSBuZWVk IHRvIHdhaXQgZm9yIGNvbnRlbnQgdG8gZGVjaWRlIGlmIGl0IGlzIGdvaW5nIHRvIGNvbnN1bWUK ICAgICAvLyB0aGUgc2Nyb2xsIGV2ZW50IHRoYXQgd291bGQgaGF2ZSBzdGFydGVkIGEgc3dpcGUs IHdlJ2xsIGZpbGwgdGhlc2UgaW4uCi0gICAgUGVuZGluZ1N3aXBlUmVhc29uIG1fcGVuZGluZ1N3 aXBlUmVhc29uOworICAgIFBlbmRpbmdTd2lwZVJlYXNvbiBtX3BlbmRpbmdTd2lwZVJlYXNvbiB7 IFBlbmRpbmdTd2lwZVJlYXNvbjo6Tm9uZSB9OwogICAgIFN3aXBlRGlyZWN0aW9uIG1fcGVuZGlu Z1N3aXBlRGlyZWN0aW9uOwogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2N1bXVsYXRpdmVEZWx0 YUZvclBlbmRpbmdTd2lwZTsKIAotICAgIHZvaWQgKF5tX2RpZE1vdmVTd2lwZVNuYXBzaG90Q2Fs bGJhY2spKENHUmVjdCk7CisgICAgdm9pZCAoXm1fZGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFj aykoQ0dSZWN0KSB7IG51bGxwdHIgfTsKIAotICAgIGJvb2wgbV9zaG91bGRJZ25vcmVQaW5uZWRT dGF0ZTsKLQotICAgIGJvb2wgbV9zd2lwZVdhaXRpbmdGb3JWaXN1YWxseU5vbkVtcHR5TGF5b3V0 OwotICAgIGJvb2wgbV9zd2lwZVdhaXRpbmdGb3JSZW5kZXJUcmVlU2l6ZVRocmVzaG9sZDsKLSAg ICBib29sIG1fc3dpcGVXYWl0aW5nRm9yUmVwYWludDsKLSAgICBib29sIG1fc3dpcGVJblByb2dy ZXNzOworICAgIGJvb2wgbV9zaG91bGRJZ25vcmVQaW5uZWRTdGF0ZSB7IGZhbHNlIH07CisgICAg Ym9vbCBtX3N3aXBlSW5Qcm9ncmVzcyB7IGZhbHNlIH07CiAjZWxzZSAgICAKLSAgICBVSVZpZXcg Km1fbGl2ZVN3aXBlVmlldzsKKyAgICBVSVZpZXcgKm1fbGl2ZVN3aXBlVmlldyB7IG51bGxwdHIg fTsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBtX2xpdmVTd2lwZVZpZXdDbGlwcGluZ1ZpZXc7CiAg ICAgUmV0YWluUHRyPFVJVmlldz4gbV9zbmFwc2hvdFZpZXc7CiAgICAgUmV0YWluUHRyPFVJVmll dz4gbV90cmFuc2l0aW9uQ29udGFpbmVyVmlldzsKICAgICBSZXRhaW5QdHI8V0tTd2lwZVRyYW5z aXRpb25Db250cm9sbGVyPiBtX3N3aXBlSW50ZXJhY3RpdmVUcmFuc2l0aW9uRGVsZWdhdGU7CiAg ICAgUmV0YWluUHRyPF9VSVZpZXdDb250cm9sbGVyT25lVG9PbmVUcmFuc2l0aW9uQ29udGV4dD4g bV9zd2lwZVRyYW5zaXRpb25Db250ZXh0OwotICAgIHVpbnQ2NF90IG1fc25hcHNob3RSZW1vdmFs VGFyZ2V0UmVuZGVyVHJlZVNpemU7Ci0gICAgYm9vbCBtX3Nob3VsZFJlbW92ZVNuYXBzaG90V2hl blRhcmdldFJlbmRlclRyZWVTaXplSGl0OworICAgIHVpbnQ2NF90IG1fc25hcHNob3RSZW1vdmFs VGFyZ2V0UmVuZGVyVHJlZVNpemUgeyAwIH07CiAgICAgV2Vha09iakNQdHI8V0tXZWJWaWV3PiBt X2FsdGVybmF0ZUJhY2tGb3J3YXJkTGlzdFNvdXJjZVZpZXc7CiAgICAgUmVmUHRyPFdlYlBhZ2VQ cm94eT4gbV93ZWJQYWdlUHJveHlGb3JCYWNrRm9yd2FyZExpc3RGb3JDdXJyZW50U3dpcGU7Ci0g ICAgdWludDY0X3QgbV9nZXN0dXJlUGVuZGluZ1NuYXBzaG90UmVtb3ZhbDsKKyAgICB1aW50NjRf dCBtX2dlc3R1cmVQZW5kaW5nU25hcHNob3RSZW1vdmFsIHsgMCB9OwogI2VuZGlmCisKKyAgICBi b29sIG1fc3dpcGVXYWl0aW5nRm9yVmlzdWFsbHlOb25FbXB0eUxheW91dCB7IGZhbHNlIH07Cisg ICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkIHsgZmFsc2Ug fTsKKyAgICBib29sIG1fc3dpcGVXYWl0aW5nRm9yUmVwYWludCB7IGZhbHNlIH07CisgICAgYm9v bCBtX3N3aXBlV2FpdGluZ0ZvckRpZEZpbmlzaExvYWQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9z d2lwZVdhaXRpbmdGb3JTdWJyZXNvdXJjZUxvYWRzIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc3dp cGVXYWl0aW5nRm9yU2Nyb2xsUG9zaXRpb25SZXN0b3JhdGlvbiB7IGZhbHNlIH07CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KaW5kZXggYjkyZDkzMjdkZDdkZDMw YTNiYzI3NjE4ZDBiNmQ2NjMyZThhYWRlOC4uYjU5NDVlZThjZGM1YTMyMjAzZDRhMTZiYmUwNmRl N2M2NDk3N2Q4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KQEAgLTg2LDIyICs4Niw5IEBAIG5hbWVzcGFj ZSBXZWJLaXQgewogCiBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJvbGxl cihXZWJQYWdlUHJveHkmIHdlYlBhZ2VQcm94eSkKICAgICA6IG1fd2ViUGFnZVByb3h5KHdlYlBh Z2VQcm94eSkKLSAgICAsIG1fYWN0aXZlR2VzdHVyZVR5cGUoVmlld0dlc3R1cmVUeXBlOjpOb25l KQogICAgICwgbV9zd2lwZVdhdGNoZG9nVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmVmll d0dlc3R1cmVDb250cm9sbGVyOjpzd2lwZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZpcmVkKQotICAg ICwgbV9zd2lwZVdhdGNoZG9nQWZ0ZXJGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRUaW1lcihS dW5Mb29wOjptYWluKCksIHRoaXMsICZWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnN3aXBlU25hcHNo b3RXYXRjaGRvZ1RpbWVyRmlyZWQpCiAgICAgLCBtX3N3aXBlQWN0aXZlTG9hZE1vbml0b3JpbmdU aW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmFjdGl2 ZUxvYWRNb25pdG9yaW5nVGltZXJGaXJlZCkKLSAgICAsIG1fbGFzdE1hZ25pZmljYXRpb25HZXN0 dXJlV2FzU21hcnRNYWduaWZpY2F0aW9uKGZhbHNlKQotICAgICwgbV92aXNpYmxlQ29udGVudFJl Y3RJc1ZhbGlkKGZhbHNlKQotICAgICwgbV9mcmFtZUhhbmRsZXNNYWduaWZpY2F0aW9uR2VzdHVy ZShmYWxzZSkKLSAgICAsIG1fc3dpcGVUcmFuc2l0aW9uU3R5bGUoU3dpcGVUcmFuc2l0aW9uU3R5 bGU6Ok92ZXJsYXApCi0gICAgLCBtX2N1c3RvbVN3aXBlVmlld3NUb3BDb250ZW50SW5zZXQoMCkK LSAgICAsIG1fcGVuZGluZ1N3aXBlUmVhc29uKFBlbmRpbmdTd2lwZVJlYXNvbjo6Tm9uZSkKLSAg ICAsIG1fZGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFjayhudWxscHRyKQotICAgICwgbV9zaG91 bGRJZ25vcmVQaW5uZWRTdGF0ZShmYWxzZSkKLSAgICAsIG1fc3dpcGVXYWl0aW5nRm9yVmlzdWFs bHlOb25FbXB0eUxheW91dChmYWxzZSkKLSAgICAsIG1fc3dpcGVXYWl0aW5nRm9yUmVuZGVyVHJl ZVNpemVUaHJlc2hvbGQoZmFsc2UpCi0gICAgLCBtX3N3aXBlV2FpdGluZ0ZvclJlcGFpbnQoZmFs c2UpCi0gICAgLCBtX3N3aXBlSW5Qcm9ncmVzcyhmYWxzZSkKKyAgICAsIG1fc3dpcGVXYXRjaGRv Z0FmdGVyRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0 aGlzLCAmVmlld0dlc3R1cmVDb250cm9sbGVyOjpzd2lwZVNuYXBzaG90V2F0Y2hkb2dUaW1lckZp cmVkKQogewogICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5hZGRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBt X3dlYlBhZ2VQcm94eS5wYWdlSUQoKSwgKnRoaXMpOwogfQo=