120791 2013-09-05 13:30:28 -0700 DRY out srcset related deviceScaleFactor calculations 2013-09-05 22:47:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 yoav webkit-unassigned commit-queue esprehn+autocc kangil.han oldest_to_newest 925193 0 yoav 2013-09-05 13:30:28 -0700 DRY out srcset related deviceScaleFactor calculations 925194 1 210656 yoav 2013-09-05 13:38:41 -0700 Created attachment 210656 Patch 925208 2 yoav 2013-09-05 14:18:46 -0700 Identical deviceScaleFactor calculations were performed in 3 different locations. I've added that calculation as a method of Document and replaced previous calculations by calls to this method. 925398 3 210656 kling 2013-09-05 22:21:05 -0700 Comment on attachment 210656 Patch r=me 925406 4 210656 commit-queue 2013-09-05 22:47:41 -0700 Comment on attachment 210656 Patch Clearing flags on attachment: 210656 Committed r155176: <http://trac.webkit.org/changeset/155176> 925407 5 commit-queue 2013-09-05 22:47:45 -0700 All reviewed patches have been landed. Closing bug. 210656 2013-09-05 13:38:41 -0700 2013-09-05 22:47:41 -0700 Patch bug-120791-20130905223840.patch text/plain 5584 yoav U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0OTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODllN2MyZTA4M2VkMTlk NjFkOTNhZTVmYTYxNjAyMzk4Yjg5ZjQwYy4uMzQ2YjQwYzc3ZjU2NmNjNjBlNjViZjczMWU1MDAx ZThhM2ZkMWNjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA5LTA1ICBZb2F2 IFdlaXNzICA8eW9hdkB5b2F2LndzPgorCisgICAgICAgIERSWSBvdXQgc3Jjc2V0IHJlbGF0ZWQg ZGV2aWNlU2NhbGVGYWN0b3IgY2FsY3VsYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA3OTEKKworICAgICAgICBJZGVudGljYWwgZGV2aWNl U2NhbGVGYWN0b3IgY2FsY3VsYXRpb25zIHdlcmUgcGVyZm9ybWVkIGluIDMgZGlmZmVyZW50IGxv Y2F0aW9ucy4KKyAgICAgICAgSSd2ZSBhZGRlZCB0aGF0IGNhbGN1bGF0aW9uIGFzIGEgbWV0aG9k IG9mIERvY3VtZW50LgorICAgICAgICBQcmV2aW91cyBjYWxjdWxhdGlvbnMgYXJlIHJlcGxhY2Vk IGJ5IGNhbGxzIHRvIHRoaXMgbWV0aG9kLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlzIGlzIGEgcmVmYWN0b3Jp bmcgY2hhbmdlLiBObyBmdW5jdGlvbmFsaXR5IGhhdmUgY2hhbmdlZC4KKworICAgICAgICAqIGRv bS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGV2aWNlU2NhbGVG YWN0b3IpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTElt YWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpwYXJz ZUF0dHJpYnV0ZSk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcik6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6Omluc2VydCk6CisKIDIwMTMt MDktMDMgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAK ICAgICAgICAgW1F0XSBSZW1vdmUgZGVhZCBjb2RlIGZvciBRdFhtbFBhdHRlcm5zCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCAzNTRlMTc5YmQ2MGNlN2ExMmM4MWY2NGI0NTZiNjg3MGFmNTUz YjgyLi5kNjRkYTZlNTliMDJjNjE2NWMzMDQyZjJkZjJmMmFhMTBkYzBmZDNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTU5NTIsNiArNTk1MiwxMyBAQCBQYXNzUmVmUHRyPEZvbnRMb2Fk ZXI+IERvY3VtZW50Ojpmb250bG9hZGVyKCkKIH0KICNlbmRpZgogCitmbG9hdCBEb2N1bWVudDo6 ZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdAoreworICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9y ID0gMS4wOworICAgIGlmIChQYWdlKiBkb2N1bWVudFBhZ2UgPSBwYWdlKCkpCisgICAgICAgIGRl dmljZVNjYWxlRmFjdG9yID0gZG9jdW1lbnRQYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOworICAg IHJldHVybiBkZXZpY2VTY2FsZUZhY3RvcjsKK30KIHZvaWQgRG9jdW1lbnQ6OmRpZEFzc29jaWF0 ZUZvcm1Db250cm9sKEVsZW1lbnQqIGVsZW1lbnQpCiB7CiAgICAgaWYgKCFmcmFtZSgpIHx8ICFm cmFtZSgpLT5wYWdlKCkgfHwgIWZyYW1lKCktPnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkuc2hv dWxkTm90aWZ5T25Gb3JtQ2hhbmdlcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCBiOWM5OTY2 Nzg2ZjQ2ODEwMmI2ZTFjMTU2ZDA4Y2Q4MmYzYWYzYTVjLi5lNTMxODZiM2JhZjdiYTA0NzNhNDA0 Mzg5MTQyYzk0MmE2MjdiOTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtNDk2LDYgKzQ5Niw4 IEBAIHB1YmxpYzoKICAgICBQYWdlKiBwYWdlKCkgY29uc3Q7IC8vIGNhbiBiZSBOVUxMCiAgICAg U2V0dGluZ3MqIHNldHRpbmdzKCkgY29uc3Q7IC8vIGNhbiBiZSBOVUxMCiAKKyAgICBmbG9hdCBk ZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0OworCiAgICAgUGFzc1JlZlB0cjxSYW5nZT4gY3JlYXRl UmFuZ2UoKTsKIAogICAgIFBhc3NSZWZQdHI8Tm9kZUl0ZXJhdG9yPiBjcmVhdGVOb2RlSXRlcmF0 b3IoTm9kZSogcm9vdCwgdW5zaWduZWQgd2hhdFRvU2hvdywKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IDg1MzBiZWQ2YTM0NTdmNDk4OTEzYjFiMDA2NjM5YTg5 ZTI4MWU2ZTcuLjk4YTc3ZDJmY2Y2YzhiOGY5MmFlZTg4MTYzMjI1ZmRmNzYzOTUxNTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApAQCAtMTIzLDEwICsxMjMsNyBA QCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5h bWUmIG5hbWUsIGNvbnN0IEF0b21pY1N0cgogICAgICAgICBpZiAocmVuZGVyZXIoKSAmJiByZW5k ZXJlcigpLT5pc0ltYWdlKCkpCiAgICAgICAgICAgICB0b1JlbmRlckltYWdlKHJlbmRlcmVyKCkp LT51cGRhdGVBbHRUZXh0KCk7CiAgICAgfSBlbHNlIGlmIChuYW1lID09IHNyY0F0dHIgfHwgbmFt ZSA9PSBzcmNzZXRBdHRyKSB7Ci0gICAgICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gMS4w OwotICAgICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKQotICAgICAgICAg ICAgZGV2aWNlU2NhbGVGYWN0b3IgPSBwYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOwotICAgICAg ICBtX2Jlc3RGaXRJbWFnZVVSTCA9IGJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMoZGV2 aWNlU2NhbGVGYWN0b3IsIGZhc3RHZXRBdHRyaWJ1dGUoc3JjQXR0ciksIGZhc3RHZXRBdHRyaWJ1 dGUoc3Jjc2V0QXR0cikpOworICAgICAgICBtX2Jlc3RGaXRJbWFnZVVSTCA9IGJlc3RGaXRTb3Vy Y2VGb3JJbWFnZUF0dHJpYnV0ZXMoZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpLCBmYXN0 R2V0QXR0cmlidXRlKHNyY0F0dHIpLCBmYXN0R2V0QXR0cmlidXRlKHNyY3NldEF0dHIpKTsKICAg ICAgICAgbV9pbWFnZUxvYWRlci51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJv cigpOwogICAgIH0gZWxzZSBpZiAobmFtZSA9PSB1c2VtYXBBdHRyKQogICAgICAgICBzZXRJc0xp bmsoIXZhbHVlLmlzTnVsbCgpICYmICFzaG91bGRQcm9oaWJpdExpbmtzKHRoaXMpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IGIwZTA4ZDdkMGU1ZThkMzVmZDAyN2VlNTIyYjA3MzllYjYyMTc0YmMuLjE0YTVmZWVhNjM4YjU3 Nzg2NmE4NmNlMTcyY2Y0YzAwODliMjViZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtNTY2LDEwICs1NjYsNyBAQCB2b2lk IEhUTUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkK ICAgICBpZiAoaXNXYWl0aW5nRm9yU2NyaXB0cygpKSB7CiAgICAgICAgIEFTU0VSVChtX3Rva2Vu aXplci0+c3RhdGUoKSA9PSBIVE1MVG9rZW5pemVyOjpEYXRhU3RhdGUpOwogICAgICAgICBpZiAo IW1fcHJlbG9hZFNjYW5uZXIpIHsKLSAgICAgICAgICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9y ID0gMS4wOwotICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBkb2N1bWVudCgpLT5wYWdlKCkp Ci0gICAgICAgICAgICAgICAgZGV2aWNlU2NhbGVGYWN0b3IgPSBwYWdlLT5kZXZpY2VTY2FsZUZh Y3RvcigpOwotICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lciA9IGFkb3B0UHRyKG5ldyBIVE1M UHJlbG9hZFNjYW5uZXIobV9vcHRpb25zLCBkb2N1bWVudCgpLT51cmwoKSwgZGV2aWNlU2NhbGVG YWN0b3IpKTsKKyAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXIgPSBhZG9wdFB0cihuZXcgSFRN TFByZWxvYWRTY2FubmVyKG1fb3B0aW9ucywgZG9jdW1lbnQoKS0+dXJsKCksIGRvY3VtZW50KCkt PmRldmljZVNjYWxlRmFjdG9yKCkpKTsKICAgICAgICAgICAgIG1fcHJlbG9hZFNjYW5uZXItPmFw cGVuZFRvRW5kKG1faW5wdXQuY3VycmVudCgpKTsKICAgICAgICAgfQogICAgICAgICBtX3ByZWxv YWRTY2FubmVyLT5zY2FuKG1fcHJlbG9hZGVyLmdldCgpLCBkb2N1bWVudCgpLT5iYXNlRWxlbWVu dFVSTCgpKTsKQEAgLTY1MCwxMCArNjQ3LDcgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6Omlu c2VydChjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSkKICAgICAgICAgLy8gQ2hlY2sgdGhl IGRvY3VtZW50LndyaXRlKCkgb3V0cHV0IHdpdGggYSBzZXBhcmF0ZSBwcmVsb2FkIHNjYW5uZXIg YXMKICAgICAgICAgLy8gdGhlIG1haW4gc2Nhbm5lciBjYW4ndCBkZWFsIHdpdGggaW5zZXJ0aW9u cy4KICAgICAgICAgaWYgKCFtX2luc2VydGlvblByZWxvYWRTY2FubmVyKSB7Ci0gICAgICAgICAg ICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IDEuMDsKLSAgICAgICAgICAgIGlmIChQYWdlKiBw YWdlID0gZG9jdW1lbnQoKS0+cGFnZSgpKQotICAgICAgICAgICAgICAgIGRldmljZVNjYWxlRmFj dG9yID0gcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICAgICAgICAgIG1faW5zZXJ0aW9u UHJlbG9hZFNjYW5uZXIgPSBhZG9wdFB0cihuZXcgSFRNTFByZWxvYWRTY2FubmVyKG1fb3B0aW9u cywgZG9jdW1lbnQoKS0+dXJsKCksIGRldmljZVNjYWxlRmFjdG9yKSk7CisgICAgICAgICAgICBt X2luc2VydGlvblByZWxvYWRTY2FubmVyID0gYWRvcHRQdHIobmV3IEhUTUxQcmVsb2FkU2Nhbm5l cihtX29wdGlvbnMsIGRvY3VtZW50KCktPnVybCgpLCBkb2N1bWVudCgpLT5kZXZpY2VTY2FsZUZh Y3RvcigpKSk7CiAgICAgICAgIH0KICAgICAgICAgbV9pbnNlcnRpb25QcmVsb2FkU2Nhbm5lci0+ YXBwZW5kVG9FbmQoc291cmNlKTsKICAgICAgICAgbV9pbnNlcnRpb25QcmVsb2FkU2Nhbm5lci0+ c2NhbihtX3ByZWxvYWRlci5nZXQoKSwgZG9jdW1lbnQoKS0+YmFzZUVsZW1lbnRVUkwoKSk7Cg==