101767 2012-11-09 08:54:38 -0800 [chromium] Use devicePixelRatio instead of screen DPI for computing viewport attributes 2012-11-19 06:44:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101769 1 skyostil skyostil abarth fsamuel johnme webkit.review.bot oldest_to_newest 763049 0 skyostil 2012-11-09 08:54:38 -0800 [chromium] Use devicePixelRatio instead of screen DPI for computing viewport attributes 763057 1 173318 skyostil 2012-11-09 08:59:01 -0800 Created attachment 173318 Patch 763062 2 skyostil 2012-11-09 09:01:15 -0800 Note: this depends on https://codereview.chromium.org/11348033/. 763093 3 173318 abarth 2012-11-09 09:35:21 -0800 Comment on attachment 173318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173318&action=review > Source/WebKit/chromium/src/ChromeClientImpl.cpp:625 > - float devicePixelRatio = dpi / ViewportArguments::deprecatedTargetDPI; > + float devicePixelRatio = m_webView->client()->screenInfo().deviceScaleFactor; m_webView->client() -> client (We already have the client in a local variable. 763104 4 173330 skyostil 2012-11-09 09:49:50 -0800 Created attachment 173330 Patch Use existing pointer to client. 764321 5 johnme 2012-11-12 05:56:18 -0800 Looks good to me - thanks! Hopefully once the other platforms have done this too we'll be able to get rid of ViewportArguments::deprecatedTargetDPI. 770686 6 173330 webkit.review.bot 2012-11-19 06:44:12 -0800 Comment on attachment 173330 Patch Clearing flags on attachment: 173330 Committed r135150: <http://trac.webkit.org/changeset/135150> 770687 7 webkit.review.bot 2012-11-19 06:44:16 -0800 All reviewed patches have been landed. Closing bug. 173318 2012-11-09 08:59:01 -0800 2012-11-09 09:49:46 -0800 Patch bug-101767-20121109165708.patch text/plain 4126 skyostil U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQ1ODZmYmE0MzIyMzkyZGVjYmI3NTNjYzRkYzBiNGEwMDE0ODFhZGIuLjVmYTc2NjAzNmZkZWI4 NDZjOWJlNDdhODM4YTAzNTQzMmE2OGRmMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMTEtMDkgIFNhbWkgS3lvc3RpbGEgIDxza3lvc3RpbEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVc2UgZGV2aWNlUGl4ZWxSYXRpbyBpbnN0 ZWFkIG9mIHNjcmVlbiBEUEkgZm9yIGNvbXB1dGluZyB2aWV3cG9ydCBhdHRyaWJ1dGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE3NjcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgdGhlIG5ld2x5 IGludHJvZHVjZSBkZXZpY2Ugc2NhbGUgZmFjdG9yIHRvIGNhbGN1bGF0ZSB2aWV3cG9ydCBwcm9w ZXJ0aWVzCisgICAgICAgIGluc3RlYWQgb2YgdXNpbmcgdGhlIHNjcmVlbiBEUEkuIE5vIGZ1bmN0 aW9uYWwgY2hhbmdlcywgYmVjYXVzZSBDaHJvbWl1bQorICAgICAgICBwbGF0Zm9ybXMgdGhhdCBo YXZlIFZJRVdQT1JUIGVuYWJsZWQgbm93IGFsc28gaW5pdGlhbGl6ZSB0aGUgZGV2aWNlIHNjYWxl CisgICAgICAgIGZhY3RvciBhY2NvcmRpbmdseS4KKworICAgICAgICAqIHNyYy9DaHJvbWVDbGll bnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hW aWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVz dC5jcHA6CisKIDIwMTItMTEtMDggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21h aWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzQwMTAuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCmluZGV4IDk0 OTU5MzgwYTYwNmQ5ZDEyZTdiZjk3NTUyYWZjNGJhNmNjZDliZTYuLjFiMmUyOGE2OWQ4MGJmY2M1 NGIzYjdmZWU0NDIxMmRmYjQwNWZlN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02MTUsMTAgKzYxNSw2IEBAIHZvaWQgQ2hyb21l Q2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmll d3BvcnRBcmd1bWVuCiAgICAgaWYgKCFtX3dlYlZpZXctPnNldHRpbmdzKCktPnZpZXdwb3J0RW5h YmxlZCgpIHx8ICFtX3dlYlZpZXctPmlzRml4ZWRMYXlvdXRNb2RlRW5hYmxlZCgpIHx8ICFtX3dl YlZpZXctPmNsaWVudCgpIHx8ICFtX3dlYlZpZXctPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3dlYlZpZXctPm1haW5GcmFtZUltcGwoKS0+ ZnJhbWVWaWV3KCk7Ci0gICAgaW50IGRwaSA9IHNjcmVlbkhvcml6b250YWxEUEkoZnJhbWVWaWV3 KTsKLSAgICBBU1NFUlQoZHBpID4gMCk7Ci0KICAgICBXZWJWaWV3Q2xpZW50KiBjbGllbnQgPSBt X3dlYlZpZXctPmNsaWVudCgpOwogICAgIFdlYlJlY3QgZGV2aWNlUmVjdCA9IGNsaWVudC0+d2lu ZG93UmVjdCgpOwogICAgIC8vIElmIHRoZSB3aW5kb3cgc2l6ZSBoYXMgbm90IGJlZW4gc2V0IHll dCBkb24ndCBhdHRlbXB0IHRvIHNldCB0aGUgdmlld3BvcnQKQEAgLTYyNiw3ICs2MjIsNyBAQCB2 b2lkIENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdl KGNvbnN0IFZpZXdwb3J0QXJndW1lbgogICAgICAgICByZXR1cm47CiAKICAgICBTZXR0aW5ncyog c2V0dGluZ3MgPSBtX3dlYlZpZXctPnBhZ2UoKS0+c2V0dGluZ3MoKTsKLSAgICBmbG9hdCBkZXZp Y2VQaXhlbFJhdGlvID0gZHBpIC8gVmlld3BvcnRBcmd1bWVudHM6OmRlcHJlY2F0ZWRUYXJnZXRE UEk7CisgICAgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbyA9IG1fd2ViVmlldy0+Y2xpZW50KCktPnNj cmVlbkluZm8oKS5kZXZpY2VTY2FsZUZhY3RvcjsKICAgICAvLyBDYWxsIHRoZSBjb21tb24gdmll d3BvcnQgY29tcHV0aW5nIGxvZ2ljIGluIFZpZXdwb3J0QXJndW1lbnRzLmNwcC4KICAgICBWaWV3 cG9ydEF0dHJpYnV0ZXMgY29tcHV0ZWQgPSBjb21wdXRlVmlld3BvcnRBdHRyaWJ1dGVzKAogICAg ICAgICBhcmd1bWVudHMsIHNldHRpbmdzLT5sYXlvdXRGYWxsYmFja1dpZHRoKCksIGRldmljZVJl Y3Qud2lkdGgsIGRldmljZVJlY3QuaGVpZ2h0LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IGZmZWQzYzIwMzgxNDRlMTEyNzczODhjYzI1NWMy MjUwY2U0ZDlkNTEuLmE0ZTI0YThmMDU3MDUwZmE5MDdiNWE5NzE0ZmQ3OGZmMWMzMDdkMzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKQEAgLTIz NSw3ICsyMzUsNyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBEZXZpY2VTY2FsZUZhY3RvclVzZXNE ZWZhdWx0V2l0aG91dFZpZXdwb3J0VGFnKQogICAgIGludCB2aWV3cG9ydEhlaWdodCA9IDQ4MDsK IAogICAgIEZpeGVkTGF5b3V0VGVzdFdlYlZpZXdDbGllbnQgY2xpZW50OwotICAgIGNsaWVudC5t X3NjcmVlbkluZm8uaG9yaXpvbnRhbERQSSA9IDMyMDsKKyAgICBjbGllbnQubV9zY3JlZW5JbmZv LmRldmljZVNjYWxlRmFjdG9yID0gMjsKICAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVj dCgwLCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCk7CiAKICAgICBXZWJWaWV3KiB3 ZWJWaWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmlldyo+KEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdl YlZpZXdBbmRMb2FkKG1fYmFzZVVSTCArICJub192aWV3cG9ydF90YWcuaHRtbCIsIHRydWUsIDAs ICZjbGllbnQpKTsKQEAgLTI2MCw3ICsyNjAsNyBAQCBURVNUX0YoV2ViRnJhbWVUZXN0LCBGaXhl ZExheW91dEluaXRpYWxpemVBdE1pbmltdW1QYWdlU2NhbGUpCiAgICAgcmVnaXN0ZXJNb2NrZWRI dHRwVVJMTG9hZCgiZml4ZWRfbGF5b3V0Lmh0bWwiKTsKIAogICAgIEZpeGVkTGF5b3V0VGVzdFdl YlZpZXdDbGllbnQgY2xpZW50OwotICAgIGNsaWVudC5tX3NjcmVlbkluZm8uaG9yaXpvbnRhbERQ SSA9IDE2MDsKKyAgICBjbGllbnQubV9zY3JlZW5JbmZvLmRldmljZVNjYWxlRmFjdG9yID0gMTsK ICAgICBpbnQgdmlld3BvcnRXaWR0aCA9IDY0MDsKICAgICBpbnQgdmlld3BvcnRIZWlnaHQgPSA0 ODA7CiAgICAgY2xpZW50Lm1fd2luZG93UmVjdCA9IFdlYlJlY3QoMCwgMCwgdmlld3BvcnRXaWR0 aCwgdmlld3BvcnRIZWlnaHQpOwpAQCAtMjk4LDcgKzI5OCw3IEBAIFRFU1RfRihXZWJGcmFtZVRl c3QsIENhbk92ZXJyaWRlTWF4aW11bVNjYWxlRmFjdG9yKQogICAgIHJlZ2lzdGVyTW9ja2VkSHR0 cFVSTExvYWQoIm5vX3NjYWxlX2Zvcl95b3UuaHRtbCIpOwogCiAgICAgRml4ZWRMYXlvdXRUZXN0 V2ViVmlld0NsaWVudCBjbGllbnQ7Ci0gICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFs RFBJID0gMTYwOworICAgIGNsaWVudC5tX3NjcmVlbkluZm8uZGV2aWNlU2NhbGVGYWN0b3IgPSAx OwogICAgIGludCB2aWV3cG9ydFdpZHRoID0gNjQwOwogICAgIGludCB2aWV3cG9ydEhlaWdodCA9 IDQ4MDsKICAgICBjbGllbnQubV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9ydFdp ZHRoLCB2aWV3cG9ydEhlaWdodCk7Cg== 173330 2012-11-09 09:49:50 -0800 2012-11-19 06:44:12 -0800 Patch bug-101767-20121109174757.patch text/plain 4110 skyostil U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQ1ODZmYmE0MzIyMzkyZGVjYmI3NTNjYzRkYzBiNGEwMDE0ODFhZGIuLmIxMTZjMDhkMzZjYzk3 YTZiODhkNWFkNzVlYWFhMTg4YWE3ZmQ4ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMTEtMDkgIFNhbWkgS3lvc3RpbGEgIDxza3lvc3RpbEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVc2UgZGV2aWNlUGl4ZWxSYXRpbyBpbnN0 ZWFkIG9mIHNjcmVlbiBEUEkgZm9yIGNvbXB1dGluZyB2aWV3cG9ydCBhdHRyaWJ1dGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE3NjcKKworICAg ICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFVzZSB0aGUgbmV3bHkgaW50 cm9kdWNlZCBkZXZpY2Ugc2NhbGUgZmFjdG9yIHRvIGNhbGN1bGF0ZSB2aWV3cG9ydCBwcm9wZXJ0 aWVzCisgICAgICAgIGluc3RlYWQgb2YgdXNpbmcgdGhlIHNjcmVlbiBEUEkuIE5vIGZ1bmN0aW9u YWwgY2hhbmdlcywgYmVjYXVzZSBDaHJvbWl1bQorICAgICAgICBwbGF0Zm9ybXMgdGhhdCBoYXZl IFZJRVdQT1JUIGVuYWJsZWQgbm93IGFsc28gaW5pdGlhbGl6ZSB0aGUgZGV2aWNlIHNjYWxlCisg ICAgICAgIGZhY3RvciBhY2NvcmRpbmdseS4KKworICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6ZGlzcGF0Y2hWaWV3 cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5j cHA6CisKIDIwMTItMTEtMDggIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzQwMTAuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCmluZGV4IDk0OTU5 MzgwYTYwNmQ5ZDEyZTdiZjk3NTUyYWZjNGJhNmNjZDliZTYuLjVjMmJhMjFmOGRmMTM4MmJjZWE0 OWU1MDE0OTBiNTk3ZDFkOTBhZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0Nocm9tZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0Nocm9tZUNsaWVudEltcGwuY3BwCkBAIC02MTUsMTAgKzYxNSw2IEBAIHZvaWQgQ2hyb21lQ2xp ZW50SW1wbDo6ZGlzcGF0Y2hWaWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgVmlld3Bv cnRBcmd1bWVuCiAgICAgaWYgKCFtX3dlYlZpZXctPnNldHRpbmdzKCktPnZpZXdwb3J0RW5hYmxl ZCgpIHx8ICFtX3dlYlZpZXctPmlzRml4ZWRMYXlvdXRNb2RlRW5hYmxlZCgpIHx8ICFtX3dlYlZp ZXctPmNsaWVudCgpIHx8ICFtX3dlYlZpZXctPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3dlYlZpZXctPm1haW5GcmFtZUltcGwoKS0+ZnJh bWVWaWV3KCk7Ci0gICAgaW50IGRwaSA9IHNjcmVlbkhvcml6b250YWxEUEkoZnJhbWVWaWV3KTsK LSAgICBBU1NFUlQoZHBpID4gMCk7Ci0KICAgICBXZWJWaWV3Q2xpZW50KiBjbGllbnQgPSBtX3dl YlZpZXctPmNsaWVudCgpOwogICAgIFdlYlJlY3QgZGV2aWNlUmVjdCA9IGNsaWVudC0+d2luZG93 UmVjdCgpOwogICAgIC8vIElmIHRoZSB3aW5kb3cgc2l6ZSBoYXMgbm90IGJlZW4gc2V0IHlldCBk b24ndCBhdHRlbXB0IHRvIHNldCB0aGUgdmlld3BvcnQKQEAgLTYyNiw3ICs2MjIsNyBAQCB2b2lk IENocm9tZUNsaWVudEltcGw6OmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVzRGlkQ2hhbmdlKGNv bnN0IFZpZXdwb3J0QXJndW1lbgogICAgICAgICByZXR1cm47CiAKICAgICBTZXR0aW5ncyogc2V0 dGluZ3MgPSBtX3dlYlZpZXctPnBhZ2UoKS0+c2V0dGluZ3MoKTsKLSAgICBmbG9hdCBkZXZpY2VQ aXhlbFJhdGlvID0gZHBpIC8gVmlld3BvcnRBcmd1bWVudHM6OmRlcHJlY2F0ZWRUYXJnZXREUEk7 CisgICAgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbyA9IGNsaWVudC0+c2NyZWVuSW5mbygpLmRldmlj ZVNjYWxlRmFjdG9yOwogICAgIC8vIENhbGwgdGhlIGNvbW1vbiB2aWV3cG9ydCBjb21wdXRpbmcg bG9naWMgaW4gVmlld3BvcnRBcmd1bWVudHMuY3BwLgogICAgIFZpZXdwb3J0QXR0cmlidXRlcyBj b21wdXRlZCA9IGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMoCiAgICAgICAgIGFyZ3VtZW50cywg c2V0dGluZ3MtPmxheW91dEZhbGxiYWNrV2lkdGgoKSwgZGV2aWNlUmVjdC53aWR0aCwgZGV2aWNl UmVjdC5oZWlnaHQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YkZyYW1lVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVz dC5jcHAKaW5kZXggZmZlZDNjMjAzODE0NGUxMTI3NzM4OGNjMjU1YzIyNTBjZTRkOWQ1MS4uYTRl MjRhOGYwNTcwNTBmYTkwN2I1YTk3MTRmZDc4ZmYxYzMwN2QzMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcApAQCAtMjM1LDcgKzIzNSw3IEBAIFRF U1RfRihXZWJGcmFtZVRlc3QsIERldmljZVNjYWxlRmFjdG9yVXNlc0RlZmF1bHRXaXRob3V0Vmll d3BvcnRUYWcpCiAgICAgaW50IHZpZXdwb3J0SGVpZ2h0ID0gNDgwOwogCiAgICAgRml4ZWRMYXlv dXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7Ci0gICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jp em9udGFsRFBJID0gMzIwOworICAgIGNsaWVudC5tX3NjcmVlbkluZm8uZGV2aWNlU2NhbGVGYWN0 b3IgPSAyOwogICAgIGNsaWVudC5tX3dpbmRvd1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdwb3J0 V2lkdGgsIHZpZXdwb3J0SGVpZ2h0KTsKIAogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBzdGF0aWNf Y2FzdDxXZWJWaWV3Kj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9i YXNlVVJMICsgIm5vX3ZpZXdwb3J0X3RhZy5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOwpAQCAt MjYwLDcgKzI2MCw3IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIEZpeGVkTGF5b3V0SW5pdGlhbGl6 ZUF0TWluaW11bVBhZ2VTY2FsZSkKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJmaXhl ZF9sYXlvdXQuaHRtbCIpOwogCiAgICAgRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCBjbGll bnQ7Ci0gICAgY2xpZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFsRFBJID0gMTYwOworICAgIGNs aWVudC5tX3NjcmVlbkluZm8uZGV2aWNlU2NhbGVGYWN0b3IgPSAxOwogICAgIGludCB2aWV3cG9y dFdpZHRoID0gNjQwOwogICAgIGludCB2aWV3cG9ydEhlaWdodCA9IDQ4MDsKICAgICBjbGllbnQu bV93aW5kb3dSZWN0ID0gV2ViUmVjdCgwLCAwLCB2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdo dCk7CkBAIC0yOTgsNyArMjk4LDcgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgQ2FuT3ZlcnJpZGVN YXhpbXVtU2NhbGVGYWN0b3IpCiAgICAgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCgibm9fc2Nh bGVfZm9yX3lvdS5odG1sIik7CiAKICAgICBGaXhlZExheW91dFRlc3RXZWJWaWV3Q2xpZW50IGNs aWVudDsKLSAgICBjbGllbnQubV9zY3JlZW5JbmZvLmhvcml6b250YWxEUEkgPSAxNjA7CisgICAg Y2xpZW50Lm1fc2NyZWVuSW5mby5kZXZpY2VTY2FsZUZhY3RvciA9IDE7CiAgICAgaW50IHZpZXdw b3J0V2lkdGggPSA2NDA7CiAgICAgaW50IHZpZXdwb3J0SGVpZ2h0ID0gNDgwOwogICAgIGNsaWVu dC5tX3dpbmRvd1JlY3QgPSBXZWJSZWN0KDAsIDAsIHZpZXdwb3J0V2lkdGgsIHZpZXdwb3J0SGVp Z2h0KTsK