130697 2014-03-24 15:20:49 -0700 REGRESSION (r165872): Double-applying device scale to snapshots 2014-03-24 16:14:59 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca conrad_shultz simon.fraser oldest_to_newest 993985 0 thorton 2014-03-24 15:20:49 -0700 I made a mistake in r165872 that caused us to apply the device scale twice when snapshotting via scaledSnapshotWithOptions. <rdar://problem/16396629> 993990 1 227697 thorton 2014-03-24 15:43:21 -0700 Created attachment 227697 patch 1) We need snapshotting tests desperately, there are too many combinations of options to not have some tests. 2) I need to test WKThumbnailView before landing this. 994000 2 thorton 2014-03-24 16:14:59 -0700 http://trac.webkit.org/changeset/166203 227697 2014-03-24 15:43:21 -0700 2014-03-24 15:48:38 -0700 patch scale.diff text/plain 3820 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5ZDUxNzYzLi5lMmExNjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMDMtMjQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTiAocjE2NTg3Mik6IERvdWJsZS1hcHBseWluZyBkZXZpY2Ugc2Nh bGUgdG8gc25hcHNob3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzA2OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2Mzk2NjI5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzY2FsZWRTbmFw c2hvdFdpdGhPcHRpb25zKToKKyAgICAgICAgRHJpdmUtYnksIG1ha2Ugc2NhbGVkU25hcHNob3RX aXRoT3B0aW9ucyByZXNwZWN0IFNuYXBzaG90T3B0aW9uc0V4Y2x1ZGVEZXZpY2VTY2FsZUZhY3Rv ci4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzbmFwc2hvdEF0U2l6ZSk6CisgICAgICAg IERpdmlkZSB0aGUgZGV2aWNlIHNjYWxlIG91dCBvZiB0aGUgc2NhbGUgZmFjdG9yCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICBSZW5hbWUgdGhlIHNj YWxlIGFyZ3VtZW50IHRvIHNjYWxlZFNuYXBzaG90V2l0aE9wdGlvbnMgdG8gY2xhcmlmeQorICAg ICAgICB0aGF0IGl0IGlzIGFuIGFkZGl0aW9uYWwgc2NhbGUgb24gdG9wIG9mIHRoZSBkZXZpY2Ug c2NhbGUuCisKIDIwMTQtMDMtMjQgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAg ICAgICBCdWlsZCBmaXggYWZ0ZXIgcjE2NjE4Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA1NjMyZDIxLi4wNDliYjU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xNTMxLDE0ICsx NTMxLDE3IEBAIHZvaWQgV2ViUGFnZTo6dGFrZVNuYXBzaG90KEludFJlY3Qgc25hcHNob3RSZWN0 LCBJbnRTaXplIGJpdG1hcFNpemUsIHVpbnQzMl90IG9wCiAgICAgc2VuZChNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpJbWFnZUNhbGxiYWNrKGhhbmRsZSwgY2FsbGJhY2tJRCkpOwogfQogCi1QYXNz UmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzY2FsZWRTbmFwc2hvdFdpdGhPcHRpb25zKGNvbnN0 IEludFJlY3QmIHJlY3QsIGRvdWJsZSBzY2FsZUZhY3RvciwgU25hcHNob3RPcHRpb25zIG9wdGlv bnMpCitQYXNzUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzY2FsZWRTbmFwc2hvdFdpdGhPcHRp b25zKGNvbnN0IEludFJlY3QmIHJlY3QsIGRvdWJsZSBhZGRpdGlvbmFsU2NhbGVGYWN0b3IsIFNu YXBzaG90T3B0aW9ucyBvcHRpb25zKQogewogICAgIEludFJlY3Qgc25hcHNob3RSZWN0ID0gcmVj dDsKICAgICBpZiAob3B0aW9ucyAmIFNuYXBzaG90T3B0aW9uc1Jlc3BlY3REcmF3aW5nQXJlYVRy YW5zZm9ybSkKICAgICAgICAgc25hcHNob3RSZWN0ID0gbV9kcmF3aW5nQXJlYS0+cm9vdExheWVy VHJhbnNmb3JtKCkuaW52ZXJzZSgpLm1hcFJlY3Qoc25hcHNob3RSZWN0KTsKIAogICAgIEludFNp emUgYml0bWFwU2l6ZSA9IHNuYXBzaG90UmVjdC5zaXplKCk7Ci0gICAgYml0bWFwU2l6ZS5zY2Fs ZShzY2FsZUZhY3RvciAqIGNvcmVQYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCkpOworICAgIGRv dWJsZSBzY2FsZUZhY3RvciA9IGFkZGl0aW9uYWxTY2FsZUZhY3RvcjsKKyAgICBpZiAoIShvcHRp b25zICYgU25hcHNob3RPcHRpb25zRXhjbHVkZURldmljZVNjYWxlRmFjdG9yKSkKKyAgICAgICAg c2NhbGVGYWN0b3IgKj0gY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKKyAgICBiaXRt YXBTaXplLnNjYWxlKHNjYWxlRmFjdG9yKTsKIAogICAgIHJldHVybiBzbmFwc2hvdEF0U2l6ZShy ZWN0LCBiaXRtYXBTaXplLCBvcHRpb25zKTsKIH0KQEAgLTE1NjksOCArMTU3MiwxMSBAQCBQYXNz UmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzbmFwc2hvdEF0U2l6ZShjb25zdCBJbnRSZWN0JiBy ZWN0LCBjb25zdCBJbnRTaXplJgogCiAgICAgZ3JhcGhpY3NDb250ZXh0LT5maWxsUmVjdChJbnRS ZWN0KEludFBvaW50KCksIGJpdG1hcFNpemUpLCBmcmFtZVZpZXctPmJhc2VCYWNrZ3JvdW5kQ29s b3IoKSwgQ29sb3JTcGFjZURldmljZVJHQik7CiAKLSAgICBpZiAoIShvcHRpb25zICYgU25hcHNo b3RPcHRpb25zRXhjbHVkZURldmljZVNjYWxlRmFjdG9yKSkKLSAgICAgICAgZ3JhcGhpY3NDb250 ZXh0LT5hcHBseURldmljZVNjYWxlRmFjdG9yKGNvcmVQYWdlKCktPmRldmljZVNjYWxlRmFjdG9y KCkpOworICAgIGlmICghKG9wdGlvbnMgJiBTbmFwc2hvdE9wdGlvbnNFeGNsdWRlRGV2aWNlU2Nh bGVGYWN0b3IpKSB7CisgICAgICAgIGRvdWJsZSBkZXZpY2VTY2FsZUZhY3RvciA9IGNvcmVQYWdl KCktPmRldmljZVNjYWxlRmFjdG9yKCk7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+YXBwbHlE ZXZpY2VTY2FsZUZhY3RvcihkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgICAgIHNjYWxlRmFjdG9y IC89IGRldmljZVNjYWxlRmFjdG9yOworICAgIH0KIAogICAgIGdyYXBoaWNzQ29udGV4dC0+c2Nh bGUoRmxvYXRTaXplKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3RvcikpOwogICAgIGdyYXBoaWNzQ29u dGV4dC0+dHJhbnNsYXRlKC1zbmFwc2hvdFJlY3QueCgpLCAtc25hcHNob3RSZWN0LnkoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAwYjE1NTMx Li44NDAzZGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKQEAgLTQyMSw3ICs0MjEsNyBAQCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6SW50UG9pbnQgc2Ny ZWVuVG9Sb290Vmlldyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIFdlYkNvcmU6Oklu dFJlY3Qgcm9vdFZpZXdUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAKLSAgICBQ YXNzUmVmUHRyPFdlYkltYWdlPiBzY2FsZWRTbmFwc2hvdFdpdGhPcHRpb25zKGNvbnN0IFdlYkNv cmU6OkludFJlY3QmLCBkb3VibGUgc2NhbGVGYWN0b3IsIFNuYXBzaG90T3B0aW9ucyk7CisgICAg UGFzc1JlZlB0cjxXZWJJbWFnZT4gc2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiwgZG91YmxlIGFkZGl0aW9uYWxTY2FsZUZhY3RvciwgU25hcHNob3RPcHRp b25zKTsKICAgICBQYXNzUmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdEF0U2l6ZShjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgYml0bWFwU2l6ZSwgU25hcHNo b3RPcHRpb25zKTsKIAogICAgIHN0YXRpYyBjb25zdCBXZWJFdmVudCogY3VycmVudEV2ZW50KCk7 Cg==