103737 2012-11-30 05:52:32 -0800 CSS Device Adaptation: window.innerWidth returns wrong value if CSS viewport descriptors are applied 2012-12-03 01:23:17 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mikhail.pozdnyakov mikhail.pozdnyakov cmarcelo kenneth macpherson menard ojan tmpsantos webkit.review.bot oldest_to_newest 780051 0 176950 mikhail.pozdnyakov 2012-11-30 05:52:32 -0800 Created attachment 176950 test window.innerWidth should return valid value, when CSS viewport descriptors applied. Test is attached. 780071 1 176958 kenneth 2012-11-30 06:27:03 -0800 Created attachment 176958 Test showing it works after scrolling 780922 2 177137 mikhail.pozdnyakov 2012-12-02 04:25:58 -0800 Created attachment 177137 patch Might need splitting as it actually solves two problems: 1) initial viewport size detection in webcore 2) appropriate frame view initialization in WK2 WebPage However those fixes are very close so put them the same patch so far. 780946 3 177137 kenneth 2012-12-02 06:00:32 -0800 Comment on attachment 177137 patch View in context: https://bugs.webkit.org/attachment.cgi?id=177137&action=review > Source/WebCore/ChangeLog:10 > + descriptrors. Viewport descriptrors from new stylesheet were applied to the visibleContentRect spelling > Source/WebCore/page/FrameView.h:583 > +#if ENABLE(CSS_DEVICE_ADAPTATION) > + // Size of viewport before CSS viewport descriptors are applied. > + IntSize m_initialViewportSize; > +#endif Isn't it better to use the description from the spec? also link to the spec in the changelog > Source/WebKit2/ChangeLog:10 > + descriptrors. Viewport descriptrors from new stylesheet were applied to the visibleContentRect spelling > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1038 > contentFixedSize.scale(1 / m_page->deviceScaleFactor()); > +#if ENABLE(CSS_DEVICE_ADAPTATION) I would add a newline before this 780947 4 177137 kenneth 2012-12-02 06:01:50 -0800 Comment on attachment 177137 patch I would like some tests that uses a non-1.0 deviceScaleFactor. I think it is possible to change that in tests. 780948 5 kenneth 2012-12-02 06:02:28 -0800 Another question, doesn't this affect viewport meta as well? That would affect the ifdef's 780975 6 mikhail.pozdnyakov 2012-12-02 11:23:24 -0800 (In reply to comment #5) > Another question, doesn't this affect viewport meta as well? That would affect the ifdef's I don't think it is possible to set/unset viewport meta properties for the same doc, so not I guess 781189 7 177197 mikhail.pozdnyakov 2012-12-03 00:13:02 -0800 Created attachment 177197 patch v2 Took Kenneth feedback into consideration. 781221 8 177197 webkit.review.bot 2012-12-03 01:23:13 -0800 Comment on attachment 177197 patch v2 Clearing flags on attachment: 177197 Committed r136373: <http://trac.webkit.org/changeset/136373> 781222 9 webkit.review.bot 2012-12-03 01:23:17 -0800 All reviewed patches have been landed. Closing bug. 176950 2012-11-30 05:52:32 -0800 2012-11-30 05:52:32 -0800 test new_test.html text/html 998 mikhail.pozdnyakov PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDx0aXRsZT5DU1MgVGVzdDogd2luZG93 LmlubmVyV2lkdGggc2hvdWxkIHJldHVybiB2YWxpZCB2YWx1ZSwgd2hlbiBDU1Mgdmlld3BvcnQg ZGVzY3JpcHRvcnMgYXBwbGllZC48L3RpdGxlPgogICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl PSJNaWtoYWlsIFBvemRueWFrb3YiIGhyZWY9Im1haWx0bzptaWtoYWlsLnBvemRueWFrb3ZAaW50 ZWwuY29tIiAvPgogICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICBALXdlYmtpdC12 aWV3cG9ydCB7CiAgICAgICAgICAgIHdpZHRoOiAzMDBweDsKICAgICAgICB9CiAgICAgICAgYm9k eSB7IG1hcmdpbjogMDsgfQogICAgICAgIGh0bWwsIGJvZHksICNyZXN1bHQgeyB3aWR0aDogMTAw JTsgaGVpZ2h0OiAxMDAlOyB9CiAgICA8L3N0eWxlPgogICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiPgogICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewogICAgICAgICAgICB0 ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxE b25lKCk7CiAgICAgICAgfQoKICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKSB7CiAgICAgICAgICAg IHZhciByZXN1bHQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0Iik7CiAgICAgICAg ICAgIC8vIFNob3VsZCBiZSBlcXVhbC4KICAgICAgICAgICAgLy8gcmVzdWx0LmlubmVySFRNTCA9 IChyZXN1bHQub2Zmc2V0V2lkdGggPT0gd2luZG93LmlubmVyV2lkdGgpID8gIlBBU1MiIDogIkZB SUwiOwogICAgICAgICAgICByZXN1bHQuaW5uZXJIVE1MID0gd2luZG93LmlubmVyV2lkdGggKyAi ICIgKyByZXN1bHQub2Zmc2V0V2lkdGg7CiAgICAgICAgfQogICAgPC9zY3JpcHQ+CjwvaGVhZD4K PGJvZHkgb25sb2FkPSJvbkxvYWQoKSI+CiAgICA8ZGl2IGlkPSJyZXN1bHQiPgogICAgICAgIDwv cD4KICAgIDwvZGl2Pgo8Ym9keT4KPC9odG1sPgo= 176958 2012-11-30 06:27:03 -0800 2012-11-30 06:27:03 -0800 Test showing it works after scrolling misha.html text/html 1290 kenneth PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDx0aXRsZT5DU1MgVGVzdDogd2luZG93 LmlubmVyV2lkdGggc2hvdWxkIHJldHVybiB2YWxpZCB2YWx1ZSwgd2hlbiBDU1Mgdmlld3BvcnQg ZGVzY3JpcHRvcnMgYXBwbGllZC48L3RpdGxlPgogICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl PSJNaWtoYWlsIFBvemRueWFrb3YiIGhyZWY9Im1haWx0bzptaWtoYWlsLnBvemRueWFrb3ZAaW50 ZWwuY29tIiAvPgogICAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KICAgICAgICBALXdlYmtpdC12 aWV3cG9ydCB7CiAgICAgICAgICAgIHdpZHRoOiAzMDBweDsKICAgICAgICB9CiAgICAgICAgYm9k eSB7IG1hcmdpbjogMDsgfQogICAgICAgIGh0bWwsIGJvZHksICNyZXN1bHQgeyB3aWR0aDogMTAw JTsgaGVpZ2h0OiAxMDAlOyB9CiAgICA8L3N0eWxlPgogICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiPgogICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewogICAgICAgICAgICB0 ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxE b25lKCk7CiAgICAgICAgfQoKICAgICAgICBmdW5jdGlvbiB1cGRhdGUoKSB7CiAgICAgICAgICAg IHZhciByZXN1bHQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0Iik7CiAgICAgICAg ICAgIC8vIFNob3VsZCBiZSBlcXVhbC4KICAgICAgICAgICAgLy8gcmVzdWx0LmlubmVySFRNTCA9 IChyZXN1bHQub2Zmc2V0V2lkdGggPT0gd2luZG93LmlubmVyV2lkdGgpID8gIlBBU1MiIDogIkZB SUwiOwogICAgICAgICAgICByZXN1bHQuaW5uZXJIVE1MICA9IHdpbmRvdy5pbm5lcldpZHRoICsg IiAoaW5uZXJXaWR0aCkiCiAgICAgICAgICAgIHJlc3VsdC5pbm5lckhUTUwgKz0gIjxicj4iCiAg ICAgICAgICAgIHJlc3VsdC5pbm5lckhUTUwgKz0gcmVzdWx0Lm9mZnNldFdpZHRoICsgIiAoZGl2 KSI7CiAgICAgICAgfQoKCiAgICAgICAgZnVuY3Rpb24gbG9hZCgpIHsKICAgICAgICAgICAgZG9j dW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ2RpdicpWzBdLnN0eWxlLmhlaWdodCA9ICh3aW5k b3cuaW5uZXJIZWlnaHQgKyAxMCkgKyAncHgnCiAgICAgICAgICAgIHVwZGF0ZSgpOwogICAgICAg ICAgICB3aW5kb3cub25zY3JvbGwgPSB1cGRhdGU7CiAgICAgICAgfQogICAgPC9zY3JpcHQ+Cjwv aGVhZD4KPGJvZHkgb25sb2FkPSJsb2FkKCkiPgogICAgPGRpdiBpZD0icmVzdWx0Ij4KICAgICAg ICA8cD48L3A+CiAgICA8L2Rpdj4KPGJvZHk+CjwvaHRtbD4K 177137 2012-12-02 04:25:58 -0800 2012-12-03 00:13:02 -0800 patch bug103737 text/plain 11664 mikhail.pozdnyakov Y29tbWl0IGQxYmMxZDAxYWM2OWJkMTc2ZDgxOTFiNzFiZWYzYjYwNzA3NzEyY2QKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg U3VuIERlYyAyIDEzOjUzOjQzIDIwMTIgKzAyMDAKCiAgICBidWcxMDM3MzcKCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzVh Y2U3OC4uNzc2MWM1NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEyLTAyICBNaWtoYWls IFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIENT UyBEZXZpY2UgQWRhcHRhdGlvbjogd2luZG93LmlubmVyV2lkdGggcmV0dXJucyB3cm9uZyB2YWx1 ZSBpZiBDU1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgYXJlIGFwcGxpZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzczNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIG5ldyB0ZXN0IGNzczMvZGV2 aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3Qu aHRtbC4KKworICAgICAgICAqIGNzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNr LXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBjc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0aC1jaGVjay13aW5kb3ctaW5uZXJ3aWR0 aC1jb3JyZWN0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTExLTMwICBNaWtoYWlsIFBvemRueWFrb3Yg IDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJdIFRpbGVkQmFj a2luZ1N0b3JlOiBGcmFtZSB2aWV3IHJlLWxheW91dHMgd2l0aCB3cm9uZyBGaXhlZCBWaXNpYmxl IENvbnRlbnQgUmVjdC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0 L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRhcHQvdmlld3BvcnQtd2lkdGgtY2hlY2st d2luZG93LWlubmVyd2lkdGgtY29ycmVjdC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uYTA0MThmZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRo LWNvcnJlY3QtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK3dpbmRvdy5pbm5lcldpZHRoIHNo b3VsZCBiZSBlcXVhbCB0byAzMDAuIEdvdCAzMDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nz czMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNv cnJlY3QuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRo LWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi45YTA5ZTEyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv Y3NzMy9kZXZpY2UtYWRhcHQvdmlld3BvcnQtd2lkdGgtY2hlY2std2luZG93LWlubmVyd2lkdGgt Y29ycmVjdC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8 aGVhZD4KKyAgICA8dGl0bGU+Q1NTIFRlc3Q6IHdpbmRvdy5pbm5lcldpZHRoIHNob3VsZCByZXR1 cm4gdmFsaWQgdmFsdWUsIHdoZW4gQ1NTIHZpZXdwb3J0IGRlc2NyaXB0b3JzIGFwcGxpZWQuPC90 aXRsZT4KKyAgICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1pa2hhaWwgUG96ZG55YWtvdiIg aHJlZj0ibWFpbHRvOm1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20iIC8+CisgICAgPHN0eWxl IHR5cGU9InRleHQvY3NzIj4KKyAgICAgICAgQC13ZWJraXQtdmlld3BvcnQgeworICAgICAgICAg ICAgd2lkdGg6IDMwMHB4OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAg ICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgIGZ1bmN0aW9uIGxv YWQoKSB7CisgICAgICAgICAgICB2YXIgcmVzdWx0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InJlc3VsdCIpOworICAgICAgICAgICAgcmVzdWx0LmlubmVySFRNTCA9ICJ3aW5kb3cuaW5uZXJX aWR0aCBzaG91bGQgYmUgZXF1YWwgdG8gMzAwLiBHb3QgIjsKKyAgICAgICAgICAgIHJlc3VsdC5p bm5lckhUTUwgKz0gd2luZG93LmlubmVyV2lkdGg7CisgICAgICAgIH0KKyAgICA8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5IG9ubG9hZD0ibG9hZCgpIj4KKyAgICA8ZGl2IGlkPSJyZXN1bHQiPgor ICAgICAgICA8L3A+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODkzNzQ4MS4uYjBjODQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTEyLTAy ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisg ICAgICAgIENTUyBEZXZpY2UgQWRhcHRhdGlvbjogd2luZG93LmlubmVyV2lkdGggcmV0dXJucyB3 cm9uZyB2YWx1ZSBpZiBDU1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgYXJlIGFwcGxpZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzczNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZpZXdwb3J0U3R5bGVS ZXNvbHZlciB1c2VkIGZyYW1lIHZpZXcgdmlzaWJsZUNvbnRlbnRSZWN0IHNpemUgYXMgaW5pdGlh bCB2aWV3cG9ydCBzaXplLgorICAgICAgICBUaGlzIGhvd2V2ZXIgY2F1c2VkIGEgcHJvYmxlbSB3 aGVuIHBhZ2UgZW5hYmxlZC9kaXNhYmxlZCBDU1Mgc3R5bGVzaGVldHMsIGhhdmluZyB2aWV3cG9y dAorICAgICAgICBkZXNjcmlwdHJvcnMuIFZpZXdwb3J0IGRlc2NyaXB0cm9ycyBmcm9tIG5ldyBz dHlsZXNoZWV0IHdlcmUgYXBwbGllZCB0byB0aGUgdmlzaWJsZUNvbnRlbnRSZWN0CisgICAgICAg IGFmZmVjdGVkIGFscmVhZHkgYnkgdGhlIHZpZXdwb3J0IGRlc2NyaXB0b3JzIGZyb20gdGhlIHBy ZXZpb3VzIHN0eWxlc2hlZXQuCisKKyAgICAgICAgTmV3ICdpbml0aWFsVmlld3BvcnRTaXplJyBw cm9wZXJ0eSB3YXMgYWRkZWQgdG8gZnJhbWUgdmlldyBzbyB0aGF0IHZpZXdwb3J0IGRlc2NyaXB0 b3JzCisgICAgICAgIGNhbiBhbHdheXMgYmUgYXBwbGllZCB0byB0aGUgcmVsaWFibGUgdmlld3Bv cnQgc2l6ZS4KKworICAgICAgICBUZXN0OiBjc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0 aC1jaGVjay13aW5kb3ctaW5uZXJ3aWR0aC1jb3JyZWN0Lmh0bWwKKworICAgICAgICAqIGNzcy9W aWV3cG9ydFN0eWxlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRTdHls ZVJlc29sdmVyOjpWaWV3cG9ydFN0eWxlUmVzb2x2ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Vmll d3BvcnRTdHlsZVJlc29sdmVyOjpnZXRWaWV3cG9ydEFyZ3VtZW50VmFsdWUpOgorICAgICAgICAq IGNzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKFZpZXdwb3J0U3R5bGVSZXNv bHZlcik6CisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmluaXRpYWxWaWV3cG9ydFNpemUpOgorICAgICAg ICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAoRG9jdW1lbnQpOgorICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3Lmg6CisgICAgICAgIChGcmFtZVZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3Ojppbml0aWFsVmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmll dzo6c2V0SW5pdGlhbFZpZXdwb3J0U2l6ZSk6CisKIDIwMTItMTEtMzAgIFNpbW9uIEhhdXNtYW5u ICA8c2ltb24uaGF1c21hbm5AZGlnaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIxMzYyMjcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRT dHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2 ZXIuY3BwCmluZGV4IDQxNDhlN2MuLjRlYzk4ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9W aWV3cG9ydFN0eWxlUmVzb2x2ZXIuY3BwCkBAIC00Niw5ICs0Niw2IEBAIFZpZXdwb3J0U3R5bGVS ZXNvbHZlcjo6Vmlld3BvcnRTdHlsZVJlc29sdmVyKERvY3VtZW50KiBkb2N1bWVudCkKICAgICA6 IG1fZG9jdW1lbnQoZG9jdW1lbnQpCiB7CiAgICAgQVNTRVJUKG1fZG9jdW1lbnQpOwotCi0gICAg bV9pbml0aWFsVmlld3BvcnRTaXplLnNldFdpZHRoKG1fZG9jdW1lbnQtPnZpZXdwb3J0U2l6ZSgp LndpZHRoKCkpOwotICAgIG1faW5pdGlhbFZpZXdwb3J0U2l6ZS5zZXRIZWlnaHQobV9kb2N1bWVu dC0+dmlld3BvcnRTaXplKCkuaGVpZ2h0KCkpOwogfQogCiB2b2lkIFZpZXdwb3J0U3R5bGVSZXNv bHZlcjo6YWRkVmlld3BvcnRSdWxlKFN0eWxlUnVsZVZpZXdwb3J0KiB2aWV3cG9ydFJ1bGUpCkBA IC0xMjUsMTAgKzEyMiwxMiBAQCBmbG9hdCBWaWV3cG9ydFN0eWxlUmVzb2x2ZXI6OmdldFZpZXdw b3J0QXJndW1lbnRWYWx1ZShDU1NQcm9wZXJ0eUlEIGlkKSBjb25zdAogICAgICAgICBzd2l0Y2gg KGlkKSB7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlNYXhIZWlnaHQ6CiAgICAgICAgIGNhc2Ug Q1NTUHJvcGVydHlNaW5IZWlnaHQ6Ci0gICAgICAgICAgICByZXR1cm4gcGVyY2VudFZhbHVlICog bV9pbml0aWFsVmlld3BvcnRTaXplLmhlaWdodCgpOworICAgICAgICAgICAgQVNTRVJUKG1fZG9j dW1lbnQtPmluaXRpYWxWaWV3cG9ydFNpemUoKS5oZWlnaHQoKSA+IDApOworICAgICAgICAgICAg cmV0dXJuIHBlcmNlbnRWYWx1ZSAqIG1fZG9jdW1lbnQtPmluaXRpYWxWaWV3cG9ydFNpemUoKS5o ZWlnaHQoKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eU1heFdpZHRoOgogICAgICAgICBjYXNl IENTU1Byb3BlcnR5TWluV2lkdGg6Ci0gICAgICAgICAgICByZXR1cm4gcGVyY2VudFZhbHVlICog bV9pbml0aWFsVmlld3BvcnRTaXplLndpZHRoKCk7CisgICAgICAgICAgICBBU1NFUlQobV9kb2N1 bWVudC0+aW5pdGlhbFZpZXdwb3J0U2l6ZSgpLndpZHRoKCkgPiAwKTsKKyAgICAgICAgICAgIHJl dHVybiBwZXJjZW50VmFsdWUgKiBtX2RvY3VtZW50LT5pbml0aWFsVmlld3BvcnRTaXplKCkud2lk dGgoKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eU1heFpvb206CiAgICAgICAgIGNhc2UgQ1NT UHJvcGVydHlNaW5ab29tOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Wm9vbToKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuaAppbmRleCAwYjhmZjU3Li4zMDdlMjM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdwb3J0U3R5bGVSZXNvbHZlci5oCkBAIC02Myw4 ICs2Myw2IEBAIHByaXZhdGU6CiAKICAgICBEb2N1bWVudCogbV9kb2N1bWVudDsKICAgICBSZWZQ dHI8U3R5bGVQcm9wZXJ0eVNldD4gbV9wcm9wZXJ0eVNldDsKLQotICAgIEZsb2F0U2l6ZSBtX2lu aXRpYWxWaWV3cG9ydFNpemU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA3NTY5Njc0Li5kNjA2ZjEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKQEAgLTU2NDMsNiArNTY0MywxNSBAQCBJbnRTaXplIERvY3VtZW50Ojp2aWV3cG9ydFNp emUoKSBjb25zdAogICAgIHJldHVybiB2aWV3KCktPnZpc2libGVDb250ZW50UmVjdCgvKiBpbmNs dWRlU2Nyb2xsYmFycyAqLyB0cnVlKS5zaXplKCk7CiB9CiAKKyNpZiBFTkFCTEUoQ1NTX0RFVklD RV9BREFQVEFUSU9OKQorSW50U2l6ZSBEb2N1bWVudDo6aW5pdGlhbFZpZXdwb3J0U2l6ZSgpIGNv bnN0Cit7CisgICAgaWYgKCF2aWV3KCkpCisgICAgICAgIHJldHVybiBJbnRTaXplKCk7CisgICAg cmV0dXJuIHZpZXcoKS0+aW5pdGlhbFZpZXdwb3J0U2l6ZSgpOworfQorI2VuZGlmCisKIE5vZGUq IGV2ZW50VGFyZ2V0Tm9kZUZvckRvY3VtZW50KERvY3VtZW50KiBkb2MpCiB7CiAgICAgaWYgKCFk b2MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDRlMjY3MTYuLjhlZTc3YTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5oCkBAIC0xMTM3LDYgKzExMzcsMTAgQEAgcHVibGljOgogCiAgICAgSW50U2l6ZSB2 aWV3cG9ydFNpemUoKSBjb25zdDsKIAorI2lmIEVOQUJMRShDU1NfREVWSUNFX0FEQVBUQVRJT04p CisgICAgSW50U2l6ZSBpbml0aWFsVmlld3BvcnRTaXplKCkgY29uc3Q7CisjZW5kaWYKKwogI2lm IEVOQUJMRShMSU5LX1BSRVJFTkRFUikKICAgICBQcmVyZW5kZXJlciogcHJlcmVuZGVyZXIoKSB7 IHJldHVybiBtX3ByZXJlbmRlcmVyLmdldCgpOyB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCmluZGV4IGRhYjQ2YWUuLjc1ZjE1MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAt MzczLDYgKzM3MywxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRIYXNTb2Z0d2FyZUZpbHRlcnMo Ym9vbCBoYXNTb2Z0d2FyZUZpbHRlcnMpIHsgbV9oYXNTb2Z0d2FyZUZpbHRlcnMgPSBoYXNTb2Z0 d2FyZUZpbHRlcnM7IH0KICAgICBib29sIGhhc1NvZnR3YXJlRmlsdGVycygpIGNvbnN0IHsgcmV0 dXJuIG1faGFzU29mdHdhcmVGaWx0ZXJzOyB9CiAjZW5kaWYKKyNpZiBFTkFCTEUoQ1NTX0RFVklD RV9BREFQVEFUSU9OKQorICAgIEludFNpemUgaW5pdGlhbFZpZXdwb3J0U2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1faW5pdGlhbFZpZXdwb3J0U2l6ZTsgfQorICAgIHZvaWQgc2V0SW5pdGlhbFZpZXdw b3J0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplKSB7IG1faW5pdGlhbFZpZXdwb3J0U2l6ZSA9IHNp emU7IH0KKyNlbmRpZgogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHNjcm9sbENvbnRl bnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIHJl Y3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwpAQCAtNTczLDYgKzU3NywxMCBA QCBwcml2YXRlOgogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKICAgICBib29sIG1faGFzU29mdHdh cmVGaWx0ZXJzOwogI2VuZGlmCisjaWYgRU5BQkxFKENTU19ERVZJQ0VfQURBUFRBVElPTikKKyAg ICAvLyBTaXplIG9mIHZpZXdwb3J0IGJlZm9yZSBDU1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgYXJl IGFwcGxpZWQuCisgICAgSW50U2l6ZSBtX2luaXRpYWxWaWV3cG9ydFNpemU7CisjZW5kaWYKIH07 CiAKIGlubGluZSB2b2lkIEZyYW1lVmlldzo6aW5jcmVtZW50VmlzdWFsbHlOb25FbXB0eUNoYXJh Y3RlckNvdW50KHVuc2lnbmVkIGNvdW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDhlZTNlMGIuLmM2OGQyN2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMi0xMi0wMiAgTWlraGFpbCBQb3pkbnlh a292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KKworICAgICAgICBDU1MgRGV2aWNl IEFkYXB0YXRpb246IHdpbmRvdy5pbm5lcldpZHRoIHJldHVybnMgd3JvbmcgdmFsdWUgaWYgQ1NT IHZpZXdwb3J0IGRlc2NyaXB0b3JzIGFyZSBhcHBsaWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM3MzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWaWV3cG9ydFN0eWxlUmVzb2x2ZXIgdXNlZCBmcmFt ZSB2aWV3IHZpc2libGVDb250ZW50UmVjdCBzaXplIGFzIGluaXRpYWwgdmlld3BvcnQgc2l6ZS4K KyAgICAgICAgVGhpcyBob3dldmVyIGNhdXNlZCBhIHByb2JsZW0gd2hlbiBwYWdlIGVuYWJsZWQv ZGlzYWJsZWQgQ1NTIHN0eWxlc2hlZXRzLCBoYXZpbmcgdmlld3BvcnQKKyAgICAgICAgZGVzY3Jp cHRyb3JzLiBWaWV3cG9ydCBkZXNjcmlwdHJvcnMgZnJvbSBuZXcgc3R5bGVzaGVldCB3ZXJlIGFw cGxpZWQgdG8gdGhlIHZpc2libGVDb250ZW50UmVjdAorICAgICAgICBhZmZlY3RlZCBhbHJlYWR5 IGJ5IHRoZSB2aWV3cG9ydCBkZXNjcmlwdG9ycyBmcm9tIHRoZSBwcmV2aW91cyBzdHlsZXNoZWV0 LgorCisgICAgICAgIE5ldyAnaW5pdGlhbFZpZXdwb3J0U2l6ZScgcHJvcGVydHkgd2FzIGFkZGVk IHRvIGZyYW1lIHZpZXcgc28gdGhhdCB2aWV3cG9ydCBkZXNjcmlwdG9ycworICAgICAgICBjYW4g YWx3YXlzIGJlIGFwcGxpZWQgdG8gdGhlIHJlbGlhYmxlIHZpZXdwb3J0IHNpemUuCisKKyAgICAg ICAgQm90aCBuZXdseSBhZGRlZCAnaW5pdGlhbFZpZXdwb3J0U2l6ZScgcHJvcGVydHkgYW5kICdm aXhlZFZpc2libGVDb250ZW50UmVjdCcgcHJvcGVydHkKKyAgICAgICAgYXJlIGFzc2lnbmVkIGFw cHJvcHJpYXRlbHkgbm93IGluIFdlYlBhZ2U6OnNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2Vk KCkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OnNlbmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKToKKwogMjAx Mi0xMS0zMCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNv bT4KIAogICAgICAgICBbV0syXSBUaWxlZEJhY2tpbmdTdG9yZTogRnJhbWUgdmlldyByZS1sYXlv dXRzIHdpdGggd3JvbmcgRml4ZWQgVmlzaWJsZSBDb250ZW50IFJlY3QuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggM2UyMGM4My4uOWRmMjhk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApA QCAtMTAyNSwyMCArMTAyNSwyNyBAQCB2b2lkIFdlYlBhZ2U6OnNlbmRWaWV3cG9ydEF0dHJpYnV0 ZXNDaGFuZ2VkKCkKICAgICBpbnQgZGV2aWNlSGVpZ2h0ID0gKHNldHRpbmdzLT5kZXZpY2VIZWln aHQoKSA+IDApID8gc2V0dGluZ3MtPmRldmljZUhlaWdodCgpIDogbV92aWV3cG9ydFNpemUuaGVp Z2h0KCk7CiAKICAgICBWaWV3cG9ydEF0dHJpYnV0ZXMgYXR0ciA9IGNvbXB1dGVWaWV3cG9ydEF0 dHJpYnV0ZXMobV9wYWdlLT52aWV3cG9ydEFyZ3VtZW50cygpLCBtaW5pbXVtTGF5b3V0RmFsbGJh Y2tXaWR0aCwgZGV2aWNlV2lkdGgsIGRldmljZUhlaWdodCwgbV9wYWdlLT5kZXZpY2VTY2FsZUZh Y3RvcigpLCBtX3ZpZXdwb3J0U2l6ZSk7Ci0gICAgYXR0ci5pbml0aWFsU2NhbGUgPSBtX3BhZ2Ut PnZpZXdwb3J0QXJndW1lbnRzKCkuem9vbTsgLy8gUmVzZXRzIGF1dG8gKC0xKSBpZiBubyB2YWx1 ZSB3YXMgc2V0IGJ5IHVzZXIuCiAKICAgICAvLyBLZWVwIHRoZSBjdXJyZW50IHBvc2l0aW9uLCB1 cGRhdGUgc2l6ZSBvbmx5LgogICAgIC8vIEZvciB0aGUgbmV3IGxvYWRzIHBvc2l0aW9uIGlzIGFs cmVhZHkgcmVzZXQgdG8gKDAsMCkuCiAgICAgRnJhbWVWaWV3KiB2aWV3ID0gbV9wYWdlLT5tYWlu RnJhbWUoKS0+dmlldygpOwogICAgIEludFBvaW50IGNvbnRlbnRGaXhlZE9yaWdpbiA9IHZpZXct PmZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KCkubG9jYXRpb24oKTsKIAotICAgIC8vIFB1dCB0aGUg d2lkdGggYW5kIGhlaWdodCB0byB0aGUgdmlld3BvcnQgd2lkdGggYW5kIGhlaWdodC4gSW4gY3Nz IHVuaXRzIGhvd2V2ZXIuCi0gICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGluIHNjYWxlZCB1 bml0cyBidXQgdGhpcyBjdXJyZW50bHkgYWZmZWN0cyB2aWV3cG9ydCBhdHRyaWJ1dGVzIGNhbGN1 bGF0aW9uLgorICAgIC8vIFB1dCB0aGUgd2lkdGggYW5kIGhlaWdodCB0byB0aGUgdmlld3BvcnQg d2lkdGggYW5kIGhlaWdodC4gSW4gY3NzIHVuaXRzIGhvd2V2ZXIuICAgIAogICAgIEludFNpemUg Y29udGVudEZpeGVkU2l6ZSA9IG1fdmlld3BvcnRTaXplOworCiAgICAgY29udGVudEZpeGVkU2l6 ZS5zY2FsZSgxIC8gbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyNpZiBFTkFCTEUoQ1NT X0RFVklDRV9BREFQVEFUSU9OKQorICAgIC8vIENTUyB2aWV3cG9ydCBkZXNjcmlwdG9ycyBtaWdo dCBiZSBhcHBsaWVkIHRvIGFscmVhZHkgYWZmZWN0ZWQgdmlld3BvcnQgc2l6ZQorICAgIC8vIGlm IHRoZSBwYWdlIGVuYWJsZXMvZGlzYWJsZXMgc3R5bGVzaGVldHMsIHNvIG5lZWQgdG8ga2VlcCBp bml0aWFsIHZpZXdwb3J0IHNpemUuCisgICAgdmlldy0+c2V0SW5pdGlhbFZpZXdwb3J0U2l6ZShj b250ZW50Rml4ZWRTaXplKTsKKyNlbmRpZgogCisgICAgY29udGVudEZpeGVkU2l6ZS5zY2FsZSgx IC8gYXR0ci5pbml0aWFsU2NhbGUpOwogICAgIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KElu dFJlY3QoY29udGVudEZpeGVkT3JpZ2luLCBjb250ZW50Rml4ZWRTaXplKSk7CiAKKyAgICBhdHRy LmluaXRpYWxTY2FsZSA9IG1fcGFnZS0+dmlld3BvcnRBcmd1bWVudHMoKS56b29tOyAvLyBSZXNl dHMgYXV0byAoLTEpIGlmIG5vIHZhbHVlIHdhcyBzZXQgYnkgdXNlci4KKwogICAgIC8vIFRoaXMg YWxzbyB0YWtlcyBjYXJlIG9mIHRoZSByZWxheW91dC4KICAgICBzZXRGaXhlZExheW91dFNpemUo cm91bmRlZEludFNpemUoYXR0ci5sYXlvdXRTaXplKSk7CiAK 177197 2012-12-03 00:13:02 -0800 2012-12-03 01:23:12 -0800 patch v2 bug103737_v2 text/plain 12555 mikhail.pozdnyakov Y29tbWl0IDAxOWYzYzgxOWMwZmJmMTQyNmZhZmIzZjY5MWUzYzZlZGM5ZTNlZDMKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg U3VuIERlYyAyIDEzOjUzOjQzIDIwMTIgKzAyMDAKCiAgICBidWcxMDM3MzcKCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjJk ZTQ0Mi4uNTdlY2M0NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEyLTAyICBNaWtoYWls IFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisgICAgICAgIENT UyBEZXZpY2UgQWRhcHRhdGlvbjogd2luZG93LmlubmVyV2lkdGggcmV0dXJucyB3cm9uZyB2YWx1 ZSBpZiBDU1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgYXJlIGFwcGxpZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzczNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIG5ldyB0ZXN0IGNzczMvZGV2 aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3Qu aHRtbC4KKworICAgICAgICAqIGNzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNr LXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBjc3MzL2RldmljZS1hZGFwdC92aWV3cG9ydC13aWR0aC1jaGVjay13aW5kb3ctaW5uZXJ3aWR0 aC1jb3JyZWN0Lmh0bWw6IEFkZGVkLgorCiAyMDEyLTEyLTAyICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIGZhc3QvZm9ybXMvKi1tdWx0aXBs ZS1maWVsZHMvKi1tdWx0aXBsZS1maWVsZHMtcHJlc2VydmUtdmFsdWUtYWZ0ZXItaGlzdG9yeS1i YWNrLmh0bWwgaXMgZmxha3kKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFk YXB0L3Jlc291cmNlcy92aWV3cG9ydC13aWR0aC1jaGVjay1pbm5lci13aWR0aC5odG1sIGIvTGF5 b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRhcHQvcmVzb3VyY2VzL3ZpZXdwb3J0LXdpZHRoLWNoZWNr LWlubmVyLXdpZHRoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzEx YzMzZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3Jl c291cmNlcy92aWV3cG9ydC13aWR0aC1jaGVjay1pbm5lci13aWR0aC5odG1sCkBAIC0wLDAgKzEs MjQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGUgdHlwZT0i dGV4dC9jc3MiPgorICAgICAgICBALXdlYmtpdC12aWV3cG9ydCB7CisgICAgICAgICAgICB3aWR0 aDogMzAwcHg7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQgdHlwZT0idGV4 dC9qYXZhc2NyaXB0Ij4KKyAgICAgICAgZnVuY3Rpb24gbG9hZCgpIHsKKyAgICAgICAgICAgIHZh ciByZXN1bHQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0Iik7CisgICAgICAgICAg ICByZXN1bHQuaW5uZXJIVE1MID0gIndpbmRvdy5pbm5lcldpZHRoIHNob3VsZCBiZSBlcXVhbCB0 byAzMDAuIEdvdCAiOworICAgICAgICAgICAgcmVzdWx0LmlubmVySFRNTCArPSB3aW5kb3cuaW5u ZXJXaWR0aDsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAg ICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQorICAgIDwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJsb2FkKCkiPgorICAgIDxkaXYgaWQ9InJlc3VsdCI+Cisg ICAgICAgIDwvcD4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1p bm5lcndpZHRoLWNvcnJlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9kZXZpY2Ut YWRhcHQvdmlld3BvcnQtd2lkdGgtY2hlY2std2luZG93LWlubmVyd2lkdGgtY29ycmVjdC1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTA0MThmZAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdp ZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEgQEAKK3dpbmRvdy5pbm5lcldpZHRoIHNob3VsZCBiZSBlcXVhbCB0byAzMDAuIEdvdCAzMDAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRo LWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJlY3QuaHRtbCBiL0xheW91dFRlc3RzL2NzczMv ZGV2aWNlLWFkYXB0L3ZpZXdwb3J0LXdpZHRoLWNoZWNrLXdpbmRvdy1pbm5lcndpZHRoLWNvcnJl Y3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hM2M5M2Q5Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9kZXZpY2UtYWRhcHQvdmlld3BvcnQtd2lk dGgtY2hlY2std2luZG93LWlubmVyd2lkdGgtY29ycmVjdC5odG1sCkBAIC0wLDAgKzEsMTggQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+Q1NTIFRlc3Q6IHdp bmRvdy5pbm5lcldpZHRoIHNob3VsZCByZXR1cm4gdmFsaWQgdmFsdWUsIHdoZW4gQ1NTIHZpZXdw b3J0IGRlc2NyaXB0b3JzIGFwcGxpZWQuPC90aXRsZT4KKyAgICA8bGluayByZWw9ImF1dGhvciIg dGl0bGU9Ik1pa2hhaWwgUG96ZG55YWtvdiIgaHJlZj0ibWFpbHRvOm1pa2hhaWwucG96ZG55YWtv dkBpbnRlbC5jb20iIC8+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAg ICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVt cEFzVGV4dCgpOworICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAg ICAgICAgICB0ZXN0UnVubmVyLnNldEJhY2tpbmdTY2FsZUZhY3RvcigyLCBiYWNraW5nU2NhbGVG YWN0b3JDYWxsYmFjayk7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBiYWNraW5nU2Nh bGVGYWN0b3JDYWxsYmFjaygpIHsKKyAgICAgICAgICAgIHdpbmRvdy5sb2NhdGlvbiA9ICJyZXNv dXJjZXMvdmlld3BvcnQtd2lkdGgtY2hlY2staW5uZXItd2lkdGguaHRtbCI7CisgICAgICAgIH0K KyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYjU1ZjIzLi43 ODlmOWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTItMTItMDIgIE1pa2hhaWwg UG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CisKKyAgICAgICAgQ1NT IERldmljZSBBZGFwdGF0aW9uOiB3aW5kb3cuaW5uZXJXaWR0aCByZXR1cm5zIHdyb25nIHZhbHVl IGlmIENTUyB2aWV3cG9ydCBkZXNjcmlwdG9ycyBhcmUgYXBwbGllZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNzM3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVmlld3BvcnRTdHlsZVJlc29sdmVyIHVz ZWQgZnJhbWUgdmlldyB2aXNpYmxlQ29udGVudFJlY3Qgc2l6ZSBhcyBpbml0aWFsIHZpZXdwb3J0 IHNpemUuCisgICAgICAgIFRoaXMgaG93ZXZlciBjYXVzZWQgYSBwcm9ibGVtIHdoZW4gcGFnZSBl bmFibGVkL2Rpc2FibGVkIENTUyBzdHlsZXNoZWV0cywgaGF2aW5nIHZpZXdwb3J0CisgICAgICAg IGRlc2NyaXB0b3JzLiBWaWV3cG9ydCBkZXNjcmlwdG9ycyBmcm9tIG5ldyBzdHlsZXNoZWV0IHdl cmUgYXBwbGllZCB0byB0aGUgdmlzaWJsZUNvbnRlbnRSZWN0CisgICAgICAgIGFmZmVjdGVkIGFs cmVhZHkgYnkgdGhlIHZpZXdwb3J0IGRlc2NyaXB0b3JzIGZyb20gdGhlIHByZXZpb3VzIHN0eWxl c2hlZXQuCisKKyAgICAgICAgTmV3ICdpbml0aWFsVmlld3BvcnRTaXplJyBwcm9wZXJ0eSAoaHR0 cDovL2Rldi53My5vcmcvY3Nzd2cvY3NzLWRldmljZS1hZGFwdC8jaW5pdGlhbC12aWV3cG9ydCkK KyAgICAgICAgd2FzIGFkZGVkIHRvIGZyYW1lIHZpZXcgc28gdGhhdCB2aWV3cG9ydCBkZXNjcmlw dG9ycyBjYW4gYWx3YXlzIGJlIGFwcGxpZWQgdG8gdGhlIHJlbGlhYmxlCisgICAgICAgIHZpZXdw b3J0IHNpemUuCisKKyAgICAgICAgVGVzdDogY3NzMy9kZXZpY2UtYWRhcHQvdmlld3BvcnQtd2lk dGgtY2hlY2std2luZG93LWlubmVyd2lkdGgtY29ycmVjdC5odG1sCisKKyAgICAgICAgKiBjc3Mv Vmlld3BvcnRTdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0U3R5 bGVSZXNvbHZlcjo6Vmlld3BvcnRTdHlsZVJlc29sdmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlZp ZXdwb3J0U3R5bGVSZXNvbHZlcjo6Z2V0Vmlld3BvcnRBcmd1bWVudFZhbHVlKToKKyAgICAgICAg KiBjc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmg6CisgICAgICAgIChWaWV3cG9ydFN0eWxlUmVz b2x2ZXIpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojppbml0aWFsVmlld3BvcnRTaXplKToKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKERvY3VtZW50KToKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAoRnJhbWVWaWV3KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6aW5pdGlhbFZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnNldEluaXRpYWxWaWV3cG9ydFNpemUpOgorCiAyMDEyLTEyLTAyICBLeXVuZ1RhZSBLaW0g IDxrdGYua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIEZpeCBidWlsZCB3YXJuaW5n IGluIEdyYXBoaWNzQ29udGV4dDNERWZsLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3NzL1ZpZXdwb3J0U3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3Bv cnRTdHlsZVJlc29sdmVyLmNwcAppbmRleCA0MTQ4ZTdjLi40ZWM5OGZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmNwcApAQCAtNDYsOSArNDYsNiBAQCBW aWV3cG9ydFN0eWxlUmVzb2x2ZXI6OlZpZXdwb3J0U3R5bGVSZXNvbHZlcihEb2N1bWVudCogZG9j dW1lbnQpCiAgICAgOiBtX2RvY3VtZW50KGRvY3VtZW50KQogewogICAgIEFTU0VSVChtX2RvY3Vt ZW50KTsKLQotICAgIG1faW5pdGlhbFZpZXdwb3J0U2l6ZS5zZXRXaWR0aChtX2RvY3VtZW50LT52 aWV3cG9ydFNpemUoKS53aWR0aCgpKTsKLSAgICBtX2luaXRpYWxWaWV3cG9ydFNpemUuc2V0SGVp Z2h0KG1fZG9jdW1lbnQtPnZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpKTsKIH0KIAogdm9pZCBWaWV3 cG9ydFN0eWxlUmVzb2x2ZXI6OmFkZFZpZXdwb3J0UnVsZShTdHlsZVJ1bGVWaWV3cG9ydCogdmll d3BvcnRSdWxlKQpAQCAtMTI1LDEwICsxMjIsMTIgQEAgZmxvYXQgVmlld3BvcnRTdHlsZVJlc29s dmVyOjpnZXRWaWV3cG9ydEFyZ3VtZW50VmFsdWUoQ1NTUHJvcGVydHlJRCBpZCkgY29uc3QKICAg ICAgICAgc3dpdGNoIChpZCkgewogICAgICAgICBjYXNlIENTU1Byb3BlcnR5TWF4SGVpZ2h0Ogog ICAgICAgICBjYXNlIENTU1Byb3BlcnR5TWluSGVpZ2h0OgotICAgICAgICAgICAgcmV0dXJuIHBl cmNlbnRWYWx1ZSAqIG1faW5pdGlhbFZpZXdwb3J0U2l6ZS5oZWlnaHQoKTsKKyAgICAgICAgICAg IEFTU0VSVChtX2RvY3VtZW50LT5pbml0aWFsVmlld3BvcnRTaXplKCkuaGVpZ2h0KCkgPiAwKTsK KyAgICAgICAgICAgIHJldHVybiBwZXJjZW50VmFsdWUgKiBtX2RvY3VtZW50LT5pbml0aWFsVmll d3BvcnRTaXplKCkuaGVpZ2h0KCk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlNYXhXaWR0aDoK ICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eU1pbldpZHRoOgotICAgICAgICAgICAgcmV0dXJuIHBl cmNlbnRWYWx1ZSAqIG1faW5pdGlhbFZpZXdwb3J0U2l6ZS53aWR0aCgpOworICAgICAgICAgICAg QVNTRVJUKG1fZG9jdW1lbnQtPmluaXRpYWxWaWV3cG9ydFNpemUoKS53aWR0aCgpID4gMCk7Cisg ICAgICAgICAgICByZXR1cm4gcGVyY2VudFZhbHVlICogbV9kb2N1bWVudC0+aW5pdGlhbFZpZXdw b3J0U2l6ZSgpLndpZHRoKCk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlNYXhab29tOgogICAg ICAgICBjYXNlIENTU1Byb3BlcnR5TWluWm9vbToKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVpv b206CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVy LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmgKaW5kZXggMGI4 ZmY1Ny4uMzA3ZTIzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdwb3J0U3R5 bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2 ZXIuaApAQCAtNjMsOCArNjMsNiBAQCBwcml2YXRlOgogCiAgICAgRG9jdW1lbnQqIG1fZG9jdW1l bnQ7CiAgICAgUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+IG1fcHJvcGVydHlTZXQ7Ci0KLSAgICBG bG9hdFNpemUgbV9pbml0aWFsVmlld3BvcnRTaXplOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMjYwNDI3Ni4uMTRjOGMwNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwCkBAIC01NjU3LDYgKzU2NTcsMTUgQEAgSW50U2l6ZSBEb2N1bWVu dDo6dmlld3BvcnRTaXplKCkgY29uc3QKICAgICByZXR1cm4gdmlldygpLT52aXNpYmxlQ29udGVu dFJlY3QoLyogaW5jbHVkZVNjcm9sbGJhcnMgKi8gdHJ1ZSkuc2l6ZSgpOwogfQogCisjaWYgRU5B QkxFKENTU19ERVZJQ0VfQURBUFRBVElPTikKK0ludFNpemUgRG9jdW1lbnQ6OmluaXRpYWxWaWV3 cG9ydFNpemUoKSBjb25zdAoreworICAgIGlmICghdmlldygpKQorICAgICAgICByZXR1cm4gSW50 U2l6ZSgpOworICAgIHJldHVybiB2aWV3KCktPmluaXRpYWxWaWV3cG9ydFNpemUoKTsKK30KKyNl bmRpZgorCiBOb2RlKiBldmVudFRhcmdldE5vZGVGb3JEb2N1bWVudChEb2N1bWVudCogZG9jKQog ewogICAgIGlmICghZG9jKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCA5NWUyNWM1Li4yN2VjM2Nm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMTEzNCw2ICsxMTM0LDEwIEBAIHB1YmxpYzoKIAog ICAgIEludFNpemUgdmlld3BvcnRTaXplKCkgY29uc3Q7CiAKKyNpZiBFTkFCTEUoQ1NTX0RFVklD RV9BREFQVEFUSU9OKQorICAgIEludFNpemUgaW5pdGlhbFZpZXdwb3J0U2l6ZSgpIGNvbnN0Owor I2VuZGlmCisKICNpZiBFTkFCTEUoTElOS19QUkVSRU5ERVIpCiAgICAgUHJlcmVuZGVyZXIqIHBy ZXJlbmRlcmVyKCkgeyByZXR1cm4gbV9wcmVyZW5kZXJlci5nZXQoKTsgfQogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAppbmRleCBkYWI0NmFlLi40MmM0YzM0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKQEAgLTM3Myw2ICszNzMsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SGFzU29m dHdhcmVGaWx0ZXJzKGJvb2wgaGFzU29mdHdhcmVGaWx0ZXJzKSB7IG1faGFzU29mdHdhcmVGaWx0 ZXJzID0gaGFzU29mdHdhcmVGaWx0ZXJzOyB9CiAgICAgYm9vbCBoYXNTb2Z0d2FyZUZpbHRlcnMo KSBjb25zdCB7IHJldHVybiBtX2hhc1NvZnR3YXJlRmlsdGVyczsgfQogI2VuZGlmCisjaWYgRU5B QkxFKENTU19ERVZJQ0VfQURBUFRBVElPTikKKyAgICBJbnRTaXplIGluaXRpYWxWaWV3cG9ydFNp emUoKSBjb25zdCB7IHJldHVybiBtX2luaXRpYWxWaWV3cG9ydFNpemU7IH0KKyAgICB2b2lkIHNl dEluaXRpYWxWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkgeyBtX2luaXRpYWxWaWV3 cG9ydFNpemUgPSBzaXplOyB9CisjZW5kaWYKIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgYm9v bCBzY3JvbGxDb250ZW50c0Zhc3RQYXRoKGNvbnN0IEludFNpemUmIHNjcm9sbERlbHRhLCBjb25z dCBJbnRSZWN0JiByZWN0VG9TY3JvbGwsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KTsKQEAgLTU3 Myw2ICs1NzcsMTEgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCiAgICAgYm9v bCBtX2hhc1NvZnR3YXJlRmlsdGVyczsKICNlbmRpZgorI2lmIEVOQUJMRShDU1NfREVWSUNFX0FE QVBUQVRJT04pCisgICAgLy8gU2l6ZSBvZiB2aWV3cG9ydCBiZWZvcmUgYW55IFVBIG9yIGF1dGhv ciBzdHlsZXMgaGF2ZSBvdmVycmlkZGVuCisgICAgLy8gdGhlIHZpZXdwb3J0IGdpdmVuIGJ5IHRo ZSB3aW5kb3cgb3Igdmlld2luZyBhcmVhIG9mIHRoZSBVQS4KKyAgICBJbnRTaXplIG1faW5pdGlh bFZpZXdwb3J0U2l6ZTsKKyNlbmRpZgogfTsKIAogaW5saW5lIHZvaWQgRnJhbWVWaWV3OjppbmNy ZW1lbnRWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQodW5zaWduZWQgY291bnQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggOThjZjJjZC4uMzE1Njg3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisy MDEyLTEyLTAyICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwu Y29tPgorCisgICAgICAgIENTUyBEZXZpY2UgQWRhcHRhdGlvbjogd2luZG93LmlubmVyV2lkdGgg cmV0dXJucyB3cm9uZyB2YWx1ZSBpZiBDU1Mgdmlld3BvcnQgZGVzY3JpcHRvcnMgYXJlIGFwcGxp ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzcz NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZpZXdw b3J0U3R5bGVSZXNvbHZlciB1c2VkIGZyYW1lIHZpZXcgdmlzaWJsZUNvbnRlbnRSZWN0IHNpemUg YXMgaW5pdGlhbCB2aWV3cG9ydCBzaXplLgorICAgICAgICBUaGlzIGhvd2V2ZXIgY2F1c2VkIGEg cHJvYmxlbSB3aGVuIHBhZ2UgZW5hYmxlZC9kaXNhYmxlZCBDU1Mgc3R5bGVzaGVldHMsIGhhdmlu ZyB2aWV3cG9ydAorICAgICAgICBkZXNjcmlwdG9ycy4gVmlld3BvcnQgZGVzY3JpcHRvcnMgZnJv bSBuZXcgc3R5bGVzaGVldCB3ZXJlIGFwcGxpZWQgdG8gdGhlIHZpc2libGVDb250ZW50UmVjdAor ICAgICAgICBhZmZlY3RlZCBhbHJlYWR5IGJ5IHRoZSB2aWV3cG9ydCBkZXNjcmlwdG9ycyBmcm9t IHRoZSBwcmV2aW91cyBzdHlsZXNoZWV0LgorCisgICAgICAgIE5ldyAnaW5pdGlhbFZpZXdwb3J0 U2l6ZScgcHJvcGVydHkgKGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2Nzcy1kZXZpY2UtYWRhcHQv I2luaXRpYWwtdmlld3BvcnQpCisgICAgICAgIHdhcyBhZGRlZCB0byBmcmFtZSB2aWV3IHNvIHRo YXQgdmlld3BvcnQgZGVzY3JpcHRvcnMgY2FuIGFsd2F5cyBiZSBhcHBsaWVkIHRvIHRoZSByZWxp YWJsZQorICAgICAgICB2aWV3cG9ydCBzaXplLgorCisgICAgICAgIEJvdGggbmV3bHkgYWRkZWQg J2luaXRpYWxWaWV3cG9ydFNpemUnIHByb3BlcnR5IGFuZCAnZml4ZWRWaXNpYmxlQ29udGVudFJl Y3QnIHByb3BlcnR5CisgICAgICAgIGFyZSBhc3NpZ25lZCBhcHByb3ByaWF0ZWx5IG5vdyBpbiBX ZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCgpLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpz ZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZCk6CisKIDIwMTItMTItMDIgIEJyZW50IEZ1bGdo YW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5kb3dzLCBXaW5DYWlyb10g UmV2aXNlIGV4cG9ydCBkZWZpbml0aW9ucyB0byBtYXRjaCBtYWMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNDQxYjE0ZC4uNzI1YjA4YiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt MTAyOSw3ICsxMDI5LDYgQEAgdm9pZCBXZWJQYWdlOjpzZW5kVmlld3BvcnRBdHRyaWJ1dGVzQ2hh bmdlZCgpCiAgICAgaW50IGRldmljZUhlaWdodCA9IChzZXR0aW5ncy0+ZGV2aWNlSGVpZ2h0KCkg PiAwKSA/IHNldHRpbmdzLT5kZXZpY2VIZWlnaHQoKSA6IG1fdmlld3BvcnRTaXplLmhlaWdodCgp OwogCiAgICAgVmlld3BvcnRBdHRyaWJ1dGVzIGF0dHIgPSBjb21wdXRlVmlld3BvcnRBdHRyaWJ1 dGVzKG1fcGFnZS0+dmlld3BvcnRBcmd1bWVudHMoKSwgbWluaW11bUxheW91dEZhbGxiYWNrV2lk dGgsIGRldmljZVdpZHRoLCBkZXZpY2VIZWlnaHQsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3Io KSwgbV92aWV3cG9ydFNpemUpOwotICAgIGF0dHIuaW5pdGlhbFNjYWxlID0gbV9wYWdlLT52aWV3 cG9ydEFyZ3VtZW50cygpLnpvb207IC8vIFJlc2V0cyBhdXRvICgtMSkgaWYgbm8gdmFsdWUgd2Fz IHNldCBieSB1c2VyLgogCiAgICAgLy8gS2VlcCB0aGUgY3VycmVudCBwb3NpdGlvbiwgdXBkYXRl IHNpemUgb25seS4KICAgICAvLyBGb3IgdGhlIG5ldyBsb2FkcyBwb3NpdGlvbiBpcyBhbHJlYWR5 IHJlc2V0IHRvICgwLDApLgpAQCAtMTAzNywxMiArMTAzNiwyMSBAQCB2b2lkIFdlYlBhZ2U6OnNl bmRWaWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKCkKICAgICBJbnRQb2ludCBjb250ZW50Rml4ZWRP cmlnaW4gPSB2aWV3LT5maXhlZFZpc2libGVDb250ZW50UmVjdCgpLmxvY2F0aW9uKCk7CiAKICAg ICAvLyBQdXQgdGhlIHdpZHRoIGFuZCBoZWlnaHQgdG8gdGhlIHZpZXdwb3J0IHdpZHRoIGFuZCBo ZWlnaHQuIEluIGNzcyB1bml0cyBob3dldmVyLgotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBi ZSBpbiBzY2FsZWQgdW5pdHMgYnV0IHRoaXMgY3VycmVudGx5IGFmZmVjdHMgdmlld3BvcnQgYXR0 cmlidXRlcyBjYWxjdWxhdGlvbi4KICAgICBJbnRTaXplIGNvbnRlbnRGaXhlZFNpemUgPSBtX3Zp ZXdwb3J0U2l6ZTsKKwogICAgIGNvbnRlbnRGaXhlZFNpemUuc2NhbGUoMSAvIG1fcGFnZS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSk7CiAKKyNpZiBFTkFCTEUoQ1NTX0RFVklDRV9BREFQVEFUSU9OKQor ICAgIC8vIENTUyB2aWV3cG9ydCBkZXNjcmlwdG9ycyBtaWdodCBiZSBhcHBsaWVkIHRvIGFscmVh ZHkgYWZmZWN0ZWQgdmlld3BvcnQgc2l6ZQorICAgIC8vIGlmIHRoZSBwYWdlIGVuYWJsZXMvZGlz YWJsZXMgc3R5bGVzaGVldHMsIHNvIG5lZWQgdG8ga2VlcCBpbml0aWFsIHZpZXdwb3J0IHNpemUu CisgICAgdmlldy0+c2V0SW5pdGlhbFZpZXdwb3J0U2l6ZShjb250ZW50Rml4ZWRTaXplKTsKKyNl bmRpZgorCisgICAgY29udGVudEZpeGVkU2l6ZS5zY2FsZSgxIC8gYXR0ci5pbml0aWFsU2NhbGUp OwogICAgIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KEludFJlY3QoY29udGVudEZpeGVkT3Jp Z2luLCBjb250ZW50Rml4ZWRTaXplKSk7CiAKKyAgICBhdHRyLmluaXRpYWxTY2FsZSA9IG1fcGFn ZS0+dmlld3BvcnRBcmd1bWVudHMoKS56b29tOyAvLyBSZXNldHMgYXV0byAoLTEpIGlmIG5vIHZh bHVlIHdhcyBzZXQgYnkgdXNlci4KKwogICAgIC8vIFRoaXMgYWxzbyB0YWtlcyBjYXJlIG9mIHRo ZSByZWxheW91dC4KICAgICBzZXRGaXhlZExheW91dFNpemUocm91bmRlZEludFNpemUoYXR0ci5s YXlvdXRTaXplKSk7CiAK