88531 2012-06-07 06:37:29 -0700 [Qt][WK2] Fix custom device pixel ratio propagation and add QML API tests 2012-08-24 06:50:27 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88870 1 ahf abecsi abecsi cmarcelo jturcotte kenneth menard ossy webkit.review.bot zoltan oldest_to_newest 643498 0 ahf 2012-06-07 06:37:29 -0700 SSIA. 643501 1 146278 ahf 2012-06-07 06:43:47 -0700 Created attachment 146278 Patch 643505 2 146278 kenneth 2012-06-07 06:51:17 -0700 Comment on attachment 146278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146278&action=review > Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml:32 > + webView.experimental.devicePixelRatio = 0.2 Why not just use 2.0 > Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml:35 > + webView.experimental.evaluateJavaScript( Why no test for the media query? > Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml:36 > + "(function() { return window.devicePixelRatio })()", isnt this called webkitDevicePixelRatio? 643546 3 146288 ahf 2012-06-07 07:36:28 -0700 Created attachment 146288 Patch 644552 4 ossy 2012-06-08 03:49:01 -0700 Landed in http://trac.webkit.org/changeset/119723, but there are two failing API tests: XPASS : qmltests::DevicePixelRatio::test_devicePixelRatio() '' returned TRUE unexpectedly. () Loc: [/home/webkitbuildbot/slaves/release64bitWebKit2_EC2/buildslave/qt-linux-64-release-webkit2/build/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml(33)] XPASS : qmltests::DevicePixelRatio::test_devicePixelRatioMediaQuery() '' returned TRUE unexpectedly. () Loc: [/home/webkitbuildbot/slaves/release64bitWebKit2_EC2/buildslave/qt-linux-64-release-webkit2/build/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml(51)] Could you check it, please? 652472 5 ossy 2012-06-19 08:36:34 -0700 The patch landed, so we should close it ... But don't forget that it is incorrect - https://bugs.webkit.org/show_bug.cgi?id=88870 682826 6 ossy 2012-07-31 01:43:31 -0700 (In reply to comment #5) > The patch landed, so we should close it ... But don't forget that it is incorrect - https://bugs.webkit.org/show_bug.cgi?id=88870 Guys, please answer and don't ignore this bug ... 689434 7 ossy 2012-08-07 14:54:24 -0700 Reopen, because it was rolled out by http://trac.webkit.org/changeset/124923. See https://bugs.webkit.org/show_bug.cgi?id=88870 for details. 703191 8 160203 abecsi 2012-08-23 11:36:50 -0700 Created attachment 160203 proposed patch 703200 9 160203 kenneth 2012-08-23 11:44:42 -0700 Comment on attachment 160203 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=160203&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:803 > + // Set the custom device pixel ratio requested from QML > + // as soon as the content item has a valid size. > + webPageProxy->setCustomDeviceScaleFactor(m_customDevicePixelRatio); It ignores it if not? Why does it do that? 703324 10 abecsi 2012-08-23 13:52:46 -0700 (In reply to comment #9) > (From update of attachment 160203 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=160203&action=review > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:803 > > + // Set the custom device pixel ratio requested from QML > > + // as soon as the content item has a valid size. > > + webPageProxy->setCustomDeviceScaleFactor(m_customDevicePixelRatio); > > It ignores it if not? Why does it do that? The DrawingAreaProxy returns early if the page size is empty and the time when the experimental property is set the QML page item has no valid size yet thus the information does not reach the web process. 703344 11 kenneth 2012-08-23 14:06:28 -0700 (In reply to comment #10) > (In reply to comment #9) > > (From update of attachment 160203 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=160203&action=review > > > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:803 > > > + // Set the custom device pixel ratio requested from QML > > > + // as soon as the content item has a valid size. > > > + webPageProxy->setCustomDeviceScaleFactor(m_customDevicePixelRatio); > > > > It ignores it if not? Why does it do that? > > The DrawingAreaProxy returns early if the page size is empty and the time when the experimental property is set the QML page item has no valid size yet thus the information does not reach the web process. I think that comment there would be quite valuable. 703980 12 160392 abecsi 2012-08-24 04:24:45 -0700 Created attachment 160392 proposed patch With additional comment explaining the issue. 704073 13 160392 abecsi 2012-08-24 06:50:22 -0700 Comment on attachment 160392 proposed patch Clearing flags on attachment: 160392 Committed r126582: <http://trac.webkit.org/changeset/126582> 704074 14 abecsi 2012-08-24 06:50:27 -0700 All reviewed patches have been landed. Closing bug. 146278 2012-06-07 06:43:47 -0700 2012-06-07 07:36:19 -0700 Patch bug-88531-20120607154345.patch text/plain 2541 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2MwZDkyMWFlNmIyZGQz YWM2ZDMwM2MxMzM2MGU4M2NmMzQ0MTMyZS4uZDI2ODJkMTEwNmJjNWNmMjFhOTczYTIxNDAwZDY0 MWY5NjAwYzAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTA3ICBBbGV4 YW5kZXIgRsOmcsO4eSAgPGFoZkAweDkwLmRrPgorCisgICAgICAgIEFkZCBRTUwgQVBJIHRlc3Rz IGZvciBEZXZpY2UgUGl4ZWwgUmF0aW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4NTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGFuIGluaXRpYWwgdGVzdCBjYXNlIGZvciB0 aGUgUU1MIGRldmljZSBwaXhlbCByYXRpbworICAgICAgICBBUEkuIFRoZSB0ZXN0IGN1cnJlbnRs eSBmYWlscyBhbmQgaXMgdGhlcmVmb3JlIG1hcmtlZCBhcyBiZWluZworICAgICAgICBleHBlY3Rl ZCB0byBmYWlsLiBUaGlzIHdpbGwgYmUgZml4ZWQgaW4gYSBzZXBhcmF0ZWQgcGF0Y2guCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2Rldmlj ZVBpeGVsUmF0aW8ucW1sOiBBZGRlZC4KKwogMjAxMi0wNi0wNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQSSB0byByZWdp c3RlciBjdXN0b20gVVJJIHNjaGVtZXMgdG8gV2ViS2l0MiBHVEsrIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3Rz dF9kZXZpY2VQaXhlbFJhdGlvLnFtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMTUyODA3ZTViZmJlYzJmMzk1M2YwMDJjMGM3M2YyOWRjZmQwOTMwZgotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2Vi Vmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKQEAgLTAsMCArMSw0NiBAQAoraW1wb3J0IFF0 UXVpY2sgMi4wCitpbXBvcnQgUXRUZXN0IDEuMAoraW1wb3J0IFF0V2ViS2l0IDMuMAoraW1wb3J0 IFF0V2ViS2l0LmV4cGVyaW1lbnRhbCAxLjAKK2ltcG9ydCAiLi4vY29tbW9uIgorCitJdGVtIHsK KyAgICBUZXN0V2ViVmlldyB7CisgICAgICAgIGlkOiB3ZWJWaWV3CisgICAgICAgIHByb3BlcnR5 IHZhcmlhbnQgbGFzdFJlc3VsdAorICAgIH0KKworICAgIFNpZ25hbFNweSB7CisgICAgICAgIGlk OiByZXN1bHRTcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3CisgICAgICAgIHNpZ25hbE5hbWU6 ICJsYXN0UmVzdWx0Q2hhbmdlZCIKKyAgICB9CisKKyAgICBUZXN0Q2FzZSB7CisgICAgICAgIG5h bWU6ICJEZXZpY2VQaXhlbFJhdGlvIgorCisgICAgICAgIGZ1bmN0aW9uIGluaXQoKSB7CisgICAg ICAgICAgICByZXN1bHRTcHkuY2xlYXIoKQorICAgICAgICAgICAgd2ViVmlldy5sYXN0UmVzdWx0 ID0gbnVsbAorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdF9kZXZpY2VQaXhlbFJh dGlvKCkgeworICAgICAgICAgICAgZXhwZWN0RmFpbCgiIiwgIlRoaXMgY3VycmVudGx5IGZhaWxz IHNpbmNlIHdpbmRvdy5kZXZpY2VQaXhlbFJhdGlvIGRvZXNuJ3QgcmV0dXJuIHRoZSB1cGRhdGVk IHZhbHVlLiIpCisKKyAgICAgICAgICAgIHJlc3VsdFNweS5jbGVhcigpCisgICAgICAgICAgICB3 ZWJWaWV3LnVybCA9ICJhYm91dDpibGFuayIKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVu dGFsLmRldmljZVBpeGVsUmF0aW8gPSAwLjIKKyAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3Lndh aXRGb3JMb2FkU3VjY2VlZGVkKCkpCisKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVudGFs LmV2YWx1YXRlSmF2YVNjcmlwdCgKKyAgICAgICAgICAgICAgICAiKGZ1bmN0aW9uKCkgeyByZXR1 cm4gd2luZG93LmRldmljZVBpeGVsUmF0aW8gfSkoKSIsCisgICAgICAgICAgICAgICAgZnVuY3Rp b24ocmVzdWx0KSB7CisgICAgICAgICAgICAgICAgICAgIHdlYlZpZXcubGFzdFJlc3VsdCA9IHJl c3VsdAorICAgICAgICAgICAgICAgIH0pCisKKyAgICAgICAgICAgIHJlc3VsdFNweS53YWl0KCkK KyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy5sYXN0UmVzdWx0LCAwLjIpCisgICAgICAgICAg ICBjb21wYXJlKHdlYlZpZXcubGFzdFJlc3VsdCwgd2ViVmlldy5leHBlcmltZW50YWwuZGV2aWNl UGl4ZWxSYXRpbykKKyAgICAgICAgfQorICAgIH0KK30K 146288 2012-06-07 07:36:28 -0700 2012-08-23 11:36:50 -0700 Patch bug-88531-20120607163626.patch text/plain 3251 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2MwZDkyMWFlNmIyZGQz YWM2ZDMwM2MxMzM2MGU4M2NmMzQ0MTMyZS4uZDI2ODJkMTEwNmJjNWNmMjFhOTczYTIxNDAwZDY0 MWY5NjAwYzAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTA3ICBBbGV4 YW5kZXIgRsOmcsO4eSAgPGFoZkAweDkwLmRrPgorCisgICAgICAgIEFkZCBRTUwgQVBJIHRlc3Rz IGZvciBEZXZpY2UgUGl4ZWwgUmF0aW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg4NTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGFuIGluaXRpYWwgdGVzdCBjYXNlIGZvciB0 aGUgUU1MIGRldmljZSBwaXhlbCByYXRpbworICAgICAgICBBUEkuIFRoZSB0ZXN0IGN1cnJlbnRs eSBmYWlscyBhbmQgaXMgdGhlcmVmb3JlIG1hcmtlZCBhcyBiZWluZworICAgICAgICBleHBlY3Rl ZCB0byBmYWlsLiBUaGlzIHdpbGwgYmUgZml4ZWQgaW4gYSBzZXBhcmF0ZWQgcGF0Y2guCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2Rldmlj ZVBpeGVsUmF0aW8ucW1sOiBBZGRlZC4KKwogMjAxMi0wNi0wNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQSSB0byByZWdp c3RlciBjdXN0b20gVVJJIHNjaGVtZXMgdG8gV2ViS2l0MiBHVEsrIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3Rz dF9kZXZpY2VQaXhlbFJhdGlvLnFtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uNjQzYzcyMWRhYmM5MTc5OTBiMzA1OWE2NmM5ZmFjMDJiMTU3YTA5OAotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2Vi Vmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKQEAgLTAsMCArMSw2MyBAQAoraW1wb3J0IFF0 UXVpY2sgMi4wCitpbXBvcnQgUXRUZXN0IDEuMAoraW1wb3J0IFF0V2ViS2l0IDMuMAoraW1wb3J0 IFF0V2ViS2l0LmV4cGVyaW1lbnRhbCAxLjAKK2ltcG9ydCAiLi4vY29tbW9uIgorCitJdGVtIHsK KyAgICBUZXN0V2ViVmlldyB7CisgICAgICAgIGlkOiB3ZWJWaWV3CisgICAgICAgIHByb3BlcnR5 IHZhcmlhbnQgbGFzdFJlc3VsdAorICAgIH0KKworICAgIFNpZ25hbFNweSB7CisgICAgICAgIGlk OiByZXN1bHRTcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3CisgICAgICAgIHNpZ25hbE5hbWU6 ICJsYXN0UmVzdWx0Q2hhbmdlZCIKKyAgICB9CisKKyAgICBUZXN0Q2FzZSB7CisgICAgICAgIG5h bWU6ICJEZXZpY2VQaXhlbFJhdGlvIgorCisgICAgICAgIGZ1bmN0aW9uIGluaXQoKSB7CisgICAg ICAgICAgICByZXN1bHRTcHkuY2xlYXIoKQorICAgICAgICAgICAgd2ViVmlldy5sYXN0UmVzdWx0 ID0gbnVsbAorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdF9kZXZpY2VQaXhlbFJh dGlvKCkgeworICAgICAgICAgICAgZXhwZWN0RmFpbCgiIiwgIlRoaXMgY3VycmVudGx5IGZhaWxz IHNpbmNlIHdpbmRvdy5kZXZpY2VQaXhlbFJhdGlvIGRvZXNuJ3QgcmV0dXJuIHRoZSB1cGRhdGVk IHZhbHVlLiIpCisKKyAgICAgICAgICAgIHJlc3VsdFNweS5jbGVhcigpCisgICAgICAgICAgICB3 ZWJWaWV3LnVybCA9ICJhYm91dDpibGFuayIKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVu dGFsLmRldmljZVBpeGVsUmF0aW8gPSAyLjAKKyAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3Lndh aXRGb3JMb2FkU3VjY2VlZGVkKCkpCisKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVudGFs LmV2YWx1YXRlSmF2YVNjcmlwdCgKKyAgICAgICAgICAgICAgICAiKGZ1bmN0aW9uKCkgeyByZXR1 cm4gd2luZG93LmRldmljZVBpeGVsUmF0aW8gfSkoKSIsCisgICAgICAgICAgICAgICAgZnVuY3Rp b24ocmVzdWx0KSB7CisgICAgICAgICAgICAgICAgICAgIHdlYlZpZXcubGFzdFJlc3VsdCA9IHJl c3VsdAorICAgICAgICAgICAgICAgIH0pCisKKyAgICAgICAgICAgIHJlc3VsdFNweS53YWl0KCkK KyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy5sYXN0UmVzdWx0LCAyLjApCisgICAgICAgICAg ICBjb21wYXJlKHdlYlZpZXcubGFzdFJlc3VsdCwgd2ViVmlldy5leHBlcmltZW50YWwuZGV2aWNl UGl4ZWxSYXRpbykKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RfZGV2aWNlUGl4 ZWxSYXRpb01lZGlhUXVlcnkoKSB7CisgICAgICAgICAgICBleHBlY3RGYWlsKCIiLCAiVGhpcyBj dXJyZW50bHkgZmFpbHMgc2luY2UgdGhlIGRldmljZVBpeGVsUmF0aW8gZnJvbSB0aGUgUU1MIEFQ SSBpc24ndCBwcm9wYWdhdGVkIGNvcnJlY3RseS4iKQorICAgICAgICAgICAgcmVzdWx0U3B5LmNs ZWFyKCkKKyAgICAgICAgICAgIHdlYlZpZXcudXJsID0gImFib3V0OmJsYW5rIgorICAgICAgICAg ICAgd2ViVmlldy5leHBlcmltZW50YWwuZGV2aWNlUGl4ZWxSYXRpbyA9IDIuMAorICAgICAgICAg ICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRTdWNjZWVkZWQoKSkKKworICAgICAgICAgICAg d2ViVmlldy5leHBlcmltZW50YWwuZXZhbHVhdGVKYXZhU2NyaXB0KAorICAgICAgICAgICAgICAg ICIoZnVuY3Rpb24oKSB7IHJldHVybiB3aW5kb3cubWF0Y2hNZWRpYSgnLXdlYmtpdC1kZXZpY2Ut cGl4ZWwtcmF0aW86IDInKS5tYXRjaGVzIH0pKCkiLAorICAgICAgICAgICAgICAgIGZ1bmN0aW9u KHJlc3VsdCkgeworICAgICAgICAgICAgICAgICAgICB3ZWJWaWV3Lmxhc3RSZXN1bHQgPSByZXN1 bHQKKyAgICAgICAgICAgICAgICB9KQorCisgICAgICAgICAgICByZXN1bHRTcHkud2FpdCgpCisg ICAgICAgICAgICB2ZXJpZnkod2ViVmlldy5sYXN0UmVzdWx0KQorICAgICAgICB9CisgICAgfQor fQo= 160203 2012-08-23 11:36:50 -0700 2012-08-24 04:24:45 -0700 proposed patch 0001-Custom-dpi-fix.patch text/plain 9666 abecsi RnJvbSA4ZWU0MzFiYjcxY2VmYzRiNzdjMDgyYWQzYWQ3N2Y1ZDllZTg4OGMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+ CkRhdGU6IFRodSwgMjMgQXVnIDIwMTIgMTk6NDA6MTQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBD dXN0b20gZHBpIGZpeAoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICB8IDI1ICsrKysrKysrKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCAgfCAyNyArKysrKysrKy0tCiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oICB8ICA2ICstLQogLi4uL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oICAgfCAgMyArLQogLi4uL3FtbHRl c3RzL1dlYlZpZXcvdHN0X2RldmljZVBpeGVsUmF0aW8ucW1sICAgICAgfCA2MiArKysrKysrKysr KysrKysrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDExNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0 aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggZTcwZGY0NC4uNGM5ZjNlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisy MDEyLTA4LTIzICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAbm9raWEuY29tPgorCisgICAg ICAgIFtRdF1bV0syXSBGaXggY3VzdG9tIGRldmljZSBwaXhlbCByYXRpbyBwcm9wYWdhdGlvbiBh bmQgYWRkIFFNTCBBUEkgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg4NTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRGVmZXIgc2V0dGluZyB0aGUgY3VzdG9tIGRldmljZSBwaXhlbCByYXRpbyB1 bnRpbCB0aGUgcGFnZSBpdGVtIGhhcworICAgICAgICBhIHZhbGlkIHNpemUgdG8gbWFrZSBzdXJl IHRoYXQgdGhlIHNjYWxlIGZhY3RvciByZWFjaGVzIHRoZSB3ZWIgcHJvY2Vzcy4KKworICAgICAg ICBRTUwgdGVzdCBiYXNlZCBvbiBwYXRjaCBieSBBbGV4YW5kZXIgRsOmcsO4eS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6UVF1aWNrV2ViVmlld1ByaXZhdGUpOgorICAgICAgICAoUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OmRpZFJlbGF1bmNoUHJvY2Vzcyk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3 UHJpdmF0ZTo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdG bGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUpOgorICAgICAgICAoUVF1aWNr V2ViVmlld0V4cGVyaW1lbnRhbDo6ZGV2aWNlUGl4ZWxSYXRpbyk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3RXhwZXJpbWVudGFsOjpzZXREZXZpY2VQaXhlbFJhdGlvKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2Vidmlld19wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2Rl dmljZVBpeGVsUmF0aW8ucW1sOiBBZGRlZC4KKyAgICAgICAgICBUZXN0IGNhc2UgZm9yIHRoZSBR TUwgZGV2aWNlIHBpeGVsIHJhdGlvIEFQSS4KKwogMjAxMi0wOC0yMiAgSmVzdXMgU2FuY2hlei1Q YWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW0VGTF0g VXNlIFdURl9VU0VfU09VUCBpbnN0ZWFkIEJVSUxESU5HX1NPVVBfXwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggOTIxNTg2ZC4u YTIzMTZhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwCkBAIC0yNzIsNiArMjcyLDcgQEAgUVF1aWNrV2ViVmlld1ByaXZhdGU6OlFR dWlja1dlYlZpZXdQcml2YXRlKFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0KQogICAgICwgbV9uYXZp Z2F0b3JRdE9iamVjdEVuYWJsZWQoZmFsc2UpCiAgICAgLCBtX3JlbmRlclRvT2Zmc2NyZWVuQnVm ZmVyKGZhbHNlKQogICAgICwgbV9hbGxvd0FueUhUVFBTQ2VydGlmaWNhdGVGb3JMb2NhbEhvc3Qo ZmFsc2UpCisgICAgLCBtX2N1c3RvbURldmljZVBpeGVsUmF0aW8oMCkKICAgICAsIG1fbG9hZFBy b2dyZXNzKDApCiB7CiAgICAgdmlld3BvcnQtPnNldENsaXAodHJ1ZSk7CkBAIC00NzMsNyArNDc0 LDEwIEBAIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmRpZFJlbGF1bmNoUHJvY2VzcygpCiB7 CiAgICAgcVdhcm5pbmcoIldBUk5JTkc6IFRoZSB3ZWIgcHJvY2VzcyBoYXMgYmVlbiBzdWNjZXNz ZnVsbHkgcmVzdGFydGVkLiIpOwogCisgICAgLy8gUmVzZXQgdG8gZGVmYXVsdCBzbyB0aGF0IHRo ZSBsYXRlciB1cGRhdGUgY2FuIHJlYWNoIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICB3ZWJQYWdlUHJv eHktPnNldEN1c3RvbURldmljZVNjYWxlRmFjdG9yKDApOwogICAgIHdlYlBhZ2VQcm94eS0+ZHJh d2luZ0FyZWEoKS0+c2V0U2l6ZSh2aWV3U2l6ZSgpLCBJbnRTaXplKCkpOworCiAgICAgdXBkYXRl Vmlld3BvcnRTaXplKCk7CiAgICAgdXBkYXRlVXNlclNjcmlwdHMoKTsKIH0KQEAgLTc4OSw2ICs3 OTMsMTYgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9t TmF2aWdhdG9yUXRPYmplY3QoY29uc3QgU3RyaW5nJgogICAgIGVtaXQgcV9wdHItPmV4cGVyaW1l bnRhbCgpLT5tZXNzYWdlUmVjZWl2ZWQodmFyaWFudE1hcCk7CiB9CiAKK3ZvaWQgUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSkK K3sKKyAgICBpZiAobmV3U2l6ZS5pc0VtcHR5KCkgfHwgIW1fY3VzdG9tRGV2aWNlUGl4ZWxSYXRp byB8fCB3ZWJQYWdlUHJveHktPmRldmljZVNjYWxlRmFjdG9yKCkgPT0gbV9jdXN0b21EZXZpY2VQ aXhlbFJhdGlvKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBTZXQgdGhlIGN1c3RvbSBkZXZp Y2UgcGl4ZWwgcmF0aW8gcmVxdWVzdGVkIGZyb20gUU1MCisgICAgLy8gYXMgc29vbiBhcyB0aGUg Y29udGVudCBpdGVtIGhhcyBhIHZhbGlkIHNpemUuCisgICAgd2ViUGFnZVByb3h5LT5zZXRDdXN0 b21EZXZpY2VTY2FsZUZhY3RvcihtX2N1c3RvbURldmljZVBpeGVsUmF0aW8pOworfQorCiBRUXVp Y2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6UVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGUoUVF1aWNr V2ViVmlldyogdmlld3BvcnQpCiAgICAgOiBRUXVpY2tXZWJWaWV3UHJpdmF0ZSh2aWV3cG9ydCkK IHsKQEAgLTg3Nyw2ICs4OTEsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRl OjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNpemUmIG5ld1NpemUpCiAgICAgUV9RKFFR dWlja1dlYlZpZXcpOwogCiAgICAgcGFnZVZpZXctPnNldENvbnRlbnRzU2l6ZShuZXdTaXplKTsg Ly8gZW1pdHMgY29udGVudHNTaXplQ2hhbmdlZCgpCisgICAgUVF1aWNrV2ViVmlld1ByaXZhdGU6 OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShuZXdTaXplKTsKICAgICBtX3ZpZXdwb3J0SGFuZGxlci0+ cGFnZUNvbnRlbnRzU2l6ZUNoYW5nZWQobmV3U2l6ZSwgcS0+Ym91bmRpbmdSZWN0KCkuc2l6ZSgp LnRvU2l6ZSgpKTsKIH0KIApAQCAtMTIzMywxOSArMTI0OCwyMyBAQCB2b2lkIFFRdWlja1dlYlZp ZXdFeHBlcmltZW50YWw6OnNldFVzZXJBZ2VudChjb25zdCBRU3RyaW5nJiB1c2VyQWdlbnQpCiAg ICAgZG93biBidXQgc3RpbGwgcHJvdmlkZSBhIGJldHRlciBsb29raW5nIGltYWdlLgogKi8KIAot ZG91YmxlIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmRldmljZVBpeGVsUmF0aW8oKSBjb25z dAorcXJlYWwgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6ZGV2aWNlUGl4ZWxSYXRpbygpIGNv bnN0CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlja1dlYlZpZXcpOworCisgICAgaWYgKGQtPm1fY3Vz dG9tRGV2aWNlUGl4ZWxSYXRpbykKKyAgICAgICAgcmV0dXJuIGQtPm1fY3VzdG9tRGV2aWNlUGl4 ZWxSYXRpbzsKKwogICAgIHJldHVybiBkLT53ZWJQYWdlUHJveHktPmRldmljZVNjYWxlRmFjdG9y KCk7CiB9CiAKLXZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2V0RGV2aWNlUGl4ZWxS YXRpbyhkb3VibGUgZGV2aWNlUGl4ZWxSYXRpbykKK3ZvaWQgUVF1aWNrV2ViVmlld0V4cGVyaW1l bnRhbDo6c2V0RGV2aWNlUGl4ZWxSYXRpbyhxcmVhbCBkZXZpY2VQaXhlbFJhdGlvKQogewogICAg IFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBpZiAoZGV2aWNlUGl4ZWxSYXRpbyA9PSB0aGlzLT5k ZXZpY2VQaXhlbFJhdGlvKCkpCisgICAgaWYgKDAgPj0gZGV2aWNlUGl4ZWxSYXRpbyB8fCBkZXZp Y2VQaXhlbFJhdGlvID09IHRoaXMtPmRldmljZVBpeGVsUmF0aW8oKSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgZC0+d2ViUGFnZVByb3h5LT5zZXRDdXN0b21EZXZpY2VTY2FsZUZhY3RvcihkZXZp Y2VQaXhlbFJhdGlvKTsKKyAgICBkLT5tX2N1c3RvbURldmljZVBpeGVsUmF0aW8gPSBkZXZpY2VQ aXhlbFJhdGlvOwogICAgIGVtaXQgZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQoKTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3Au aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKaW5k ZXggOGQwZjRmZi4uNjQ1NTM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCkBAIC0yNTUsNyArMjU1LDcgQEAgY2xhc3MgUVdFQktJ VF9FWFBPUlQgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbCA6IHB1YmxpYyBRT2JqZWN0IHsKICAg ICBRX1BST1BFUlRZKGludCBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aCBXUklURSBzZXRQ cmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aCBSRUFEIHByZWZlcnJlZE1pbmltdW1Db250ZW50 c1dpZHRoIE5PVElGWSBwcmVmZXJyZWRNaW5pbXVtQ29udGVudHNXaWR0aENoYW5nZWQpCiAgICAg UV9QUk9QRVJUWShpbnQgZGV2aWNlV2lkdGggV1JJVEUgc2V0RGV2aWNlV2lkdGggUkVBRCBkZXZp Y2VXaWR0aCBOT1RJRlkgZGV2aWNlV2lkdGhDaGFuZ2VkKQogICAgIFFfUFJPUEVSVFkoaW50IGRl dmljZUhlaWdodCBXUklURSBzZXREZXZpY2VIZWlnaHQgUkVBRCBkZXZpY2VIZWlnaHQgTk9USUZZ IGRldmljZUhlaWdodENoYW5nZWQpCi0gICAgUV9QUk9QRVJUWShkb3VibGUgZGV2aWNlUGl4ZWxS YXRpbyBSRUFEIGRldmljZVBpeGVsUmF0aW8gV1JJVEUgc2V0RGV2aWNlUGl4ZWxSYXRpbyBOT1RJ RlkgZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQpCisgICAgUV9QUk9QRVJUWShxcmVhbCBkZXZpY2VQ aXhlbFJhdGlvIFJFQUQgZGV2aWNlUGl4ZWxSYXRpbyBXUklURSBzZXREZXZpY2VQaXhlbFJhdGlv IE5PVElGWSBkZXZpY2VQaXhlbFJhdGlvQ2hhbmdlZCkKIAogICAgIFFfUFJPUEVSVFkoUVdlYk5h dmlnYXRpb25IaXN0b3J5KiBuYXZpZ2F0aW9uSGlzdG9yeSBSRUFEIG5hdmlnYXRpb25IaXN0b3J5 IENPTlNUQU5UIEZJTkFMKQogCkBAIC0zMTIsOCArMzEyLDggQEAgcHVibGljOgogICAgIHZvaWQg c2V0RGV2aWNlV2lkdGgoaW50KTsKICAgICBpbnQgZGV2aWNlSGVpZ2h0KCkgY29uc3Q7CiAgICAg dm9pZCBzZXREZXZpY2VIZWlnaHQoaW50KTsKLSAgICBkb3VibGUgZGV2aWNlUGl4ZWxSYXRpbygp IGNvbnN0OwotICAgIHZvaWQgc2V0RGV2aWNlUGl4ZWxSYXRpbyhkb3VibGUpOworICAgIHFyZWFs IGRldmljZVBpeGVsUmF0aW8oKSBjb25zdDsKKyAgICB2b2lkIHNldERldmljZVBpeGVsUmF0aW8o cXJlYWwpOwogICAgIFFMaXN0PFFVcmw+IHVzZXJTY3JpcHRzKCkgY29uc3Q7CiAgICAgdm9pZCBz ZXRVc2VyU2NyaXB0cyhjb25zdCBRTGlzdDxRVXJsPiYgdXNlclNjcmlwdHMpOwogICAgIFFVcmwg cmVtb3RlSW5zcGVjdG9yVXJsKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKaW5kZXggZDhhODhmOC4uZmNiOWYyYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 X3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmll d19wX3AuaApAQCAtMTI4LDcgKzEyOCw3IEBAIHB1YmxpYzoKICAgICBXZWJDb3JlOjpJbnRTaXpl IHZpZXdTaXplKCkgY29uc3Q7CiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0 b3JRdE9iamVjdChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogICAgIHZpcnR1YWwgdm9pZCBwYWdl RGlkUmVxdWVzdFNjcm9sbChjb25zdCBRUG9pbnQmIHBvcykgeyB9Ci0gICAgdmlydHVhbCB2b2lk IGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSkgeyB9CisgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSk7CiAg ICAgdm9pZCBwcm9jZXNzRGlkQ3Jhc2goKTsKICAgICB2b2lkIGRpZFJlbGF1bmNoUHJvY2Vzcygp OwogICAgIFBhc3NPd25QdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PiBjcmVhdGVEcmF3aW5n QXJlYVByb3h5KCk7CkBAIC0xOTAsNiArMTkwLDcgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgbV9u YXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQ7CiAgICAgYm9vbCBtX3JlbmRlclRvT2Zmc2NyZWVuQnVm ZmVyOwogICAgIGJvb2wgbV9hbGxvd0FueUhUVFBTQ2VydGlmaWNhdGVGb3JMb2NhbEhvc3Q7Cisg ICAgcXJlYWwgbV9jdXN0b21EZXZpY2VQaXhlbFJhdGlvOwogICAgIFdURjo6U3RyaW5nIG1faWNv blVybDsKICAgICBpbnQgbV9sb2FkUHJvZ3Jlc3M7CiAgICAgV1RGOjpTdHJpbmcgbV9jdXJyZW50 VXJsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9x bWx0ZXN0cy9XZWJWaWV3L3RzdF9kZXZpY2VQaXhlbFJhdGlvLnFtbCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxS YXRpby5xbWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDQ0MmI1MwotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1s dGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwKQEAgLTAsMCArMSw2MiBAQAor aW1wb3J0IFF0UXVpY2sgMi4wCitpbXBvcnQgUXRUZXN0IDEuMAoraW1wb3J0IFF0V2ViS2l0IDMu MAoraW1wb3J0IFF0V2ViS2l0LmV4cGVyaW1lbnRhbCAxLjAKK2ltcG9ydCAiLi4vY29tbW9uIgor CisKK1Rlc3RXZWJWaWV3IHsKKyAgICBpZDogd2ViVmlldworICAgIHByb3BlcnR5IHZhcmlhbnQg bGFzdFJlc3VsdAorICAgIHdpZHRoOiA0MDAKKyAgICBoZWlnaHQ6IDMwMAorICAgIGZvY3VzOiB0 cnVlCisKKyAgICBTaWduYWxTcHkgeworICAgICAgICBpZDogcmVzdWx0U3B5CisgICAgICAgIHRh cmdldDogd2ViVmlldworICAgICAgICBzaWduYWxOYW1lOiAibGFzdFJlc3VsdENoYW5nZWQiCisg ICAgfQorCisgICAgVGVzdENhc2UgeworICAgICAgICBuYW1lOiAiRGV2aWNlUGl4ZWxSYXRpbyIK KworICAgICAgICBmdW5jdGlvbiBpbml0KCkgeworICAgICAgICAgICAgcmVzdWx0U3B5LmNsZWFy KCkKKyAgICAgICAgICAgIHdlYlZpZXcubGFzdFJlc3VsdCA9IG51bGwKKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIHRlc3RfZGV2aWNlUGl4ZWxSYXRpbygpIHsKKyAgICAgICAgICAgIHJl c3VsdFNweS5jbGVhcigpCisgICAgICAgICAgICB3ZWJWaWV3LnVybCA9IFF0LnJlc29sdmVkVXJs KCIuLi9jb21tb24vdGVzdDEuaHRtbCIpOworICAgICAgICAgICAgd2ViVmlldy5leHBlcmltZW50 YWwuZGV2aWNlUGl4ZWxSYXRpbyA9IDIuMAorICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2Fp dEZvckxvYWRTdWNjZWVkZWQoKSkKKworICAgICAgICAgICAgd2ViVmlldy5leHBlcmltZW50YWwu ZXZhbHVhdGVKYXZhU2NyaXB0KAorICAgICAgICAgICAgICAgICIoZnVuY3Rpb24oKSB7IHJldHVy biB3aW5kb3cuZGV2aWNlUGl4ZWxSYXRpbyB9KSgpIiwKKyAgICAgICAgICAgICAgICBmdW5jdGlv bihyZXN1bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgd2ViVmlldy5sYXN0UmVzdWx0ID0gcmVz dWx0CisgICAgICAgICAgICAgICAgfSkKKworICAgICAgICAgICAgcmVzdWx0U3B5LndhaXQoKQor ICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3Lmxhc3RSZXN1bHQsIDIuMCkKKyAgICAgICAgICAg IGNvbXBhcmUod2ViVmlldy5sYXN0UmVzdWx0LCB3ZWJWaWV3LmV4cGVyaW1lbnRhbC5kZXZpY2VQ aXhlbFJhdGlvKQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdF9kZXZpY2VQaXhl bFJhdGlvTWVkaWFRdWVyeSgpIHsKKyAgICAgICAgICAgIHJlc3VsdFNweS5jbGVhcigpCisgICAg ICAgICAgICB3ZWJWaWV3LnVybCA9IFF0LnJlc29sdmVkVXJsKCIuLi9jb21tb24vdGVzdDIuaHRt bCIpOworICAgICAgICAgICAgd2ViVmlldy5leHBlcmltZW50YWwuZGV2aWNlUGl4ZWxSYXRpbyA9 IDIuMAorICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcud2FpdEZvckxvYWRTdWNjZWVkZWQoKSkK KworICAgICAgICAgICAgd2ViVmlldy5leHBlcmltZW50YWwuZXZhbHVhdGVKYXZhU2NyaXB0KAor ICAgICAgICAgICAgICAgICIoZnVuY3Rpb24oKSB7IHJldHVybiB3aW5kb3cubWF0Y2hNZWRpYShc Iigtd2Via2l0LWRldmljZS1waXhlbC1yYXRpbzogMilcIikubWF0Y2hlcyB9KSgpIiwKKyAgICAg ICAgICAgICAgICBmdW5jdGlvbihyZXN1bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgd2ViVmll dy5sYXN0UmVzdWx0ID0gcmVzdWx0CisgICAgICAgICAgICAgICAgfSkKKworICAgICAgICAgICAg cmVzdWx0U3B5LndhaXQoKQorICAgICAgICAgICAgdmVyaWZ5KHdlYlZpZXcubGFzdFJlc3VsdCkK KyAgICAgICAgfQorICAgIH0KK30KLS0gCjEuNy4xMgoK 160392 2012-08-24 04:24:45 -0700 2012-08-24 06:50:22 -0700 proposed patch 0001-Custom-dpi-fix.patch text/plain 9907 abecsi RnJvbSA1MGFlMTkxNTIyNDM3NjgwYjJiYmUyZDkzMTVhYTYyYTdkNDg1ZDUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+ CkRhdGU6IFRodSwgMjMgQXVnIDIwMTIgMTk6NDA6MTQgKzAyMDAKU3ViamVjdDogW1BBVENIXSBD dXN0b20gZHBpIGZpeAoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICB8IDI1ICsrKysrKysrKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCAgfCAzMSArKysrKysrKystLQogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaCAgfCAgNiArLS0KIC4uLi9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaCAgIHwgIDMgKy0KIC4uLi9xbWx0 ZXN0cy9XZWJWaWV3L3RzdF9kZXZpY2VQaXhlbFJhdGlvLnFtbCAgICAgIHwgNjIgKysrKysrKysr KysrKysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAxMTkgaW5zZXJ0aW9ucygrKSwgOCBkZWxl dGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2RldmljZVBpeGVsUmF0aW8ucW1sCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCmluZGV4IGU2M2JiOGEuLmM4ZDFiYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAor MjAxMi0wOC0yMyAgQW5kcmFzIEJlY3NpICA8YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KKworICAg ICAgICBbUXRdW1dLMl0gRml4IGN1c3RvbSBkZXZpY2UgcGl4ZWwgcmF0aW8gcHJvcGFnYXRpb24g YW5kIGFkZCBRTUwgQVBJIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04ODUzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIERlZmVyIHNldHRpbmcgdGhlIGN1c3RvbSBkZXZpY2UgcGl4ZWwgcmF0aW8g dW50aWwgdGhlIHBhZ2UgaXRlbSBoYXMKKyAgICAgICAgYSB2YWxpZCBzaXplIHRvIG1ha2Ugc3Vy ZSB0aGF0IHRoZSBzY2FsZSBmYWN0b3IgcmVhY2hlcyB0aGUgd2ViIHByb2Nlc3MuCisKKyAgICAg ICAgUU1MIHRlc3QgYmFzZWQgb24gcGF0Y2ggYnkgQWxleGFuZGVyIEbDpnLDuHkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNr V2ViVmlld1ByaXZhdGU6OlFRdWlja1dlYlZpZXdQcml2YXRlKToKKyAgICAgICAgKFFRdWlja1dl YlZpZXdQcml2YXRlOjpkaWRSZWxhdW5jaFByb2Nlc3MpOgorICAgICAgICAoUVF1aWNrV2ViVmll d1ByaXZhdGU6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3 RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKFFRdWlj a1dlYlZpZXdFeHBlcmltZW50YWw6OmRldmljZVBpeGVsUmF0aW8pOgorICAgICAgICAoUVF1aWNr V2ViVmlld0V4cGVyaW1lbnRhbDo6c2V0RGV2aWNlUGl4ZWxSYXRpbyk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXdfcF9wLmg6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZSk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9k ZXZpY2VQaXhlbFJhdGlvLnFtbDogQWRkZWQuCisgICAgICAgICAgVGVzdCBjYXNlIGZvciB0aGUg UU1MIGRldmljZSBwaXhlbCByYXRpbyBBUEkuCisKIDIwMTItMDgtMjMgIEZyZWRlcmlrIEdsYWRo b3JuICA8Z2xhZGhvcm5Aa2RlLm9yZz4KIAogICAgICAgICBNYWtlIGl0IHBvc3NpYmxlIHRvIGJ1 aWxkIFdlYktpdCB3aXRoIFB5dGhvbiAzIChhbmQgMikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IDkyMTU4NmQuLjAzMzA3MDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmll dy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 LmNwcApAQCAtMjcyLDYgKzI3Miw3IEBAIFFRdWlja1dlYlZpZXdQcml2YXRlOjpRUXVpY2tXZWJW aWV3UHJpdmF0ZShRUXVpY2tXZWJWaWV3KiB2aWV3cG9ydCkKICAgICAsIG1fbmF2aWdhdG9yUXRP YmplY3RFbmFibGVkKGZhbHNlKQogICAgICwgbV9yZW5kZXJUb09mZnNjcmVlbkJ1ZmZlcihmYWxz ZSkKICAgICAsIG1fYWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9yTG9jYWxIb3N0KGZhbHNlKQor ICAgICwgbV9jdXN0b21EZXZpY2VQaXhlbFJhdGlvKDApCiAgICAgLCBtX2xvYWRQcm9ncmVzcygw KQogewogICAgIHZpZXdwb3J0LT5zZXRDbGlwKHRydWUpOwpAQCAtNDczLDcgKzQ3NCwxMCBAQCB2 b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpkaWRSZWxhdW5jaFByb2Nlc3MoKQogewogICAgIHFX YXJuaW5nKCJXQVJOSU5HOiBUaGUgd2ViIHByb2Nlc3MgaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IHJl c3RhcnRlZC4iKTsKIAorICAgIC8vIFJlc2V0IHRvIGRlZmF1bHQgc28gdGhhdCB0aGUgbGF0ZXIg dXBkYXRlIGNhbiByZWFjaCB0aGUgd2ViIHByb2Nlc3MuCisgICAgd2ViUGFnZVByb3h5LT5zZXRD dXN0b21EZXZpY2VTY2FsZUZhY3RvcigwKTsKICAgICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVh KCktPnNldFNpemUodmlld1NpemUoKSwgSW50U2l6ZSgpKTsKKwogICAgIHVwZGF0ZVZpZXdwb3J0 U2l6ZSgpOwogICAgIHVwZGF0ZVVzZXJTY3JpcHRzKCk7CiB9CkBAIC03ODksNiArNzkzLDIwIEBA IHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRv clF0T2JqZWN0KGNvbnN0IFN0cmluZyYKICAgICBlbWl0IHFfcHRyLT5leHBlcmltZW50YWwoKS0+ bWVzc2FnZVJlY2VpdmVkKHZhcmlhbnRNYXApOwogfQogCit2b2lkIFFRdWlja1dlYlZpZXdQcml2 YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNpemUmIG5ld1NpemUpCit7CisgICAg aWYgKG5ld1NpemUuaXNFbXB0eSgpIHx8ICFtX2N1c3RvbURldmljZVBpeGVsUmF0aW8gfHwgd2Vi UGFnZVByb3h5LT5kZXZpY2VTY2FsZUZhY3RvcigpID09IG1fY3VzdG9tRGV2aWNlUGl4ZWxSYXRp bykKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gRHJhd2luZ0FyZWFQcm94eSByZXR1cm5zIGVh cmx5IGlmIHRoZSBwYWdlIHNpemUgaXMgZW1wdHkKKyAgICAvLyBhbmQgdGhlIGRldmljZSBwaXhl bCByYXRpbyBwcm9wZXJ0eSBpcyBwcm9wYWdhdGVkIGZyb20gUU1MCisgICAgLy8gYmVmb3JlIHRo ZSBRTUwgcGFnZSBpdGVtIGhhcyBhIHZhbGlkIHNpemUgeWV0LCB0aHVzIHRoZQorICAgIC8vIGlu Zm9ybWF0aW9uIHdvdWxkIG5vdCByZWFjaCB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gU2V0IHRo ZSBjdXN0b20gZGV2aWNlIHBpeGVsIHJhdGlvIHJlcXVlc3RlZCBmcm9tIFFNTCBhcyBzb29uCisg ICAgLy8gYXMgdGhlIGNvbnRlbnQgaXRlbSBoYXMgYSB2YWxpZCBzaXplLgorICAgIHdlYlBhZ2VQ cm94eS0+c2V0Q3VzdG9tRGV2aWNlU2NhbGVGYWN0b3IobV9jdXN0b21EZXZpY2VQaXhlbFJhdGlv KTsKK30KKwogUVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6OlFRdWlja1dlYlZpZXdMZWdhY3lQ cml2YXRlKFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0KQogICAgIDogUVF1aWNrV2ViVmlld1ByaXZh dGUodmlld3BvcnQpCiB7CkBAIC04NzcsNiArODk1LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3Rmxp Y2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFFTaXplJiBuZXdTaXpl KQogICAgIFFfUShRUXVpY2tXZWJWaWV3KTsKIAogICAgIHBhZ2VWaWV3LT5zZXRDb250ZW50c1Np emUobmV3U2l6ZSk7IC8vIGVtaXRzIGNvbnRlbnRzU2l6ZUNoYW5nZWQoKQorICAgIFFRdWlja1dl YlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUobmV3U2l6ZSk7CiAgICAgbV92aWV3 cG9ydEhhbmRsZXItPnBhZ2VDb250ZW50c1NpemVDaGFuZ2VkKG5ld1NpemUsIHEtPmJvdW5kaW5n UmVjdCgpLnNpemUoKS50b1NpemUoKSk7CiB9CiAKQEAgLTEyMzMsMTkgKzEyNTIsMjMgQEAgdm9p ZCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzZXRVc2VyQWdlbnQoY29uc3QgUVN0cmluZyYg dXNlckFnZW50KQogICAgIGRvd24gYnV0IHN0aWxsIHByb3ZpZGUgYSBiZXR0ZXIgbG9va2luZyBp bWFnZS4KICovCiAKLWRvdWJsZSBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpkZXZpY2VQaXhl bFJhdGlvKCkgY29uc3QKK3FyZWFsIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmRldmljZVBp eGVsUmF0aW8oKSBjb25zdAogewogICAgIFFfRChjb25zdCBRUXVpY2tXZWJWaWV3KTsKKworICAg IGlmIChkLT5tX2N1c3RvbURldmljZVBpeGVsUmF0aW8pCisgICAgICAgIHJldHVybiBkLT5tX2N1 c3RvbURldmljZVBpeGVsUmF0aW87CisKICAgICByZXR1cm4gZC0+d2ViUGFnZVByb3h5LT5kZXZp Y2VTY2FsZUZhY3RvcigpOwogfQogCi12b2lkIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OnNl dERldmljZVBpeGVsUmF0aW8oZG91YmxlIGRldmljZVBpeGVsUmF0aW8pCit2b2lkIFFRdWlja1dl YlZpZXdFeHBlcmltZW50YWw6OnNldERldmljZVBpeGVsUmF0aW8ocXJlYWwgZGV2aWNlUGl4ZWxS YXRpbykKIHsKICAgICBRX0QoUVF1aWNrV2ViVmlldyk7Ci0gICAgaWYgKGRldmljZVBpeGVsUmF0 aW8gPT0gdGhpcy0+ZGV2aWNlUGl4ZWxSYXRpbygpKQorICAgIGlmICgwID49IGRldmljZVBpeGVs UmF0aW8gfHwgZGV2aWNlUGl4ZWxSYXRpbyA9PSB0aGlzLT5kZXZpY2VQaXhlbFJhdGlvKCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGQtPndlYlBhZ2VQcm94eS0+c2V0Q3VzdG9tRGV2aWNlU2Nh bGVGYWN0b3IoZGV2aWNlUGl4ZWxSYXRpbyk7CisgICAgZC0+bV9jdXN0b21EZXZpY2VQaXhlbFJh dGlvID0gZGV2aWNlUGl4ZWxSYXRpbzsKICAgICBlbWl0IGRldmljZVBpeGVsUmF0aW9DaGFuZ2Vk KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlld19wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXdfcC5oCmluZGV4IDhkMGY0ZmYuLjY0NTUzOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaApAQCAtMjU1LDcgKzI1NSw3IEBA IGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWwgOiBwdWJsaWMg UU9iamVjdCB7CiAgICAgUV9QUk9QRVJUWShpbnQgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lk dGggV1JJVEUgc2V0UHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGggUkVBRCBwcmVmZXJyZWRN aW5pbXVtQ29udGVudHNXaWR0aCBOT1RJRlkgcHJlZmVycmVkTWluaW11bUNvbnRlbnRzV2lkdGhD aGFuZ2VkKQogICAgIFFfUFJPUEVSVFkoaW50IGRldmljZVdpZHRoIFdSSVRFIHNldERldmljZVdp ZHRoIFJFQUQgZGV2aWNlV2lkdGggTk9USUZZIGRldmljZVdpZHRoQ2hhbmdlZCkKICAgICBRX1BS T1BFUlRZKGludCBkZXZpY2VIZWlnaHQgV1JJVEUgc2V0RGV2aWNlSGVpZ2h0IFJFQUQgZGV2aWNl SGVpZ2h0IE5PVElGWSBkZXZpY2VIZWlnaHRDaGFuZ2VkKQotICAgIFFfUFJPUEVSVFkoZG91Ymxl IGRldmljZVBpeGVsUmF0aW8gUkVBRCBkZXZpY2VQaXhlbFJhdGlvIFdSSVRFIHNldERldmljZVBp eGVsUmF0aW8gTk9USUZZIGRldmljZVBpeGVsUmF0aW9DaGFuZ2VkKQorICAgIFFfUFJPUEVSVFko cXJlYWwgZGV2aWNlUGl4ZWxSYXRpbyBSRUFEIGRldmljZVBpeGVsUmF0aW8gV1JJVEUgc2V0RGV2 aWNlUGl4ZWxSYXRpbyBOT1RJRlkgZGV2aWNlUGl4ZWxSYXRpb0NoYW5nZWQpCiAKICAgICBRX1BS T1BFUlRZKFFXZWJOYXZpZ2F0aW9uSGlzdG9yeSogbmF2aWdhdGlvbkhpc3RvcnkgUkVBRCBuYXZp Z2F0aW9uSGlzdG9yeSBDT05TVEFOVCBGSU5BTCkKIApAQCAtMzEyLDggKzMxMiw4IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldERldmljZVdpZHRoKGludCk7CiAgICAgaW50IGRldmljZUhlaWdodCgp IGNvbnN0OwogICAgIHZvaWQgc2V0RGV2aWNlSGVpZ2h0KGludCk7Ci0gICAgZG91YmxlIGRldmlj ZVBpeGVsUmF0aW8oKSBjb25zdDsKLSAgICB2b2lkIHNldERldmljZVBpeGVsUmF0aW8oZG91Ymxl KTsKKyAgICBxcmVhbCBkZXZpY2VQaXhlbFJhdGlvKCkgY29uc3Q7CisgICAgdm9pZCBzZXREZXZp Y2VQaXhlbFJhdGlvKHFyZWFsKTsKICAgICBRTGlzdDxRVXJsPiB1c2VyU2NyaXB0cygpIGNvbnN0 OwogICAgIHZvaWQgc2V0VXNlclNjcmlwdHMoY29uc3QgUUxpc3Q8UVVybD4mIHVzZXJTY3JpcHRz KTsKICAgICBRVXJsIHJlbW90ZUluc3BlY3RvclVybCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCmluZGV4IGQ4YTg4 ZjguLmZjYjlmMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnZpZXdfcF9wLmgKQEAgLTEyOCw3ICsxMjgsNyBAQCBwdWJsaWM6CiAgICAgV2Vi Q29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIGNvbnN0OwogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3Nh Z2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsKICAgICB2aXJ0 dWFsIHZvaWQgcGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgUVBvaW50JiBwb3MpIHsgfQotICAg IHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNpemUmIG5ld1NpemUp IHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNpemUm IG5ld1NpemUpOwogICAgIHZvaWQgcHJvY2Vzc0RpZENyYXNoKCk7CiAgICAgdm9pZCBkaWRSZWxh dW5jaFByb2Nlc3MoKTsKICAgICBQYXNzT3duUHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4g Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOwpAQCAtMTkwLDYgKzE5MCw3IEBAIHByb3RlY3RlZDoK ICAgICBib29sIG1fbmF2aWdhdG9yUXRPYmplY3RFbmFibGVkOwogICAgIGJvb2wgbV9yZW5kZXJU b09mZnNjcmVlbkJ1ZmZlcjsKICAgICBib29sIG1fYWxsb3dBbnlIVFRQU0NlcnRpZmljYXRlRm9y TG9jYWxIb3N0OworICAgIHFyZWFsIG1fY3VzdG9tRGV2aWNlUGl4ZWxSYXRpbzsKICAgICBXVEY6 OlN0cmluZyBtX2ljb25Vcmw7CiAgICAgaW50IG1fbG9hZFByb2dyZXNzOwogICAgIFdURjo6U3Ry aW5nIG1fY3VycmVudFVybDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90c3RfZGV2aWNlUGl4ZWxSYXRpby5xbWwgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0 X2RldmljZVBpeGVsUmF0aW8ucW1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LjA0NDJiNTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL3FtbHRlc3RzL1dlYlZpZXcvdHN0X2RldmljZVBpeGVsUmF0aW8ucW1sCkBAIC0w LDAgKzEsNjIgQEAKK2ltcG9ydCBRdFF1aWNrIDIuMAoraW1wb3J0IFF0VGVzdCAxLjAKK2ltcG9y dCBRdFdlYktpdCAzLjAKK2ltcG9ydCBRdFdlYktpdC5leHBlcmltZW50YWwgMS4wCitpbXBvcnQg Ii4uL2NvbW1vbiIKKworCitUZXN0V2ViVmlldyB7CisgICAgaWQ6IHdlYlZpZXcKKyAgICBwcm9w ZXJ0eSB2YXJpYW50IGxhc3RSZXN1bHQKKyAgICB3aWR0aDogNDAwCisgICAgaGVpZ2h0OiAzMDAK KyAgICBmb2N1czogdHJ1ZQorCisgICAgU2lnbmFsU3B5IHsKKyAgICAgICAgaWQ6IHJlc3VsdFNw eQorICAgICAgICB0YXJnZXQ6IHdlYlZpZXcKKyAgICAgICAgc2lnbmFsTmFtZTogImxhc3RSZXN1 bHRDaGFuZ2VkIgorICAgIH0KKworICAgIFRlc3RDYXNlIHsKKyAgICAgICAgbmFtZTogIkRldmlj ZVBpeGVsUmF0aW8iCisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpIHsKKyAgICAgICAgICAgIHJl c3VsdFNweS5jbGVhcigpCisgICAgICAgICAgICB3ZWJWaWV3Lmxhc3RSZXN1bHQgPSBudWxsCisg ICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiB0ZXN0X2RldmljZVBpeGVsUmF0aW8oKSB7Cisg ICAgICAgICAgICByZXN1bHRTcHkuY2xlYXIoKQorICAgICAgICAgICAgd2ViVmlldy51cmwgPSBR dC5yZXNvbHZlZFVybCgiLi4vY29tbW9uL3Rlc3QxLmh0bWwiKTsKKyAgICAgICAgICAgIHdlYlZp ZXcuZXhwZXJpbWVudGFsLmRldmljZVBpeGVsUmF0aW8gPSAyLjAKKyAgICAgICAgICAgIHZlcmlm eSh3ZWJWaWV3LndhaXRGb3JMb2FkU3VjY2VlZGVkKCkpCisKKyAgICAgICAgICAgIHdlYlZpZXcu ZXhwZXJpbWVudGFsLmV2YWx1YXRlSmF2YVNjcmlwdCgKKyAgICAgICAgICAgICAgICAiKGZ1bmN0 aW9uKCkgeyByZXR1cm4gd2luZG93LmRldmljZVBpeGVsUmF0aW8gfSkoKSIsCisgICAgICAgICAg ICAgICAgZnVuY3Rpb24ocmVzdWx0KSB7CisgICAgICAgICAgICAgICAgICAgIHdlYlZpZXcubGFz dFJlc3VsdCA9IHJlc3VsdAorICAgICAgICAgICAgICAgIH0pCisKKyAgICAgICAgICAgIHJlc3Vs dFNweS53YWl0KCkKKyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy5sYXN0UmVzdWx0LCAyLjAp CisgICAgICAgICAgICBjb21wYXJlKHdlYlZpZXcubGFzdFJlc3VsdCwgd2ViVmlldy5leHBlcmlt ZW50YWwuZGV2aWNlUGl4ZWxSYXRpbykKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRl c3RfZGV2aWNlUGl4ZWxSYXRpb01lZGlhUXVlcnkoKSB7CisgICAgICAgICAgICByZXN1bHRTcHku Y2xlYXIoKQorICAgICAgICAgICAgd2ViVmlldy51cmwgPSBRdC5yZXNvbHZlZFVybCgiLi4vY29t bW9uL3Rlc3QyLmh0bWwiKTsKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVudGFsLmRldmlj ZVBpeGVsUmF0aW8gPSAyLjAKKyAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3LndhaXRGb3JMb2Fk U3VjY2VlZGVkKCkpCisKKyAgICAgICAgICAgIHdlYlZpZXcuZXhwZXJpbWVudGFsLmV2YWx1YXRl SmF2YVNjcmlwdCgKKyAgICAgICAgICAgICAgICAiKGZ1bmN0aW9uKCkgeyByZXR1cm4gd2luZG93 Lm1hdGNoTWVkaWEoXCIoLXdlYmtpdC1kZXZpY2UtcGl4ZWwtcmF0aW86IDIpXCIpLm1hdGNoZXMg fSkoKSIsCisgICAgICAgICAgICAgICAgZnVuY3Rpb24ocmVzdWx0KSB7CisgICAgICAgICAgICAg ICAgICAgIHdlYlZpZXcubGFzdFJlc3VsdCA9IHJlc3VsdAorICAgICAgICAgICAgICAgIH0pCisK KyAgICAgICAgICAgIHJlc3VsdFNweS53YWl0KCkKKyAgICAgICAgICAgIHZlcmlmeSh3ZWJWaWV3 Lmxhc3RSZXN1bHQpCisgICAgICAgIH0KKyAgICB9Cit9Ci0tIAoxLjcuMTIKCg==