132307 2014-04-28 15:30:49 -0700 [iOS][WK2] Restore the scroll position and scale from the HistoryItem (mostly) 2014-07-24 11:50:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin simon.fraser oldest_to_newest 1004754 0 benjamin 2014-04-28 15:30:49 -0700 [iOS][WK2] Restore the scroll position and scale from the HistoryItem (mostly) 1004756 1 230328 benjamin 2014-04-28 15:37:56 -0700 Created attachment 230328 Patch 1004769 2 230328 simon.fraser 2014-04-28 16:20:16 -0700 Comment on attachment 230328 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230328&action=review > Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm:90 > + if (page && m_frame->isMainFrame() && currentItem->pageScaleFactor()) > + m_frame->page()->restorePageState(currentItem->pageScaleFactor(), currentItem->scrollPoint()); Is the currentItem->pageScaleFactor() test useful, or just trying to catch odd uninitialized cases? > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:144 > + FrameView& frameView = *m_page->mainFrame().view(); > + frameView.setScrollPosition(scrollPosition); Odd to put FrameView in a local when you only use it once. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:145 > + m_userHasChangedPageScaleFactor = true; Why? Add a comment? 1004808 3 benjamin 2014-04-28 17:49:26 -0700 (In reply to comment #2) > (From update of attachment 230328 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230328&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm:90 > > + if (page && m_frame->isMainFrame() && currentItem->pageScaleFactor()) > > + m_frame->page()->restorePageState(currentItem->pageScaleFactor(), currentItem->scrollPoint()); > > Is the currentItem->pageScaleFactor() test useful, or just trying to catch odd uninitialized cases? Zero is the default value of HistoryItem. It is a weird API, I would prefer if HistoryItem would keep a separate state to know if values have been set. Relying on the default pageScaleFactor is odd. 1004815 4 230345 benjamin 2014-04-28 18:20:27 -0700 Created attachment 230345 Patch 1004821 5 benjamin 2014-04-28 18:31:12 -0700 Committed r167916: <http://trac.webkit.org/changeset/167916> 1004824 6 230345 benjamin 2014-04-28 18:31:57 -0700 Comment on attachment 230345 Patch Uploaded this again by accident. 1024539 7 simon.fraser 2014-07-24 11:50:05 -0700 <rdar://problem/16031704> 230328 2014-04-28 15:37:56 -0700 2014-04-28 18:20:24 -0700 Patch bug-132307-20140428153733.patch text/plain 12691 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjNTMxNzk3YTM1N2Jk MGE0NGI0ZTJhYTkyYjdjZTI3OTEyOWY4Yy4uYTBiMDA3NGVkMmZjNTM5ODdhOGM4NjM4OTQ0MGY2 ODc3NmE1MThiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE0LTA0LTI4ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g UmVzdG9yZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFuZCBzY2FsZSBmcm9tIHRoZSBIaXN0b3J5SXRl bSAobW9zdGx5KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMyMzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxNC0wNC0yNCAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gSW1wbGVtZW50IFdlYlF1aWNrTG9va0hhbmRsZUNs aWVudCBmb3IgV2ViS2l0MgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDI0MDU0NTA2NDE0ZWFlN2FhMTkzMWU1OWU3 ZDZhZDJiNmYyMTY1NWMuLjBiMTc2MTlmY2ZiMzIxZTY0ZWZkMTY2ZjU2MDczNTliYzYzNjhjZDkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NSBAQAorMjAxNC0wNC0yOCAgQmVuamFtaW4gUG91bGFp biAgPGJwb3VsYWluQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXVtXSzJdIFJlc3RvcmUgdGhl IHNjcm9sbCBwb3NpdGlvbiBhbmQgc2NhbGUgZnJvbSB0aGUgSGlzdG9yeUl0ZW0gKG1vc3RseSkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjMwNwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYwMzE3MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzdG9yZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFu ZCBzY2FsZSBvbiBiYWNrLWZvcndhcmQgYnkgcmVzdG9yaW5nIHRoZSB2YWx1ZXMgZnJvbSBIaXN0 b3J5SXRlbS4KKyAgICAgICAgVGhpcyBjb3ZlcnMgdGhlIGNvbW1vbiBjYXNlcywgc2VlIDxyZGFy Oi8vcHJvYmxlbS8xNjAzMTcwND4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6V2Vi S2l0OjpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1l XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRl cm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAg ICBHZXQgcmlkIG9mIHRoZSBvbGQgY29kZSByZXN0b3JpbmcgdGhlIHNjcm9sbCBwb3NpdGlvbi4g VGhpcyBpcyBub3cgZG9uZSBieSB0aGUgV2ViUHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbToKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Y29tbWl0TGF5ZXJUcmVlKToKKyAg ICAgICAgVXBkYXRlIHRoZSBzY3JvbGxpbmcgdHJlZSBhZnRlciBpbnZva2luZyBkaWRDb21taXRM YXllclRyZWUoKSBvbiB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgIFdLQ29udGVudFZpZXcg YW5kIFdLV2ViVmlldyBzdGF0ZXMgYXJlIHVwZGF0ZWQgaW4gcmVzcG9uc2UgdG8gZGlkQ29tbWl0 TGF5ZXJUcmVlKCksIHRoZSBjb250ZW50IHNpemUKKyAgICAgICAgYW5kIHNjYWxlIGluIHBhcnRp Y3VsYXIgYXJlIHNldCB0aGVyZS4KKworICAgICAgICBBZnRlciB0aGF0LCB0aGUgY29udGVudCBz aXplL3NjYWxlIGlzIGluIHRoZSBzYW1lIHN0YXRlIGFzIHRoZSBsYXllclRyZWUgdXBkYXRlLCBh bmQgd2UgY2FuIHNjcm9sbAorICAgICAgICB0aGUgY29udGVudCBhcyBuZWVkZWQuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJGcmFtZUxvYWRlckNs aWVudElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlc3Rv cmVWaWV3U3RhdGUpOgorICAgICAgICBpT1MgV2ViS2l0MSB1c2VzIGEgY3VzdG9tIHJlc3RvcmVW aWV3U3RhdGUoKSwgZG8gdGhlIHNhbWUgZm9yIFdlYktpdDIgc2luY2UgdGhlIGdlbmVyaWMgY29k ZSBpcyAjaWZkZWZlZCBvdXQuCisgICAgICAgIFRoaXMgaXMgYWxzbyBuZWNlc3NhcnkgZm9yIHRo ZSBtYWluIGZyYW1lJ3Mgc3RhdGUgdXBkYXRlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc3RvcmVQYWdlU3RhdGUpOgorICAg ICAgICBSZXN0b3JlIHRoZSBzY2FsZSBhbmQgcG9zaXRpb24gb2YgdGhlIG1haW4gZnJhbWUuIEZv ciBub3csIHdlIGFzc3VtZSBtX3VzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yIGlzIHNldCBv dGhlcndpc2UKKyAgICAgICAgdGhlIGluaXRpYWwtc2NhbGUgd291bGQgb3ZlcnJpZGUgdGhlIHJl c3RvcmVkIHZhbHVlLiBXZSB3aWxsIG5lZWQgdG8gZml4IHRoYXQsIHRoZSB2YWx1ZSBzaG91bGQg cHJvYmFibHkgYmUgc2F2ZWQgd2l0aAorICAgICAgICB0aGUgaGlzdG9yeS4KKwogMjAxNC0wNC0y OCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFdLMiBpT1M6 IGNyYXNoIHdoZW4gaGFuZGxpbmcgYSBzeW50aGV0aWMga2V5Ym9hcmQgZXZlbnQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCmluZGV4IGI4NWQ3ODJjZjgwYTkxMzA4NjQ2M2IzYmUzY2U0ZDBkMTViODMxMzUu LjVmNzJiOWU0MTMwMDUxMDUwNmI1ZTgyOWViMjA4NWY0YjE1MTg1MDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu ZXhwLmluCkBAIC0yNjU2LDYgKzI2NTYsNyBAQCBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MzNyZWN0 Rm9yVmlld3BvcnRDb25zdHJhaW5lZE9iamVjdHNFUktOU18xMExheW91dFJlY3RFUktOUwogX19a TjdXZWJDb3JlOUZyYW1lVmlldzM1c2V0VXNlQ3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3RF YgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzM2c2NoZWR1bGVMYXllckZsdXNoQWxsb3dpbmdUaHJv dHRsaW5nRXYKIF9fWk43V2ViQ29yZTlQYWdlR3JvdXAxN3JlbW92ZVZpc2l0ZWRMaW5rRVJLTlNf M1VSTEUKK19fWk5LN1dlYkNvcmU5RnJhbWVWaWV3MTd3YXNTY3JvbGxlZEJ5VXNlckV2CiBfX1pO SzdXZWJDb3JlMTBGbG9hdFBvaW50Y3Y3Q0dQb2ludEV2CiBfX1pOSzdXZWJDb3JlMTBTY3JvbGxW aWV3MjF1bm9ic2N1cmVkQ29udGVudFJlY3RFTlNfMTRTY3JvbGxhYmxlQXJlYTM2VmlzaWJsZUNv bnRlbnRSZWN0SW5jbHVkZXNTY3JvbGxiYXJzRQogX19aTks3V2ViQ29yZTE0RG9jdW1lbnRMb2Fk ZXIxNnJlc3BvbnNlTUlNRVR5cGVFdgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQppbmRleCAzNjZjYTY4NGJhYjY1NTg0YTIxYzczZWFlMGY0NWJk ZDAyOTI3YTFmLi4wNGY1NGM3Y2ZkNzEwMDE0MjBjYWU0ZjJiNjU4ZjU1MzFlOTRiMDdlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAt OTcsNyArOTcsNiBAQAogICAgIFJldGFpblB0cjxXS1Njcm9sbFZpZXc+IF9zY3JvbGxWaWV3Owog ICAgIFJldGFpblB0cjxXS0NvbnRlbnRWaWV3PiBfY29udGVudFZpZXc7CiAKLSAgICBCT09MIF9p c1dhaXRpbmdGb3JOZXdMYXllclRyZWVBZnRlckRpZENvbW1pdExvYWQ7CiAgICAgQk9PTCBfaGFz U3RhdGljTWluaW11bUxheW91dFNpemU7CiAgICAgQ0dTaXplIF9taW5pbXVtTGF5b3V0U2l6ZU92 ZXJyaWRlOwogICAgIENHU2l6ZSBfbWluaW11bUxheW91dFNpemVPdmVycmlkZUZvck1pbmltYWxV STsKQEAgLTQxMCwxMSArNDA5LDYgQEAKICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9zZXRD b250ZW50UHJvdmlkZXJEYXRhOmRhdGEgc3VnZ2VzdGVkRmlsZW5hbWU6c3VnZ2VzdGVkRmlsZW5h bWVdOwogfQogCi0tICh2b2lkKV9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lCi17Ci0gICAgX2lz V2FpdGluZ0Zvck5ld0xheWVyVHJlZUFmdGVyRGlkQ29tbWl0TG9hZCA9IFlFUzsKLX0KLQogLy8g VGhpcyBpcyBhIGNvbnZlbmllbmNlIG1ldGhvZCB0aGF0IHdpbGwgY29udmVydCBfcGFnZS0+cGFn ZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkgZnJvbSBhIFdlYkNvcmU6OkNvbG9yIHRvIGEgVUlD b2xvciAqLgogLSAoVUlDb2xvciAqKXBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcgogewpAQCAt NDY5LDE2ICs0NjMsMTEgQEAgc3RhdGljIENHRmxvYXQgY29udGVudFpvb21TY2FsZShXS1dlYlZp ZXcqIHdlYlZpZXcpCiAgICAgW19zY3JvbGxWaWV3IHNldFpvb21FbmFibGVkOmxheWVyVHJlZVRy YW5zYWN0aW9uLmFsbG93c1VzZXJTY2FsaW5nKCldOwogICAgIGlmICghbGF5ZXJUcmVlVHJhbnNh Y3Rpb24uc2NhbGVXYXNTZXRCeVVJUHJvY2VzcygpICYmICFbX3Njcm9sbFZpZXcgaXNab29taW5n XSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSAmJiAhW19zY3JvbGxWaWV3IF9pc0Fu aW1hdGluZ1pvb21dKQogICAgICAgICBbX3Njcm9sbFZpZXcgc2V0Wm9vbVNjYWxlOmxheWVyVHJl ZVRyYW5zYWN0aW9uLnBhZ2VTY2FsZUZhY3RvcigpXTsKLSAgICAKKwogICAgIFtzZWxmIF91cGRh dGVTY3JvbGxWaWV3QmFja2dyb3VuZF07CiAKICAgICBpZiAoX2dlc3R1cmVDb250cm9sbGVyKQog ICAgICAgICBfZ2VzdHVyZUNvbnRyb2xsZXItPnNldFJlbmRlclRyZWVTaXplKGxheWVyVHJlZVRy YW5zYWN0aW9uLnJlbmRlclRyZWVTaXplKCkpOwotCi0gICAgaWYgKF9pc1dhaXRpbmdGb3JOZXdM YXllclRyZWVBZnRlckRpZENvbW1pdExvYWQpIHsKLSAgICAgICAgW19zY3JvbGxWaWV3IHNldENv bnRlbnRPZmZzZXQ6Q0dQb2ludE1ha2UoLV9vYnNjdXJlZEluc2V0cy5sZWZ0LCAtX29ic2N1cmVk SW5zZXRzLnRvcCldOwotICAgICAgICBfaXNXYWl0aW5nRm9yTmV3TGF5ZXJUcmVlQWZ0ZXJEaWRD b21taXRMb2FkID0gTk87Ci0gICAgfQogfQogCiAtICh2b2lkKV9keW5hbWljVmlld3BvcnRVcGRh dGVDaGFuZ2VkVGFyZ2V0VG9TY2FsZTooZG91YmxlKW5ld1NjYWxlIHBvc2l0aW9uOihDR1BvaW50 KW5ld1Njcm9sbFBvc2l0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKaW5kZXggNWNmOTFlMjQ3M2UwYmVjYzgyZDU4 YWM2ZDllN2Q5M2RjNWYwM2E1ZS4uNWU2NjlmYTlhZGU3Mzk0ZWM3ZGVlMWJmN2RkMThmYjZmMjc2 MTRhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3SW50ZXJuYWwuaApAQCAtNTcsNyArNTcsNiBAQCBjbGFzcyBXZWJQYWdlUHJveHk7 CiB9CiAKICNpZiBQTEFURk9STShJT1MpCi0tICh2b2lkKV9kaWRDb21taXRMb2FkRm9yTWFpbkZy YW1lOwogLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxh eWVyVHJlZVRyYW5zYWN0aW9uJilsYXllclRyZWVUcmFuc2FjdGlvbjsKIAogLSAodm9pZClfZHlu YW1pY1ZpZXdwb3J0VXBkYXRlQ2hhbmdlZFRhcmdldFRvU2NhbGU6KGRvdWJsZSluZXdTY2FsZSBw b3NpdGlvbjooQ0dQb2ludCluZXdTY3JvbGxQb3NpdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCA4M2UxYjg1ZmY4MzcwZmZmZjk1MDg0 NDg5YTVmNmVmZWVlYTRmZjcwLi42NjczYWI4OTA4Yzg1NTE2ZGM3NDAyODFkMTg4YjUzOTlmNTYw MDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1t CkBAIC00MTIsNyArNDEyLDYgQEAgc3RhdGljIGlubGluZSBGbG9hdFJlY3QgZml4ZWRQb3NpdGlv blJlY3RGcm9tRXhwb3NlZFJlY3QoQ0dSZWN0IHVub2JzY3VyZWRSZWN0LAogCiAtICh2b2lkKV9k aWRDb21taXRMb2FkRm9yTWFpbkZyYW1lCiB7Ci0gICAgW193ZWJWaWV3IF9kaWRDb21taXRMb2Fk Rm9yTWFpbkZyYW1lXTsKICAgICBbc2VsZiBfc3RvcEFzc2lzdGluZ05vZGVdOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhUHJveHkubW0KaW5kZXggNDlmMzUyNGY1MDkwZWNmMGUxZTUwYjUyNTkw MDc2MzYzNGI1NTAxNy4uMDZjYjQ4ZDRhMWEzMGE2ODc1OGE5MmZjM2M2ZGJlYWMxMGRiMjk4OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9SZW1vdGVMYXllclRyZWVE cmF3aW5nQXJlYVByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtMTIxLDIwICsxMjEsMjEgQEAgdm9p ZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5Ojpjb21taXRMYXllclRyZWUoY29uc3Qg UmVtb3RlTGF5ZXJUcmVlVHJhbnMKICAgICBpZiAobV9yZW1vdGVMYXllclRyZWVIb3N0LnVwZGF0 ZUxheWVyVHJlZShsYXllclRyZWVUcmFuc2FjdGlvbikpCiAgICAgICAgIG1fd2ViUGFnZVByb3h5 LT5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nUm9vdExheWVyKG1fcmVtb3RlTGF5ZXJUcmVlSG9z dC5yb290TGF5ZXIoKSk7CiAKLSNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQotICAgIGJvb2wg Zml4ZWRPclN0aWNreUxheWVyQ2hhbmdlZCA9IGZhbHNlOwotICAgIG1fd2ViUGFnZVByb3h5LT5z Y3JvbGxpbmdDb29yZGluYXRvclByb3h5KCktPnVwZGF0ZVNjcm9sbGluZ1RyZWUoc2Nyb2xsaW5n VHJlZVRyYW5zYWN0aW9uLCBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKTsKLSNlbmRpZgogI2lm IFBMQVRGT1JNKElPUykKICAgICBtX3dlYlBhZ2VQcm94eS0+ZGlkQ29tbWl0TGF5ZXJUcmVlKGxh eWVyVHJlZVRyYW5zYWN0aW9uKTsKKyNlbmRpZgogCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElO RykKKyAgICBib29sIGZpeGVkT3JTdGlja3lMYXllckNoYW5nZWQgPSBmYWxzZTsKKyAgICBtX3dl YlBhZ2VQcm94eS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpLT51cGRhdGVTY3JvbGxpbmdU cmVlKHNjcm9sbGluZ1RyZWVUcmFuc2FjdGlvbiwgZml4ZWRPclN0aWNreUxheWVyQ2hhbmdlZCk7 CisKKyNpZiBQTEFURk9STShJT1MpCiAgICAgaWYgKGZpeGVkT3JTdGlja3lMYXllckNoYW5nZWQp IHsKICAgICAgICAgLy8gSWYgd2UgZ290IGEgbmV3IGxheWVyIGZvciBhIGZpeGVkIG9yIHN0aWNr eSBub2RlLCBpdHMgcG9zaXRpb24gZnJvbSB0aGUgV2ViUHJvY2VzcyBpcyBwcm9iYWJseSBzdGFs ZS4gV2UgbmVlZCB0byByZS1ydW4gdGhlICJ2aWV3cG9ydCIgY2hhbmdlZCBsb2dpYyB0byB1ZHBh dGUgaXQgd2l0aCBvdXIgVUktc2lkZSBzdGF0ZS4KICAgICAgICAgbV93ZWJQYWdlUHJveHktPnNj cm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+dmlld3BvcnRDaGFuZ2VkVmlhRGVsZWdhdGVkU2Ny b2xsaW5nKG1fd2ViUGFnZVByb3h5LT5zY3JvbGxpbmdDb29yZGluYXRvclByb3h5KCktPnJvb3RT Y3JvbGxpbmdOb2RlSUQoKSwgbV93ZWJQYWdlUHJveHktPnVub2JzY3VyZWRDb250ZW50UmVjdCgp LCBtX3dlYlBhZ2VQcm94eS0+ZGlzcGxheWVkQ29udGVudFNjYWxlKCkpOwogICAgIH0KICNlbmRp ZgotI2VuZGlmCisjZW5kaWYgLy8gRU5BQkxFKEFTWU5DX1NDUk9MTElORykKIAogICAgIHNob3dE ZWJ1Z0luZGljYXRvcihtX3dlYlBhZ2VQcm94eS0+cHJlZmVyZW5jZXMoKS50aWxlZFNjcm9sbGlu Z0luZGljYXRvclZpc2libGUoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAK aW5kZXggNzAzZjNjZTc3MjMyNzRhZTI1YzA1NWU2N2NhZTA1MTQ4YzM4YjVlZC4uZTI1OTAxMTI4 ZjI4NDM0MmY0N2FlZWQ5N2QxYzA0NGU0OWQyOWNiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5jcHAKQEAgLTExMTcsNiArMTExNyw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OnNhdmVWaWV3U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0qKQogICAgIG5vdEltcGxlbWVudGVk KCk7CiB9CiAKKyNpZiAhUExBVEZPUk0oSU9TKQogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6 cmVzdG9yZVZpZXdTdGF0ZSgpCiB7CiAgICAgLy8gSW5mb3JtIHRoZSBVSSBwcm9jZXNzIG9mIHRo ZSBzY2FsZSBmYWN0b3IuCkBAIC0xMTMxLDYgKzExMzIsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpyZXN0b3JlVmlld1N0YXRlKCkKICAgICBpZiAobV9mcmFtZSA9PSBtX2ZyYW1lLT5w YWdlKCktPm1haW5XZWJGcmFtZSgpKQogICAgICAgICBtX2ZyYW1lLT5wYWdlKCktPmRyYXdpbmdB cmVhKCktPnNldE5lZWRzRGlzcGxheSgpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OnByb3Zpc2lvbmFsTG9hZFN0YXJ0ZWQoKQogewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9pb3MvV2ViRnJhbWVMb2FkZXJDbGll bnRJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9X ZWJGcmFtZUxvYWRlckNsaWVudElPUy5tbQppbmRleCBhMDNhMmNiZDFlYzE1OTA1N2I3ODY3Nzdi MjhhYzYyMzllYjRhMGFlLi41MGMyNzAxZjdlZDA4MGYwZjE1YjI3ZjQ4YzgxOWYwMDFlMmIwNTgx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lv cy9XZWJGcmFtZUxvYWRlckNsaWVudElPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJGcmFtZUxvYWRlckNsaWVudElPUy5tbQpAQCAtMjYs NiArMjYsMTQgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViRnJhbWVMb2FkZXJD bGllbnQuaCIKIAorI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5oPgorI2ltcG9ydCA8V2ViQ29yZS9G cmFtZVZpZXcuaD4KKyNpbXBvcnQgPFdlYkNvcmUvSGlzdG9yeUNvbnRyb2xsZXIuaD4KKyNpbXBv cnQgPFdlYkNvcmUvSGlzdG9yeUl0ZW0uaD4KKyNpbXBvcnQgPFdlYkNvcmUvUGFnZS5oPgorI2lt cG9ydCA8V2ViRnJhbWUuaD4KKyNpbXBvcnQgPFdlYlBhZ2UuaD4KKwogI2lmIFBMQVRGT1JNKElP UykKIAogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgpAQCAtNzEsNiArNzksMjEg QEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkQ3JlYXRlUXVpY2tMb29rSGFuZGxlKFdl YkNvcmU6OlF1aWNrTG9va0hhbmRsZSYgaGEKIH0KICNlbmRpZgogCit2b2lkIFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpyZXN0b3JlVmlld1N0YXRlKCkKK3sKKyAgICBGcmFtZSYgZnJhbWUgPSAqbV9m cmFtZS0+Y29yZUZyYW1lKCk7CisgICAgSGlzdG9yeUl0ZW0qIGN1cnJlbnRJdGVtID0gZnJhbWUu bG9hZGVyKCkuaGlzdG9yeSgpLmN1cnJlbnRJdGVtKCk7CisgICAgaWYgKEZyYW1lVmlldyogdmll dyA9IGZyYW1lLnZpZXcoKSkgeworICAgICAgICBQYWdlKiBwYWdlID0gZnJhbWUucGFnZSgpOwor ICAgICAgICBpZiAoIXZpZXctPndhc1Njcm9sbGVkQnlVc2VyKCkpIHsKKyAgICAgICAgICAgIGlm IChwYWdlICYmIG1fZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgY3VycmVudEl0ZW0tPnBhZ2VTY2Fs ZUZhY3RvcigpKQorICAgICAgICAgICAgICAgIG1fZnJhbWUtPnBhZ2UoKS0+cmVzdG9yZVBhZ2VT dGF0ZShjdXJyZW50SXRlbS0+cGFnZVNjYWxlRmFjdG9yKCksIGN1cnJlbnRJdGVtLT5zY3JvbGxQ b2ludCgpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB2aWV3LT5zZXRTY3Jv bGxQb3NpdGlvbihjdXJyZW50SXRlbS0+c2Nyb2xsUG9pbnQoKSk7CisgICAgICAgIH0KKyAgICB9 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggNjY5Yzkx NTE0MGMyMGM5NTNjOTQ5NWY5YjllYzcxNTdiODA3ZmMzYS4uYmYyMGZkYTA3MWUwNzA1ODliYWE1 N2NiY2QzNWY3ZGIzMWMxMGUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCkBAIC00NDQsNiArNDQ0LDcgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkZs b2F0U2l6ZSBhdmFpbGFibGVTY3JlZW5TaXplKCkgY29uc3Q7CiAgICAgdm9pZCB2aWV3cG9ydFBy b3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKICAg ICB2b2lkIGRpZFJlY2VpdmVNb2JpbGVEb2NUeXBlKGJvb2wpOworICAgIHZvaWQgcmVzdG9yZVBh Z2VTdGF0ZShkb3VibGUgc2NhbGUsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBvcmlnaW4pOwog CiAgICAgZG91YmxlIG1pbmltdW1QYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICBkb3VibGUg bWF4aW11bVBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IGU1NzRkYjNiYjU3NGNh NWE5YmQ3YTQ5NDg3NDIwMDI2MzQyM2VmNmQuLjQzMDU2NmJjMTdjN2IzZjY0MWRhZGZiY2IyMmQx MDc4ZDM4NTg2NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTEzNyw2ICsxMzcsMTQgQEAgdm9pZCBXZWJQYWdlOjpk aWRSZWNlaXZlTW9iaWxlRG9jVHlwZShib29sIGlzTW9iaWxlRG9jdHlwZSkKICAgICAgICAgcmVz ZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0aW9uKG1fbWFpbkZyYW1lLmdldCgpKTsKIH0KIAor dm9pZCBXZWJQYWdlOjpyZXN0b3JlUGFnZVN0YXRlKGRvdWJsZSBzY2FsZSwgY29uc3QgSW50UG9p bnQmIHNjcm9sbFBvc2l0aW9uKQoreworICAgIHNjYWxlUGFnZShzY2FsZSwgc2Nyb2xsUG9zaXRp b24pOworICAgIEZyYW1lVmlldyYgZnJhbWVWaWV3ID0gKm1fcGFnZS0+bWFpbkZyYW1lKCkudmll dygpOworICAgIGZyYW1lVmlldy5zZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxQb3NpdGlvbik7Cisg ICAgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3RvciA9IHRydWU7Cit9CisKIGRvdWJsZSBX ZWJQYWdlOjptaW5pbXVtUGFnZVNjYWxlRmFjdG9yKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV92 aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCk7Cg== 230345 2014-04-28 18:20:27 -0700 2014-04-28 18:31:56 -0700 Patch bug-132307-20140428182004.patch text/plain 11965 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE0LTA0LTI4ICBCZW5qYW1p biBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gUmVz dG9yZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFuZCBzY2FsZSBmcm9tIHRoZSBIaXN0b3J5SXRlbSAo bW9zdGx5KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyMzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisKIDIwMTQtMDQtMjggIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFNjcm9sbGJhcnMgZG8gbm90IHVwZGF0ZSBwcm9wZXJseSB3aGVuIHRv cENvbnRlbnRJbnNldCBjaGFuZ2VzIGR5bmFtaWNhbGx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgkocmV2aXNpb24gMTY3OTE1KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdv cmtpbmcgY29weSkKQEAgLTI2NTYsNiArMjY1Niw3IEBAIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcz M3JlY3RGb3JWaWV3cG9ydEMKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXczNXNldFVzZUN1c3RvbUZp eGVkUG9zaXRpb25MYXlvdXRSZWN0RWIKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXczNnNjaGVkdWxl TGF5ZXJGbHVzaEFsbG93aW5nVGhyb3R0bGluZ0V2CiBfX1pON1dlYkNvcmU5UGFnZUdyb3VwMTdy ZW1vdmVWaXNpdGVkTGlua0VSS05TXzNVUkxFCitfX1pOSzdXZWJDb3JlOUZyYW1lVmlldzE3d2Fz U2Nyb2xsZWRCeVVzZXJFdgogX19aTks3V2ViQ29yZTEwRmxvYXRQb2ludGN2N0NHUG9pbnRFdgog X19aTks3V2ViQ29yZTEwU2Nyb2xsVmlldzIxdW5vYnNjdXJlZENvbnRlbnRSZWN0RU5TXzE0U2Ny b2xsYWJsZUFyZWEzNlZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFyc0UKIF9fWk5L N1dlYkNvcmUxNERvY3VtZW50TG9hZGVyMTZyZXNwb25zZU1JTUVUeXBlRXYKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cJKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTA0LTI4ICBCZW5qYW1pbiBQb3VsYWluICA8 YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gUmVzdG9yZSB0aGUgc2Ny b2xsIHBvc2l0aW9uIGFuZCBzY2FsZSBmcm9tIHRoZSBIaXN0b3J5SXRlbSAobW9zdGx5KQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyMzA3CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8xNjAzMTcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBGcmFzZXIuCisKKyAgICAgICAgUmVzdG9yZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFuZCBzY2Fs ZSBvbiBiYWNrLWZvcndhcmQgYnkgcmVzdG9yaW5nIHRoZSB2YWx1ZXMgZnJvbSBIaXN0b3J5SXRl bS4KKyAgICAgICAgVGhpcyBjb3ZlcnMgdGhlIGNvbW1vbiBjYXNlcywgc2VlIDxyZGFyOi8vcHJv YmxlbS8xNjAzMTcwND4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6V2ViS2l0Ojpd KToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lXSk6IERl bGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICBHZXQg cmlkIG9mIHRoZSBvbGQgY29kZSByZXN0b3JpbmcgdGhlIHNjcm9sbCBwb3NpdGlvbi4gVGhpcyBp cyBub3cgZG9uZSBieSB0aGUgV2ViUHJvY2Vzcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMv UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6Y29tbWl0TGF5ZXJUcmVlKToKKyAgICAgICAg VXBkYXRlIHRoZSBzY3JvbGxpbmcgdHJlZSBhZnRlciBpbnZva2luZyBkaWRDb21taXRMYXllclRy ZWUoKSBvbiB0aGUgV2ViUGFnZVByb3h5LgorCisgICAgICAgIFdLQ29udGVudFZpZXcgYW5kIFdL V2ViVmlldyBzdGF0ZXMgYXJlIHVwZGF0ZWQgaW4gcmVzcG9uc2UgdG8gZGlkQ29tbWl0TGF5ZXJU cmVlKCksIHRoZSBjb250ZW50IHNpemUKKyAgICAgICAgYW5kIHNjYWxlIGluIHBhcnRpY3VsYXIg YXJlIHNldCB0aGVyZS4KKworICAgICAgICBBZnRlciB0aGF0LCB0aGUgY29udGVudCBzaXplL3Nj YWxlIGlzIGluIHRoZSBzYW1lIHN0YXRlIGFzIHRoZSBsYXllclRyZWUgdXBkYXRlLCBhbmQgd2Ug Y2FuIHNjcm9sbAorICAgICAgICB0aGUgY29udGVudCBhcyBuZWVkZWQuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJGcmFtZUxvYWRlckNsaWVudElP Uy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlc3RvcmVWaWV3 U3RhdGUpOgorICAgICAgICBpT1MgV2ViS2l0MSB1c2VzIGEgY3VzdG9tIHJlc3RvcmVWaWV3U3Rh dGUoKSwgZG8gdGhlIHNhbWUgZm9yIFdlYktpdDIgc2luY2UgdGhlIGdlbmVyaWMgY29kZSBpcyAj aWZkZWZlZCBvdXQuCisgICAgICAgIFRoaXMgaXMgYWxzbyBuZWNlc3NhcnkgZm9yIHRoZSBtYWlu IGZyYW1lJ3Mgc3RhdGUgdXBkYXRlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc3RvcmVQYWdlU3RhdGUpOgorICAgICAgICBS ZXN0b3JlIHRoZSBzY2FsZSBhbmQgcG9zaXRpb24gb2YgdGhlIG1haW4gZnJhbWUuIEZvciBub3cs IHdlIGFzc3VtZSBtX3VzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yIGlzIHNldCBvdGhlcndp c2UKKyAgICAgICAgdGhlIGluaXRpYWwtc2NhbGUgd291bGQgb3ZlcnJpZGUgdGhlIHJlc3RvcmVk IHZhbHVlLiBXZSB3aWxsIG5lZWQgdG8gZml4IHRoYXQsIHRoZSB2YWx1ZSBzaG91bGQgcHJvYmFi bHkgYmUgc2F2ZWQgd2l0aAorICAgICAgICB0aGUgaGlzdG9yeS4KKwogMjAxNC0wNC0yOCAgQmVu amFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJd IGlPUyBmaXggYWZ0ZXIgcjE2Nzg2NwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC05Nyw3ICs5Nyw2IEBAIC0gKENHRmxvYXQpZ2V0VmVydGljYWxPdmVybGFwRm9yVmlldzooVUkK ICAgICBSZXRhaW5QdHI8V0tTY3JvbGxWaWV3PiBfc2Nyb2xsVmlldzsKICAgICBSZXRhaW5QdHI8 V0tDb250ZW50Vmlldz4gX2NvbnRlbnRWaWV3OwogCi0gICAgQk9PTCBfaXNXYWl0aW5nRm9yTmV3 TGF5ZXJUcmVlQWZ0ZXJEaWRDb21taXRMb2FkOwogICAgIEJPT0wgX2hhc1N0YXRpY01pbmltdW1M YXlvdXRTaXplOwogICAgIENHU2l6ZSBfbWluaW11bUxheW91dFNpemVPdmVycmlkZTsKICAgICBD R1NpemUgX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGVGb3JNaW5pbWFsVUk7CkBAIC00MTAsMTEg KzQwOSw2IEBAIC0gKHZvaWQpX2RpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tQ28KICAgICBb X2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9zZXRDb250ZW50UHJvdmlkZXJEYXRhOmRhdGEgc3VnZ2Vz dGVkRmlsZW5hbWU6c3VnZ2VzdGVkRmlsZW5hbWVdOwogfQogCi0tICh2b2lkKV9kaWRDb21taXRM b2FkRm9yTWFpbkZyYW1lCi17Ci0gICAgX2lzV2FpdGluZ0Zvck5ld0xheWVyVHJlZUFmdGVyRGlk Q29tbWl0TG9hZCA9IFlFUzsKLX0KLQogLy8gVGhpcyBpcyBhIGNvbnZlbmllbmNlIG1ldGhvZCB0 aGF0IHdpbGwgY29udmVydCBfcGFnZS0+cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkgZnJv bSBhIFdlYkNvcmU6OkNvbG9yIHRvIGEgVUlDb2xvciAqLgogLSAoVUlDb2xvciAqKXBhZ2VFeHRl bmRlZEJhY2tncm91bmRDb2xvcgogewpAQCAtNDY5LDE2ICs0NjMsMTEgQEAgLSAodm9pZClfZGlk Q29tbWl0TGF5ZXJUcmVlOihjb25zdCBXZWJLaQogICAgIFtfc2Nyb2xsVmlldyBzZXRab29tRW5h YmxlZDpsYXllclRyZWVUcmFuc2FjdGlvbi5hbGxvd3NVc2VyU2NhbGluZygpXTsKICAgICBpZiAo IWxheWVyVHJlZVRyYW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoKSAmJiAhW19zY3Jv bGxWaWV3IGlzWm9vbWluZ10gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10gJiYgIVtf c2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSkKICAgICAgICAgW19zY3JvbGxWaWV3IHNldFpv b21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKV07Ci0gICAgCisK ICAgICBbc2VsZiBfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmRdOwogCiAgICAgaWYgKF9nZXN0 dXJlQ29udHJvbGxlcikKICAgICAgICAgX2dlc3R1cmVDb250cm9sbGVyLT5zZXRSZW5kZXJUcmVl U2l6ZShsYXllclRyZWVUcmFuc2FjdGlvbi5yZW5kZXJUcmVlU2l6ZSgpKTsKLQotICAgIGlmIChf aXNXYWl0aW5nRm9yTmV3TGF5ZXJUcmVlQWZ0ZXJEaWRDb21taXRMb2FkKSB7Ci0gICAgICAgIFtf c2Nyb2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OkNHUG9pbnRNYWtlKC1fb2JzY3VyZWRJbnNldHMu bGVmdCwgLV9vYnNjdXJlZEluc2V0cy50b3ApXTsKLSAgICAgICAgX2lzV2FpdGluZ0Zvck5ld0xh eWVyVHJlZUFmdGVyRGlkQ29tbWl0TG9hZCA9IE5POwotICAgIH0KIH0KIAogLSAodm9pZClfZHlu YW1pY1ZpZXdwb3J0VXBkYXRlQ2hhbmdlZFRhcmdldFRvU2NhbGU6KGRvdWJsZSluZXdTY2FsZSBw b3NpdGlvbjooQ0dQb2ludCluZXdTY3JvbGxQb3NpdGlvbgpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAkocmV2 aXNpb24gMTY3OTE1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw3ICs1Nyw2IEBAIGNsYXNzIFdl YlBhZ2VQcm94eTsKIH0KIAogI2lmIFBMQVRGT1JNKElPUykKLS0gKHZvaWQpX2RpZENvbW1pdExv YWRGb3JNYWluRnJhbWU7CiAtICh2b2lkKV9kaWRDb21taXRMYXllclRyZWU6KGNvbnN0IFdlYktp dDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKWxheWVyVHJlZVRyYW5zYWN0aW9uOwogCiAt ICh2b2lkKV9keW5hbWljVmlld3BvcnRVcGRhdGVDaGFuZ2VkVGFyZ2V0VG9TY2FsZTooZG91Ymxl KW5ld1NjYWxlIHBvc2l0aW9uOihDR1BvaW50KW5ld1Njcm9sbFBvc2l0aW9uOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQkocmV2aXNpb24g MTY3OTE1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1t CSh3b3JraW5nIGNvcHkpCkBAIC00MTIsNyArNDEyLDYgQEAgLSAodm9pZClfZGlkUmVsYXVuY2hQ cm9jZXNzCiAKIC0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKIHsKLSAgICBbX3dl YlZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdOwogICAgIFtzZWxmIF9zdG9wQXNzaXN0 aW5nTm9kZV07CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0JKHJldmlz aW9uIDE2NzkxNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWFQcm94eS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTIxLDIwICsxMjEsMjEg QEAgdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpjbwogICAgIGlmIChtX3Jl bW90ZUxheWVyVHJlZUhvc3QudXBkYXRlTGF5ZXJUcmVlKGxheWVyVHJlZVRyYW5zYWN0aW9uKSkK ICAgICAgICAgbV93ZWJQYWdlUHJveHktPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdSb290TGF5 ZXIobV9yZW1vdGVMYXllclRyZWVIb3N0LnJvb3RMYXllcigpKTsKIAotI2lmIEVOQUJMRShBU1lO Q19TQ1JPTExJTkcpCi0gICAgYm9vbCBmaXhlZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkID0gZmFsc2U7 Ci0gICAgbV93ZWJQYWdlUHJveHktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+dXBkYXRl U2Nyb2xsaW5nVHJlZShzY3JvbGxpbmdUcmVlVHJhbnNhY3Rpb24sIGZpeGVkT3JTdGlja3lMYXll ckNoYW5nZWQpOwotI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TKQogICAgIG1fd2ViUGFnZVByb3h5 LT5kaWRDb21taXRMYXllclRyZWUobGF5ZXJUcmVlVHJhbnNhY3Rpb24pOworI2VuZGlmCiAKICNp ZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQorICAgIGJvb2wgZml4ZWRPclN0aWNreUxheWVyQ2hh bmdlZCA9IGZhbHNlOworICAgIG1fd2ViUGFnZVByb3h5LT5zY3JvbGxpbmdDb29yZGluYXRvclBy b3h5KCktPnVwZGF0ZVNjcm9sbGluZ1RyZWUoc2Nyb2xsaW5nVHJlZVRyYW5zYWN0aW9uLCBmaXhl ZE9yU3RpY2t5TGF5ZXJDaGFuZ2VkKTsKKworI2lmIFBMQVRGT1JNKElPUykKICAgICBpZiAoZml4 ZWRPclN0aWNreUxheWVyQ2hhbmdlZCkgewogICAgICAgICAvLyBJZiB3ZSBnb3QgYSBuZXcgbGF5 ZXIgZm9yIGEgZml4ZWQgb3Igc3RpY2t5IG5vZGUsIGl0cyBwb3NpdGlvbiBmcm9tIHRoZSBXZWJQ cm9jZXNzIGlzIHByb2JhYmx5IHN0YWxlLiBXZSBuZWVkIHRvIHJlLXJ1biB0aGUgInZpZXdwb3J0 IiBjaGFuZ2VkIGxvZ2ljIHRvIHVkcGF0ZSBpdCB3aXRoIG91ciBVSS1zaWRlIHN0YXRlLgogICAg ICAgICBtX3dlYlBhZ2VQcm94eS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpLT52aWV3cG9y dENoYW5nZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcobV93ZWJQYWdlUHJveHktPnNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHkoKS0+cm9vdFNjcm9sbGluZ05vZGVJRCgpLCBtX3dlYlBhZ2VQcm94eS0+ dW5vYnNjdXJlZENvbnRlbnRSZWN0KCksIG1fd2ViUGFnZVByb3h5LT5kaXNwbGF5ZWRDb250ZW50 U2NhbGUoKSk7CiAgICAgfQogI2VuZGlmCi0jZW5kaWYKKyNlbmRpZiAvLyBFTkFCTEUoQVNZTkNf U0NST0xMSU5HKQogCiAgICAgc2hvd0RlYnVnSW5kaWNhdG9yKG1fd2ViUGFnZVByb3h5LT5wcmVm ZXJlbmNlcygpLnRpbGVkU2Nyb2xsaW5nSW5kaWNhdG9yVmlzaWJsZSgpKTsKIApJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTE3LDYgKzExMTcsNyBAQCB2b2lkIFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpzYXZlVmlld1N0YXRlCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAorI2lm ICFQTEFURk9STShJT1MpCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpyZXN0b3JlVmlld1N0 YXRlKCkKIHsKICAgICAvLyBJbmZvcm0gdGhlIFVJIHByb2Nlc3Mgb2YgdGhlIHNjYWxlIGZhY3Rv ci4KQEAgLTExMzEsNiArMTEzMiw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlc3Rv cmVWaWV3U3QKICAgICBpZiAobV9mcmFtZSA9PSBtX2ZyYW1lLT5wYWdlKCktPm1haW5XZWJGcmFt ZSgpKQogICAgICAgICBtX2ZyYW1lLT5wYWdlKCktPmRyYXdpbmdBcmVhKCktPnNldE5lZWRzRGlz cGxheSgpOwogfQorI2VuZGlmCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnByb3Zpc2lv bmFsTG9hZFN0YXJ0ZWQoKQogewpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9pb3MvV2ViRnJhbWVMb2FkZXJDbGllbnRJT1MubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9pb3MvV2ViRnJhbWVMb2Fk ZXJDbGllbnRJT1MubW0JKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvaW9zL1dlYkZyYW1lTG9hZGVyQ2xpZW50SU9TLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNiw2ICsyNiwxNCBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0 ICJXZWJGcmFtZUxvYWRlckNsaWVudC5oIgogCisjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+Cisj aW1wb3J0IDxXZWJDb3JlL0ZyYW1lVmlldy5oPgorI2ltcG9ydCA8V2ViQ29yZS9IaXN0b3J5Q29u dHJvbGxlci5oPgorI2ltcG9ydCA8V2ViQ29yZS9IaXN0b3J5SXRlbS5oPgorI2ltcG9ydCA8V2Vi Q29yZS9QYWdlLmg+CisjaW1wb3J0IDxXZWJGcmFtZS5oPgorI2ltcG9ydCA8V2ViUGFnZS5oPgor CiAjaWYgUExBVEZPUk0oSU9TKQogCiAjaW1wb3J0IDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+ CkBAIC03MSw2ICs3OSwyMSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRDcmVhdGVR dWljCiB9CiAjZW5kaWYKIAordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVzdG9yZVZpZXdT dGF0ZSgpCit7CisgICAgRnJhbWUmIGZyYW1lID0gKm1fZnJhbWUtPmNvcmVGcmFtZSgpOworICAg IEhpc3RvcnlJdGVtKiBjdXJyZW50SXRlbSA9IGZyYW1lLmxvYWRlcigpLmhpc3RvcnkoKS5jdXJy ZW50SXRlbSgpOworICAgIGlmIChGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS52aWV3KCkpIHsKKyAg ICAgICAgUGFnZSogcGFnZSA9IGZyYW1lLnBhZ2UoKTsKKyAgICAgICAgaWYgKCF2aWV3LT53YXNT Y3JvbGxlZEJ5VXNlcigpKSB7CisgICAgICAgICAgICBpZiAocGFnZSAmJiBtX2ZyYW1lLT5pc01h aW5GcmFtZSgpICYmIGN1cnJlbnRJdGVtLT5wYWdlU2NhbGVGYWN0b3IoKSkKKyAgICAgICAgICAg ICAgICBtX2ZyYW1lLT5wYWdlKCktPnJlc3RvcmVQYWdlU3RhdGUoY3VycmVudEl0ZW0tPnBhZ2VT Y2FsZUZhY3RvcigpLCBjdXJyZW50SXRlbS0+c2Nyb2xsUG9pbnQoKSk7CisgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgdmlldy0+c2V0U2Nyb2xsUG9zaXRpb24oY3VycmVudEl0ZW0t PnNjcm9sbFBvaW50KCkpOworICAgICAgICB9CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTY3OTE1KQorKysgU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAt NDQ0LDYgKzQ0NCw3IEBAIHB1YmxpYzoKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgYXZhaWxhYmxl U2NyZWVuU2l6ZSgpIGNvbnN0OwogICAgIHZvaWQgdmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdl KGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzJik7CiAgICAgdm9pZCBkaWRSZWNlaXZl TW9iaWxlRG9jVHlwZShib29sKTsKKyAgICB2b2lkIHJlc3RvcmVQYWdlU3RhdGUoZG91YmxlIHNj YWxlLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgb3JpZ2luKTsKIAogICAgIGRvdWJsZSBtaW5p bXVtUGFnZVNjYWxlRmFjdG9yKCkgY29uc3Q7CiAgICAgZG91YmxlIG1heGltdW1QYWdlU2NhbGVG YWN0b3IoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9uIDE2NzkxNSkKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTM3LDYgKzEzNywxNSBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVNb2JpbGVEb2NU eXBlKGJvCiAgICAgICAgIHJlc2V0Vmlld3BvcnREZWZhdWx0Q29uZmlndXJhdGlvbihtX21haW5G cmFtZS5nZXQoKSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6cmVzdG9yZVBhZ2VTdGF0ZShkb3VibGUg c2NhbGUsIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbikKK3sKKyAgICBzY2FsZVBhZ2Uo c2NhbGUsIHNjcm9sbFBvc2l0aW9uKTsKKyAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLnZpZXcoKS0+ c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsUG9zaXRpb24pOworCisgICAgLy8gRklYTUU6IHdlIHNo b3VsZCBnZXQgdGhlIHZhbHVlIG9mIHVzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yIGZyb20g dGhlIGhpc3RvcnkuCisgICAgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3RvciA9IHRydWU7 Cit9CisKIGRvdWJsZSBXZWJQYWdlOjptaW5pbXVtUGFnZVNjYWxlRmFjdG9yKCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCk7Cg==