158597 2016-06-09 19:33:29 -0700 Add testing support for 3x device scale factor. 2016-06-10 09:41:14 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=158618 P2 Normal --- 1 zalan zalan commit-queue lforschler ryanhaddad simon.fraser oldest_to_newest 1201094 0 zalan 2016-06-09 19:33:29 -0700 Set 3x device scale factor on the test canvas when the test url is prefixed with hidpi-3x-. 1201104 1 280977 zalan 2016-06-09 19:52:47 -0700 Created attachment 280977 Patch 1201130 2 280977 commit-queue 2016-06-09 20:29:29 -0700 Comment on attachment 280977 Patch Clearing flags on attachment: 280977 Committed r201904: <http://trac.webkit.org/changeset/201904> 1201131 3 commit-queue 2016-06-09 20:29:33 -0700 All reviewed patches have been landed. Closing bug. 280977 2016-06-09 19:52:47 -0700 2016-06-09 20:29:29 -0700 Patch bug-158597-20160609195416.patch text/plain 7126 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNzExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTJmMDVhNjI5N2RiYTlhM2U1ZmI4N2IxYjAwYTI1ODY2 OTgwNGJmMy4uYTcyZTA4NmU4OTc2YmYxZTRmNWNlZDhkNDliYTM1NzhlYmM2ZTQyMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE2LTA2LTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIHRlc3Rpbmcgc3VwcG9ydCBmb3IgM3ggZGV2aWNlIHNjYWxlIGZhY3Rvci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODU5NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCAzeCBkZXZpY2Ug c2NhbGUgZmFjdG9yIG9uIHRoZSB0ZXN0IGNhbnZhcyB3aGVuIHRoZSB0ZXN0IHVybCBpcyBwcmVm aXhlZCB3aXRoIGhpZHBpLTN4LS4gCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW06CisgICAgICAgIChjaGFuZ2VXaW5kb3dTY2FsZUlmTmVlZGVkKToKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdU Ujo6VGVzdENvbnRyb2xsZXI6OnVwZGF0ZVdpbmRvd1NjYWxlRm9yVGVzdCk6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5jcHA6CisgICAgICAgIChXVFI6OmRldmljZVNj YWxlRmFjdG9yRm9yVGVzdCk6CisgICAgICAgIChXVFI6OlRlc3RPcHRpb25zOjpUZXN0T3B0aW9u cyk6CisgICAgICAgIChXVFI6OmlzSGlEUElUZXN0UGF0aCk6IERlbGV0ZWQuCisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0aW9ucy5oOgorCiAyMDE2LTA2LTA0ICBBbGV4ZXkgUHJv c2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMDEyNjMp OiBTb21lIHRlc3RzIGhhdmUgYmVjb21lIGZsYWt5IHRpbWVvdXRzLgpkaWZmIC0tZ2l0IGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCmluZGV4IDE2MTViYjkyODczNTJjYTYzYmQ3MTEx ZGNmOGYzOTQ3Njc3ZGEyZTEuLjk5MjAyMDUwZGI1OGFjNzI2YzNhN2YxZTdlYWY3YjE4Y2Y3YmQ2 ZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5t bQorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KQEAgLTE2 MDksMTYgKzE2MDksMTggQEAgc3RhdGljIHZvaWQgZHVtcEJhY2tGb3J3YXJkTGlzdEZvcldlYlZp ZXcoV2ViVmlldyAqdmlldykKICNpZiAhUExBVEZPUk0oSU9TKQogc3RhdGljIHZvaWQgY2hhbmdl V2luZG93U2NhbGVJZk5lZWRlZChjb25zdCBjaGFyKiB0ZXN0UGF0aE9yVVIpCiB7Ci0gICAgYm9v bCBoYXNIaWdoRFBJV2luZG93ID0gW1tbbWFpbkZyYW1lIHdlYlZpZXddIHdpbmRvd10gYmFja2lu Z1NjYWxlRmFjdG9yXSAhPSAxOwogICAgIFdURjo6U3RyaW5nIGxvY2FsUGF0aE9yVXJsID0gU3Ry aW5nKHRlc3RQYXRoT3JVUik7Ci0gICAgYm9vbCBuZWVkc0hpZ2hEUElXaW5kb3cgPSBsb2NhbFBh dGhPclVybC5maW5kSWdub3JpbmdDYXNlKCIvaGlkcGktIikgIT0gbm90Rm91bmQ7Ci0gICAgaWYg KGhhc0hpZ2hEUElXaW5kb3cgPT0gbmVlZHNIaWdoRFBJV2luZG93KQorICAgIGZsb2F0IGN1cnJl bnRTY2FsZUZhY3RvciA9IFtbW21haW5GcmFtZSB3ZWJWaWV3XSB3aW5kb3ddIGJhY2tpbmdTY2Fs ZUZhY3Rvcl07CisgICAgZmxvYXQgcmVxdWlyZWRTY2FsZUZhY3RvciA9IDE7CisgICAgaWYgKGxv Y2FsUGF0aE9yVXJsLmZpbmRJZ25vcmluZ0Nhc2UoIi9oaWRwaS0zeC0iKSAhPSBub3RGb3VuZCkK KyAgICAgICAgcmVxdWlyZWRTY2FsZUZhY3RvciA9IDM7CisgICAgZWxzZSBpZiAobG9jYWxQYXRo T3JVcmwuZmluZElnbm9yaW5nQ2FzZSgiL2hpZHBpLSIpICE9IG5vdEZvdW5kKQorICAgICAgICBy ZXF1aXJlZFNjYWxlRmFjdG9yID0gMjsKKyAgICBpZiAoY3VycmVudFNjYWxlRmFjdG9yID09IHJl cXVpcmVkU2NhbGVGYWN0b3IpCiAgICAgICAgIHJldHVybjsKLQotICAgIENHRmxvYXQgbmV3U2Nh bGVGYWN0b3IgPSBuZWVkc0hpZ2hEUElXaW5kb3cgPyAyIDogMTsKICAgICAvLyBXaGVuIHRoZSBu ZXcgc2NhbGUgZmFjdG9yIGlzIHNldCBvbiB0aGUgd2luZG93IGZpcnN0LCBXZWJWaWV3IGRvZXNu J3Qgc2VlIGl0IGFzIGEgbmV3IHNjYWxlIGFuZCBzdG9wcyBwcm9wYWdhdGluZyB0aGUgYmVoYXZp b3IgY2hhbmdlIHRvIFdlYkNvcmU6OlBhZ2UuCi0gICAgZ1Rlc3RSdW5uZXItPnNldEJhY2tpbmdT Y2FsZUZhY3RvcihuZXdTY2FsZUZhY3Rvcik7Ci0gICAgW1tbbWFpbkZyYW1lIHdlYlZpZXddIHdp bmRvd10gX3NldFdpbmRvd1Jlc29sdXRpb246bmV3U2NhbGVGYWN0b3IgZGlzcGxheUlmQ2hhbmdl ZDpZRVNdOworICAgIGdUZXN0UnVubmVyLT5zZXRCYWNraW5nU2NhbGVGYWN0b3IocmVxdWlyZWRT Y2FsZUZhY3Rvcik7CisgICAgW1tbbWFpbkZyYW1lIHdlYlZpZXddIHdpbmRvd10gX3NldFdpbmRv d1Jlc29sdXRpb246cmVxdWlyZWRTY2FsZUZhY3RvciBkaXNwbGF5SWZDaGFuZ2VkOllFU107CiB9 CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv bGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRl eCBiMTI2ZjUxMjYzMTE3OGI3NWQwZTQ1MzZlNTI4MjU0NDAxNTYyZmY2Li42ZGFiYzIxZTM0NTE4 ODBhYTlmMjc5NmQ4ZTc5ZWVhMzNmMWQ3NzlmIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rl c3RDb250cm9sbGVyLmNwcApAQCAtOTkwLDcgKzk5MCw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OnVwZGF0ZVdlYlZpZXdTaXplRm9yVGVzdChjb25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdCkKIAog dm9pZCBUZXN0Q29udHJvbGxlcjo6dXBkYXRlV2luZG93U2NhbGVGb3JUZXN0KFBsYXRmb3JtV2Vi VmlldyogdmlldywgY29uc3QgVGVzdEludm9jYXRpb24mIHRlc3QpCiB7Ci0gICAgdmlldy0+Y2hh bmdlV2luZG93U2NhbGVJZk5lZWRlZCh0ZXN0Lm9wdGlvbnMoKS5pc0hpRFBJVGVzdCA/IDIgOiAx KTsKKyAgICB2aWV3LT5jaGFuZ2VXaW5kb3dTY2FsZUlmTmVlZGVkKHRlc3Qub3B0aW9ucygpLmRl dmljZVNjYWxlRmFjdG9yKTsKIH0KIAogdm9pZCBUZXN0Q29udHJvbGxlcjo6Y29uZmlndXJlVmll d0ZvclRlc3QoY29uc3QgVGVzdEludm9jYXRpb24mIHRlc3QpCmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL1Rlc3RPcHRpb25zLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv VGVzdE9wdGlvbnMuY3BwCmluZGV4IDQ1M2UwNzdjZmYxZDBkOTBiMmYzMDRjMTU2ZTYwMDFiMjhm ZDRmMjQuLjZlZWQyY2MxMDhkYmJlZjQ3OTI2YTU3YjIxODE1YTRhNTEyNTIxMDkgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMuY3BwCkBAIC01NiwxNiArNTYsMjAgQEAgc3RhdGlj IGJvb2wgaXNTVkdUZXN0UGF0aChjb25zdCBzdGQ6OnN0cmluZyYgcGF0aE9yVVJMKQogICAgIHJl dHVybiBwYXRoQ29udGFpbnMocGF0aE9yVVJMLCAic3ZnL1czQy1TVkctMS4xIikgfHwgcGF0aENv bnRhaW5zKHBhdGhPclVSTCwgInN2Z1xcVzNDLVNWRy0xLjEiKTsKIH0KIAotc3RhdGljIGJvb2wg aXNIaURQSVRlc3RQYXRoKGNvbnN0IHN0ZDo6c3RyaW5nJiBwYXRoT3JVUkwpCitzdGF0aWMgZmxv YXQgZGV2aWNlU2NhbGVGYWN0b3JGb3JUZXN0KGNvbnN0IHN0ZDo6c3RyaW5nJiBwYXRoT3JVUkwp CiB7Ci0gICAgcmV0dXJuIHBhdGhDb250YWlucyhwYXRoT3JVUkwsICIvaGlkcGktIik7CisgICAg aWYgKHBhdGhDb250YWlucyhwYXRoT3JVUkwsICIvaGlkcGktM3gtIikpCisgICAgICAgIHJldHVy biAzOworICAgIGlmIChwYXRoQ29udGFpbnMocGF0aE9yVVJMLCAiL2hpZHBpLSIpKQorICAgICAg ICByZXR1cm4gMjsKKyAgICByZXR1cm4gMTsKIH0KIAogVGVzdE9wdGlvbnM6OlRlc3RPcHRpb25z KGNvbnN0IHN0ZDo6c3RyaW5nJiBwYXRoT3JVUkwpCiAgICAgOiB1c2VGbGV4aWJsZVZpZXdwb3J0 KHNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKHBhdGhPclVSTCkpCiAgICAgLCB1c2VGaXhlZExh eW91dChzaG91bGRVc2VGaXhlZExheW91dChwYXRoT3JVUkwpKQogICAgICwgaXNTVkdUZXN0KGlz U1ZHVGVzdFBhdGgocGF0aE9yVVJMKSkKLSAgICAsIGlzSGlEUElUZXN0KGlzSGlEUElUZXN0UGF0 aChwYXRoT3JVUkwpKQorICAgICwgZGV2aWNlU2NhbGVGYWN0b3IoZGV2aWNlU2NhbGVGYWN0b3JG b3JUZXN0KHBhdGhPclVSTCkpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvVGVzdE9wdGlvbnMuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdE9wdGlvbnMu aAppbmRleCBjMWJhZTRkNjlmMjdhNThhZTY1Y2Q3YTU2NGQyMWU0MGE4YjAxYWJhLi43NzEyNjll NTJlMGNlZmQwNTU1NDZkN2JhOTQyMzQ4ZjVjYzgyYjczIDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RPcHRpb25zLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9U ZXN0T3B0aW9ucy5oCkBAIC0zOCwxMSArMzgsMTEgQEAgc3RydWN0IFRlc3RPcHRpb25zIHsKICAg ICBib29sIHVzZUZsZXhpYmxlVmlld3BvcnQgeyBmYWxzZSB9OwogICAgIGJvb2wgdXNlRml4ZWRM YXlvdXQgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNTVkdUZXN0IHsgZmFsc2UgfTsKLSAgICBib29s IGlzSGlEUElUZXN0IHsgZmFsc2UgfTsKICAgICBib29sIHVzZURhdGFEZXRlY3Rpb24geyBmYWxz ZSB9OwogICAgIGJvb2wgdXNlTW9ja1Njcm9sbGJhcnMgeyB0cnVlIH07CiAgICAgYm9vbCBuZWVk c1NpdGVTcGVjaWZpY1F1aXJrcyB7IGZhbHNlIH07CiAKKyAgICBmbG9hdCBkZXZpY2VTY2FsZUZh Y3RvciB7IDEgfTsKICAgICBWZWN0b3I8U3RyaW5nPiBvdmVycmlkZUxhbmd1YWdlczsKICAgICAK ICAgICBUZXN0T3B0aW9ucyhjb25zdCBzdGQ6OnN0cmluZyYgcGF0aE9yVVJMKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBi NzBiMDljZjhmYTQ3NDc2MDQ3NTFlZTVmY2VjYmM3YWFkYWEyZDgzLi5jMWFjZDFiODUwYjUwMDEx ODljNjljMDQ4OTFjMDVmMzYwNzlhYTQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTYtMDYt MDkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgdGVzdGlu ZyBzdXBwb3J0IGZvciAzeCBkZXZpY2Ugc2NhbGUgZmFjdG9yLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTk3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IDN4IGRldmljZSBzY2FsZSBmYWN0b3Ig b24gdGhlIHRlc3QgY2FudmFzIHdoZW4gdGhlIHRlc3QgdXJsIGlzIHByZWZpeGVkIHdpdGggaGlk cGktM3gtLiAKKworICAgICAgICAqIGZhc3QvaGlkcGkvaGlkcGktM3gtZGV2aWNlLXBpeGVsLXJh dGlvLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9oaWRwaS9oaWRwaS0zeC1k ZXZpY2UtcGl4ZWwtcmF0aW8uaHRtbDogQWRkZWQuCisKIDIwMTYtMDYtMDYgIEphdmllciBGZXJu YW5kZXogIDxqZmVybmFuZGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBIb3Jp em9udGFsIHNjcm9sbCBtdXN0IGFjY291bnQgZm9yIGdyaWQgY29udGFpbmVyJ3MgaGVpZ2h0CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2hpZHBpL2hpZHBpLTN4LWRldmljZS1waXhlbC1y YXRpby1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2hpZHBpL2hpZHBpLTN4LWRldmlj ZS1waXhlbC1yYXRpby1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmY2NjM0MTM3NmUxMDI5YmNk YjI1MzgxMWQ4NmI2NGQ4YTIwM2RlZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvaGlkcGkvaGlkcGktM3gtZGV2aWNlLXBpeGVsLXJhdGlvLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxIEBACitUaGUgdXNlciBpbnRlcmZhY2Ugc2NhbGUgZmFjdG9yIGlzIDMuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2hpZHBpL2hpZHBpLTN4LWRldmljZS1waXhlbC1yYXRpby5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9oaWRwaS9oaWRwaS0zeC1kZXZpY2UtcGl4ZWwtcmF0aW8uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5lZTIxZTUyNjg5ZjdkODUyYmUwZDM2ZTYxZjI4Mzc4Zjc1ZDA0NjhlCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9oaWRwaS9oaWRwaS0zeC1kZXZpY2Ut cGl4ZWwtcmF0aW8uaHRtbApAQCAtMCwwICsxLDEzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IDN4IGRldmljZSBzY2FsZSByYXRpbyBp cyBlbmFibGVkLjwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+CisgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICBk b2N1bWVudC53cml0ZSgiVGhlIHVzZXIgaW50ZXJmYWNlIHNjYWxlIGZhY3RvciBpcyAiICsgd2lu ZG93LmRldmljZVBpeGVsUmF0aW8gKyAiLiIpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ Cg==