82757 2012-03-30 11:12:38 -0700 [Chromium] defaultDeviceScaleFactor != 0 should set deviceScaleFactor = defaultDeviceScaleFactor in the absence of a viewport tag for debugging purposes 2012-04-10 15:38:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70559 1 fsamuel tdresser abarth aelias fishd fsamuel mbolohan rjkroege tdresser webkit.review.bot oldest_to_newest 592319 0 fsamuel 2012-03-30 11:12:38 -0700 [Chromium] defaultDeviceScaleFactor != 0 should set deviceScaleFactor = defaultDeviceScaleFactor in the absense of a viewport tag for debugging purposes 593474 1 fsamuel 2012-04-02 08:00:03 -0700 http://developer.android.com/guide/webapps/targeting.html 594608 2 135356 tdresser 2012-04-03 10:26:53 -0700 Created attachment 135356 Patch 594626 3 fsamuel 2012-04-03 10:40:02 -0700 This looks good to me. Thanks. Added abarth@ for review. 594651 4 aelias 2012-04-03 11:07:30 -0700 Looks like this should be a no-op patch if the setting isn't changed, so it's fine by me. I'd be curious to know what kind of debugging you have in mind though. 594667 5 fsamuel 2012-04-03 11:20:15 -0700 (In reply to comment #4) > Looks like this should be a no-op patch if the setting isn't changed, so it's fine by me. I'd be curious to know what kind of debugging you have in mind though. Manually passing --default-device-scale-factor=2 in Chromium and browsing. 596973 6 135356 fishd 2012-04-05 15:44:27 -0700 Comment on attachment 135356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135356&action=review > Source/WebKit/chromium/tests/WebFrameTest.cpp:34 > +#include "FrameView.h" please avoid reaching into WebCore if you can help it. > Source/WebKit/chromium/tests/WebFrameTest.cpp:181 > + webViewImpl->resize(WebSize(viewportWidth, viewportHeight)); Why do you need to use WebViewImpl here? > Source/WebKit/chromium/tests/WebFrameTest.cpp:185 > + webViewImpl->mainFrameImpl()->frameView()->layout(); just call WebWidget::layout()? WebView inherits from WebWidget 599249 7 136452 tdresser 2012-04-10 07:20:17 -0700 Created attachment 136452 Patch 599250 8 tdresser 2012-04-10 07:21:46 -0700 (In reply to comment #6) > (From update of attachment 135356 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135356&action=review > > > Source/WebKit/chromium/tests/WebFrameTest.cpp:34 > > +#include "FrameView.h" > > please avoid reaching into WebCore if you can help it. > > > Source/WebKit/chromium/tests/WebFrameTest.cpp:181 > > + webViewImpl->resize(WebSize(viewportWidth, viewportHeight)); > > Why do you need to use WebViewImpl here? > > > Source/WebKit/chromium/tests/WebFrameTest.cpp:185 > > + webViewImpl->mainFrameImpl()->frameView()->layout(); > > just call WebWidget::layout()? WebView inherits from WebWidget Done. 599734 9 136452 webkit.review.bot 2012-04-10 15:38:18 -0700 Comment on attachment 136452 Patch Clearing flags on attachment: 136452 Committed r113782: <http://trac.webkit.org/changeset/113782> 599735 10 webkit.review.bot 2012-04-10 15:38:23 -0700 All reviewed patches have been landed. Closing bug. 135356 2012-04-03 10:26:53 -0700 2012-04-10 07:20:12 -0700 Patch bug-82757-20120403132652.patch text/plain 5862 tdresser U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGNkY2UyYTZjOGZlOGVhYjc4MzE0NDBmNjA3YzhjNzhlYWNhMTYzMGIuLjI1NmUzOTJlOTdkNTJj MGY2NjM1Y2RlYmNhOWI3Y2M5MDVhNDZiZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMDQtMDMgIFRpbSBEcmVzc2VyICA8dGRyZXNzZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gZGVmYXVsdERldmljZVNjYWxlRmFjdG9yICE9 IDAgc2hvdWxkIHNldCBkZXZpY2VTY2FsZUZhY3RvciA9IGRlZmF1bHREZXZpY2VTY2FsZUZhY3Rv ciBpbiB0aGUgYWJzZW5jZSBvZiBhIHZpZXdwb3J0IHRhZyBmb3IgZGVidWdnaW5nIHB1cnBvc2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mjc1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZXJl IGlzIG5vIHZpZXdwb3J0IHRhZywgdGhlIGRldmljZVNjYWxlRmFjdG9yIGlzIHNldCB0byB0aGUg ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yLgorICAgICAgICBUZXN0ZWQgYnk6IFdlYkZyYW1lVGVz dC5EZXZpY2VTY2FsZUZhY3RvclVzZXNEZWZhdWx0V2l0aG91dFZpZXdwb3J0VGFnLgorCisgICAg ICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNE aWRDaGFuZ2UpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCk6CisgICAgICAg IChXZWJLaXQ6OlRFU1RfRik6CisgICAgICAgICogdGVzdHMvZGF0YS9ub192aWV3cG9ydF90YWcu aHRtbDogQWRkZWQuCisKIDIwMTItMDQtMDMgIEJpbGwgQnVkZ2UgIDxiYnVkZ2VAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYlZpZXdJbXBsIGRvZXNuJ3Qgbm90aWZ5IHRoZSBwYWdlIHRoYXQg dGhlIHVzZXIgaGFzIGNhbmNlbGVkIGZ1bGxzY3JlZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCmluZGV4IDA2ODIyODVhZjhmM2MxNmE4YmUx ODNjYjJjNWNmNjJkNjRhYWZlNzguLjIwZDQ4ZGRmYjE4MjFkZWU4YjgwYjYzZmFmYTFjNzljNjIy Y2YzYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVu dEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudElt cGwuY3BwCkBAIC0zMTcsNyArMzE3LDcgQEAgV2ViTmF2aWdhdGlvblBvbGljeSBDaHJvbWVDbGll bnRJbXBsOjpnZXROYXZpZ2F0aW9uUG9saWN5KCkKICAgICAgICAgcG9saWN5ID0gV2ViTmF2aWdh dGlvblBvbGljeU5ld0JhY2tncm91bmRUYWI7CiAgICAgcmV0dXJuIHBvbGljeTsKIH0KLSAKKwog dm9pZCBDaHJvbWVDbGllbnRJbXBsOjpzaG93KCkKIHsKICAgICBpZiAoIW1fd2ViVmlldy0+Y2xp ZW50KCkpCkBAIC02NDQsMTEgKzY0NCwxMyBAQCB2b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3Bh dGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNvbnN0IFZpZXdwb3J0QXJndW1lbgogICAg IGlmICghbV93ZWJWaWV3LT5zZXR0aW5ncygpLT52aWV3cG9ydEVuYWJsZWQoKSB8fCAhbV93ZWJW aWV3LT5pc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQoKSB8fCAhbV93ZWJWaWV3LT5jbGllbnQoKSB8 fCAhbV93ZWJWaWV3LT5wYWdlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGJvb2wgdXNlRGVm YXVsdERldmljZVNjYWxlRmFjdG9yID0gZmFsc2U7CiAgICAgVmlld3BvcnRBcmd1bWVudHMgYXJn czsKLSAgICBpZiAoYXJndW1lbnRzID09IGFyZ3MpCisgICAgaWYgKGFyZ3VtZW50cyA9PSBhcmdz KSB7CiAgICAgICAgIC8vIERlZmF1bHQgdmlld3BvcnQgYXJndW1lbnRzIHBhc3NlZCBpbi4gVGhp cyBpcyBhIHNpZ25hbCB0byByZXNldCB0aGUgdmlld3BvcnQuCiAgICAgICAgIGFyZ3Mud2lkdGgg PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXNrdG9wV2lkdGg7Ci0gICAgZWxzZQorICAgICAg ICB1c2VEZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IgPSB0cnVlOworICAgIH0gZWxzZQogICAgICAg ICBhcmdzID0gYXJndW1lbnRzOwogCiAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3dlYlZp ZXctPm1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCk7CkBAIC02NzMsNyArNjc1LDEwIEBAIHZv aWQgQ2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2Uo Y29uc3QgVmlld3BvcnRBcmd1bWVuCiAKICAgICAvLyBGSVhNRTogSW52ZXN0aWdhdGUgdGhlIGlt cGFjdCB0aGlzIGhhcyBvbiBsYXlvdXQvcmVuZGVyaW5nIGlmIGFueS4KICAgICAvLyBUaGlzIGV4 cG9zZXMgdGhlIGNvcnJlY3QgZGV2aWNlIHNjYWxlIHRvIGphdmFzY3JpcHQgYW5kIG1lZGlhIHF1 ZXJpZXMuCi0gICAgbV93ZWJWaWV3LT5zZXREZXZpY2VTY2FsZUZhY3Rvcihjb21wdXRlZC5kZXZp Y2VQaXhlbFJhdGlvKTsKKyAgICBpZiAodXNlRGVmYXVsdERldmljZVNjYWxlRmFjdG9yICYmIHNl dHRpbmdzLT5kZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IoKSkKKyAgICAgICAgbV93ZWJWaWV3LT5z ZXREZXZpY2VTY2FsZUZhY3RvcihzZXR0aW5ncy0+ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yKCkp OworICAgIGVsc2UKKyAgICAgICAgbV93ZWJWaWV3LT5zZXREZXZpY2VTY2FsZUZhY3Rvcihjb21w dXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKICAgICBtX3dlYlZpZXctPnNldFBhZ2VTY2FsZUZhY3Rv ckxpbWl0cyhjb21wdXRlZC5taW5pbXVtU2NhbGUsIGNvbXB1dGVkLm1heGltdW1TY2FsZSk7CiAg ICAgbV93ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JQcmVzZXJ2aW5nU2Nyb2xsT2Zmc2V0KGNv bXB1dGVkLmluaXRpYWxTY2FsZSAqIGNvbXB1dGVkLmRldmljZVBpeGVsUmF0aW8pOwogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKaW5kZXgg YTY3MjMxOTViNjkzZjZjMWY0ZTcwY2JmZjM1YTk5ZThlZDUzMDkxNC4uYjc3YzM3MmYyNjE1YjZj NjJhZjk1ZTE0NTU3ZjkwNmFkNWY2NWY3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvV2ViRnJhbWVUZXN0LmNwcApAQCAtMzEsMTcgKzMxLDIwIEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAKICNpbmNsdWRlICJGcmFtZVRlc3RIZWxwZXJzLmgiCisjaW5jbHVkZSAiRnJhbWVW aWV3LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VFcnJvci5oIgogI2luY2x1ZGUgIldlYkRvY3VtZW50 LmgiCiAjaW5jbHVkZSAiV2ViRmluZE9wdGlvbnMuaCIKICNpbmNsdWRlICJXZWJGb3JtRWxlbWVu dC5oIgogI2luY2x1ZGUgIldlYkZyYW1lLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVDbGllbnQuaCIK KyNpbmNsdWRlICJXZWJGcmFtZUltcGwuaCIKICNpbmNsdWRlICJXZWJSYW5nZS5oIgogI2luY2x1 ZGUgIldlYlNjcmlwdFNvdXJjZS5oIgogI2luY2x1ZGUgIldlYlNlYXJjaGFibGVGb3JtRGF0YS5o IgogI2luY2x1ZGUgIldlYlNlY3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAiV2ViU2V0dGluZ3Mu aCIKKyNpbmNsdWRlICJXZWJWaWV3Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViVmlld0ltcGwuaCIK ICNpbmNsdWRlICJ2OC5oIgogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CkBAIC0xNTEsNiArMTU0 LDQwIEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIENocm9tZVBhZ2VOb0phdmFzY3JpcHQpCiAgICAg RVhQRUNUX0VRKHN0ZDo6c3RyaW5nOjpucG9zLCBjb250ZW50LmZpbmQoIkNsb2JiZXJlZCIpKTsK IH0KIAorI2lmIEVOQUJMRShWSUVXUE9SVCkKKworY2xhc3MgRml4ZWRMYXlvdXRUZXN0V2ViVmll d0NsaWVudCA6IHB1YmxpYyBXZWJWaWV3Q2xpZW50IHsKKyBwdWJsaWM6CisgICAgdmlydHVhbCBX ZWJSZWN0IHdpbmRvd1JlY3QoKSBPVkVSUklERSB7IHJldHVybiBtX3dpbmRvd1JlY3Q7IH0KKyAg ICB2aXJ0dWFsIFdlYlNjcmVlbkluZm8gc2NyZWVuSW5mbygpIE9WRVJSSURFIHsgcmV0dXJuIG1f c2NyZWVuSW5mbzsgfQorCisgICAgV2ViUmVjdCBtX3dpbmRvd1JlY3Q7CisgICAgV2ViU2NyZWVu SW5mbyBtX3NjcmVlbkluZm87Cit9OworCitURVNUX0YoV2ViRnJhbWVUZXN0LCBEZXZpY2VTY2Fs ZUZhY3RvclVzZXNEZWZhdWx0V2l0aG91dFZpZXdwb3J0VGFnKQoreworICAgIHJlZ2lzdGVyTW9j a2VkSHR0cFVSTExvYWQoIm5vX3ZpZXdwb3J0X3RhZy5odG1sIik7CisKKyAgICBpbnQgdmlld3Bv cnRXaWR0aCA9IDY0MDsKKyAgICBpbnQgdmlld3BvcnRIZWlnaHQgPSA0ODA7CisKKyAgICBGaXhl ZExheW91dFRlc3RXZWJWaWV3Q2xpZW50IGNsaWVudDsKKyAgICBjbGllbnQubV9zY3JlZW5JbmZv Lmhvcml6b250YWxEUEkgPSAxNjA7CisgICAgY2xpZW50Lm1fd2luZG93UmVjdCA9IFdlYlJlY3Qo MCwgMCwgdmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpOworCisgICAgV2ViVmlld0ltcGwq IHdlYlZpZXdJbXBsID0gc3RhdGljX2Nhc3Q8V2ViVmlld0ltcGwqPihGcmFtZVRlc3RIZWxwZXJz OjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAibm9fdmlld3BvcnRfdGFnLmh0bWwi LCB0cnVlLCAwLCAmY2xpZW50KSk7CisKKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUo dmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+c2V0dGlu Z3MoKS0+c2V0Vmlld3BvcnRFbmFibGVkKHRydWUpOworICAgIHdlYlZpZXdJbXBsLT5zZXR0aW5n cygpLT5zZXREZWZhdWx0RGV2aWNlU2NhbGVGYWN0b3IoMik7CisgICAgd2ViVmlld0ltcGwtPmVu YWJsZUZpeGVkTGF5b3V0TW9kZSh0cnVlKTsKKyAgICB3ZWJWaWV3SW1wbC0+bWFpbkZyYW1lSW1w bCgpLT5mcmFtZVZpZXcoKS0+bGF5b3V0KCk7CisKKyAgICBFWFBFQ1RfRVEoMiwgd2ViVmlld0lt cGwtPmRldmljZVNjYWxlRmFjdG9yKCkpOworfQorI2VuZGlmCisKICNpZiBFTkFCTEUoR0VTVFVS RV9FVkVOVFMpCiBURVNUX0YoV2ViRnJhbWVUZXN0LCBGQUlMU19EaXZBdXRvWm9vbVBhcmFtc1Rl c3QpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvbm9f dmlld3BvcnRfdGFnLmh0bWwgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvbm9f dmlld3BvcnRfdGFnLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOWJhOTgxNTc0NjRkMzNkODdlYjFhZjYyOGNj NzNkNTQxZWQ0YTFiZAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvZGF0YS9ub192aWV3cG9ydF90YWcuaHRtbApAQCAtMCwwICsxLDUgQEAKKzxodG1sPgor ICA8Ym9keT4KKyAgICA8cD4gVGVzdCA8L3A+CisgIDwvYm9keT4KKzwvaHRtbD4K 136452 2012-04-10 07:20:17 -0700 2012-04-10 15:38:18 -0700 Patch bug-82757-20120410102016.patch text/plain 5470 tdresser U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDAwMGM4ZDQ3MWY3MzBlYmE3YTQyMDk5Nzc5NTY4ODhmMjdkNGZhN2YuLjQ1MDMxMTJjYThmN2U2 YjVhOTNjYzg0OGM0M2VkODkyYTdkNjEyMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMDQtMTAgIFRpbSBEcmVzc2VyICA8dGRyZXNzZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gZGVmYXVsdERldmljZVNjYWxlRmFjdG9yICE9 IDAgc2hvdWxkIHNldCBkZXZpY2VTY2FsZUZhY3RvciA9IGRlZmF1bHREZXZpY2VTY2FsZUZhY3Rv ciBpbiB0aGUgYWJzZW5jZSBvZiBhIHZpZXdwb3J0IHRhZyBmb3IgZGVidWdnaW5nIHB1cnBvc2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mjc1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZXJl IGlzIG5vIHZpZXdwb3J0IHRhZywgdGhlIGRldmljZVNjYWxlRmFjdG9yIGlzIHNldCB0byB0aGUg ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yLgorICAgICAgICBUZXN0ZWQgYnk6IFdlYkZyYW1lVGVz dC5EZXZpY2VTY2FsZUZhY3RvclVzZXNEZWZhdWx0V2l0aG91dFZpZXdwb3J0VGFnLgorCisgICAg ICAgICogc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0KToKKyAgICAg ICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNE aWRDaGFuZ2UpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCk6CisgICAgICAg IChXZWJLaXQ6OlRFU1RfRik6CisgICAgICAgICogdGVzdHMvZGF0YS9ub192aWV3cG9ydF90YWcu aHRtbDogQWRkZWQuCisKIDIwMTItMDQtMDkgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRGV2aWNlIE1ldHJpY3NdIElu dHJvZHVjZSB0aGUgIkZpdCB3aW5kb3ciIG9wdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcAppbmRleCBmYzY3NGExMGY5M2U0ZTczNGZjMjdm ZWQyNGJiMDdkMzIxMGFlNTI5Li40MjczNWE0NmQ5MmUxYzA4NzAwNjZiZjliNGNmOWQ5ZDM1YjNh ZmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBs LmNwcApAQCAtMzE4LDcgKzMxOCw3IEBAIFdlYk5hdmlnYXRpb25Qb2xpY3kgQ2hyb21lQ2xpZW50 SW1wbDo6Z2V0TmF2aWdhdGlvblBvbGljeSgpCiAgICAgICAgIHBvbGljeSA9IFdlYk5hdmlnYXRp b25Qb2xpY3lOZXdCYWNrZ3JvdW5kVGFiOwogICAgIHJldHVybiBwb2xpY3k7CiB9Ci0gCisKIHZv aWQgQ2hyb21lQ2xpZW50SW1wbDo6c2hvdygpCiB7CiAgICAgaWYgKCFtX3dlYlZpZXctPmNsaWVu dCgpKQpAQCAtNjQ1LDExICs2NDUsMTMgQEAgdm9pZCBDaHJvbWVDbGllbnRJbXBsOjpkaXNwYXRj aFZpZXdwb3J0UHJvcGVydGllc0RpZENoYW5nZShjb25zdCBWaWV3cG9ydEFyZ3VtZW4KICAgICBp ZiAoIW1fd2ViVmlldy0+c2V0dGluZ3MoKS0+dmlld3BvcnRFbmFibGVkKCkgfHwgIW1fd2ViVmll dy0+aXNGaXhlZExheW91dE1vZGVFbmFibGVkKCkgfHwgIW1fd2ViVmlldy0+Y2xpZW50KCkgfHwg IW1fd2ViVmlldy0+cGFnZSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBib29sIHVzZURlZmF1 bHREZXZpY2VTY2FsZUZhY3RvciA9IGZhbHNlOwogICAgIFZpZXdwb3J0QXJndW1lbnRzIGFyZ3M7 Ci0gICAgaWYgKGFyZ3VtZW50cyA9PSBhcmdzKQorICAgIGlmIChhcmd1bWVudHMgPT0gYXJncykg ewogICAgICAgICAvLyBEZWZhdWx0IHZpZXdwb3J0IGFyZ3VtZW50cyBwYXNzZWQgaW4uIFRoaXMg aXMgYSBzaWduYWwgdG8gcmVzZXQgdGhlIHZpZXdwb3J0LgogICAgICAgICBhcmdzLndpZHRoID0g Vmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGVza3RvcFdpZHRoOwotICAgIGVsc2UKKyAgICAgICAg dXNlRGVmYXVsdERldmljZVNjYWxlRmFjdG9yID0gdHJ1ZTsKKyAgICB9IGVsc2UKICAgICAgICAg YXJncyA9IGFyZ3VtZW50czsKIAogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJWaWV3 LT5tYWluRnJhbWVJbXBsKCktPmZyYW1lVmlldygpOwpAQCAtNjc0LDcgKzY3NiwxMCBAQCB2b2lk IENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNv bnN0IFZpZXdwb3J0QXJndW1lbgogCiAgICAgLy8gRklYTUU6IEludmVzdGlnYXRlIHRoZSBpbXBh Y3QgdGhpcyBoYXMgb24gbGF5b3V0L3JlbmRlcmluZyBpZiBhbnkuCiAgICAgLy8gVGhpcyBleHBv c2VzIHRoZSBjb3JyZWN0IGRldmljZSBzY2FsZSB0byBqYXZhc2NyaXB0IGFuZCBtZWRpYSBxdWVy aWVzLgotICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IoY29tcHV0ZWQuZGV2aWNl UGl4ZWxSYXRpbyk7CisgICAgaWYgKHVzZURlZmF1bHREZXZpY2VTY2FsZUZhY3RvciAmJiBzZXR0 aW5ncy0+ZGVmYXVsdERldmljZVNjYWxlRmFjdG9yKCkpCisgICAgICAgIG1fd2ViVmlldy0+c2V0 RGV2aWNlU2NhbGVGYWN0b3Ioc2V0dGluZ3MtPmRlZmF1bHREZXZpY2VTY2FsZUZhY3RvcigpKTsK KyAgICBlbHNlCisgICAgICAgIG1fd2ViVmlldy0+c2V0RGV2aWNlU2NhbGVGYWN0b3IoY29tcHV0 ZWQuZGV2aWNlUGl4ZWxSYXRpbyk7CiAgICAgbV93ZWJWaWV3LT5zZXRQYWdlU2NhbGVGYWN0b3JM aW1pdHMoY29tcHV0ZWQubWluaW11bVNjYWxlLCBjb21wdXRlZC5tYXhpbXVtU2NhbGUpOwogICAg IG1fd2ViVmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9sbE9mZnNldChjb21w dXRlZC5pbml0aWFsU2NhbGUgKiBjb21wdXRlZC5kZXZpY2VQaXhlbFJhdGlvKTsKICNlbmRpZgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IGE2 NzIzMTk1YjY5M2Y2YzFmNGU3MGNiZmYzNWE5OWU4ZWQ1MzA5MTQuLmFjNGQwOTFjZGQyMjRlMzJh NDc1YzZhZjg4MTczMjkwYzExMjhhMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rl c3RzL1dlYkZyYW1lVGVzdC5jcHAKQEAgLTQyLDYgKzQyLDcgQEAKICNpbmNsdWRlICJXZWJTZWFy Y2hhYmxlRm9ybURhdGEuaCIKICNpbmNsdWRlICJXZWJTZWN1cml0eVBvbGljeS5oIgogI2luY2x1 ZGUgIldlYlNldHRpbmdzLmgiCisjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgogI2luY2x1ZGUg IldlYlZpZXdJbXBsLmgiCiAjaW5jbHVkZSAidjguaCIKICNpbmNsdWRlIDxndGVzdC9ndGVzdC5o PgpAQCAtMTUxLDYgKzE1Miw0MCBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBDaHJvbWVQYWdlTm9K YXZhc2NyaXB0KQogICAgIEVYUEVDVF9FUShzdGQ6OnN0cmluZzo6bnBvcywgY29udGVudC5maW5k KCJDbG9iYmVyZWQiKSk7CiB9CiAKKyNpZiBFTkFCTEUoVklFV1BPUlQpCisKK2NsYXNzIEZpeGVk TGF5b3V0VGVzdFdlYlZpZXdDbGllbnQgOiBwdWJsaWMgV2ViVmlld0NsaWVudCB7CisgcHVibGlj OgorICAgIHZpcnR1YWwgV2ViUmVjdCB3aW5kb3dSZWN0KCkgT1ZFUlJJREUgeyByZXR1cm4gbV93 aW5kb3dSZWN0OyB9CisgICAgdmlydHVhbCBXZWJTY3JlZW5JbmZvIHNjcmVlbkluZm8oKSBPVkVS UklERSB7IHJldHVybiBtX3NjcmVlbkluZm87IH0KKworICAgIFdlYlJlY3QgbV93aW5kb3dSZWN0 OworICAgIFdlYlNjcmVlbkluZm8gbV9zY3JlZW5JbmZvOworfTsKKworVEVTVF9GKFdlYkZyYW1l VGVzdCwgRGV2aWNlU2NhbGVGYWN0b3JVc2VzRGVmYXVsdFdpdGhvdXRWaWV3cG9ydFRhZykKK3sK KyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJub192aWV3cG9ydF90YWcuaHRtbCIpOwor CisgICAgaW50IHZpZXdwb3J0V2lkdGggPSA2NDA7CisgICAgaW50IHZpZXdwb3J0SGVpZ2h0ID0g NDgwOworCisgICAgRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisgICAgY2xp ZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFsRFBJID0gMTYwOworICAgIGNsaWVudC5tX3dpbmRv d1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdwb3J0V2lkdGgsIHZpZXdwb3J0SGVpZ2h0KTsKKwor ICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBzdGF0aWNfY2FzdDxXZWJWaWV3Kj4oRnJhbWVUZXN0SGVs cGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgIm5vX3ZpZXdwb3J0X3RhZy5o dG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOworCisgICAgd2ViVmlldy0+cmVzaXplKFdlYlNpemUo dmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKKyAgICB3ZWJWaWV3LT5zZXR0aW5ncygp LT5zZXRWaWV3cG9ydEVuYWJsZWQodHJ1ZSk7CisgICAgd2ViVmlldy0+c2V0dGluZ3MoKS0+c2V0 RGVmYXVsdERldmljZVNjYWxlRmFjdG9yKDIpOworICAgIHdlYlZpZXctPmVuYWJsZUZpeGVkTGF5 b3V0TW9kZSh0cnVlKTsKKyAgICB3ZWJWaWV3LT5sYXlvdXQoKTsKKworICAgIEVYUEVDVF9FUSgy LCB3ZWJWaWV3LT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKK30KKyNlbmRpZgorCiAjaWYgRU5BQkxF KEdFU1RVUkVfRVZFTlRTKQogVEVTVF9GKFdlYkZyYW1lVGVzdCwgRkFJTFNfRGl2QXV0b1pvb21Q YXJhbXNUZXN0KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9k YXRhL25vX3ZpZXdwb3J0X3RhZy5odG1sIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9k YXRhL25vX3ZpZXdwb3J0X3RhZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjliYTk4MTU3NDY0ZDMzZDg3ZWIx YWY2MjhjYzczZDU0MWVkNGExYmQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL2RhdGEvbm9fdmlld3BvcnRfdGFnLmh0bWwKQEAgLTAsMCArMSw1IEBACis8 aHRtbD4KKyAgPGJvZHk+CisgICAgPHA+IFRlc3QgPC9wPgorICA8L2JvZHk+Cis8L2h0bWw+Cg==