147237 2015-07-23 13:39:04 -0700 Should not allow previews of 1x1 images 2015-07-23 13:55:39 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin thorton oldest_to_newest 1111725 0 bdakin 2015-07-23 13:39:04 -0700 We should not allow previews of 1x1 images 1111726 1 257373 bdakin 2015-07-23 13:42:39 -0700 Created attachment 257373 Patch 1111727 2 257373 thorton 2015-07-23 13:45:14 -0700 Comment on attachment 257373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257373&action=review > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:2226 > + info.imageURL = [(NSURL *)element->document().completeURL(renderImage.cachedImage()->url()) absoluteString]; We really need to helper function the crap out of this beast. 1111731 3 bdakin 2015-07-23 13:55:39 -0700 Thanks Tim! http://trac.webkit.org/changeset/187250 257373 2015-07-23 13:42:39 -0700 2015-07-23 13:45:14 -0700 Patch for-review.txt text/plain 4320 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzI0OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTIzICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBTaG91bGQgbm90IGFsbG93IHByZXZp ZXdzIG9mIDF4MSBpbWFnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NzIzNworICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzIxOTY4NDYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgMXgxIGltYWdlcyBhcmUgdXNlZCBvbiBzb21lIHNpdGVzIHRvIGNvdmVy IGFjdHVhbCBpbWFnZXMsIHdoaWNoIGxlYWRzIHRvIGEgCisgICAgICAgIG1pc2xlYWRpbmcgcHJl dmlldyBleHBlcmllbmNlLiBUaGVyZSBpcyBub3QgYW55IHJlYXNvbiB3aHkgeW91IHdvdWxkIHJl YWxseSAKKyAgICAgICAgd2FudCB0byBwcmV2aWV3IGFuIGltYWdlIHRoaXMgc21hbGwgbm9yIGFu eSByZWFzb24gdG8gYmVsaWV2ZSB0aGF0IHRoZSAKKyAgICAgICAgcHJldmlldyB3b3VsZCByZXN1 bHQgaW4gYW55dGhpbmcgdXNlZnVsLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZv cm1hdGlvbik6CisKIDIwMTUtMDctMjMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29t PgogCiAgICAgICAgIENyYXNoIGluIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRlUGluZ0hh bmRsZSAtIERlcmVmIGEgbnVsbCBOZXR3b3JraW5nQ29udGV4dC4KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlz aW9uIDE4NzE3MykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjIyMSwxNyArMjIyMSwxOSBAQCB2b2lkIFdl YlBhZ2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb24oY29uCiAgICAgICAgICAgICAgICAgfSBlbHNl IGlmIChlbGVtZW50LT5yZW5kZXJlcigpICYmIGVsZW1lbnQtPnJlbmRlcmVyKCktPmlzUmVuZGVy SW1hZ2UoKSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvJiByZW5kZXJJbWFnZSA9IGRvd25j YXN0PFJlbmRlckltYWdlPigqKGVsZW1lbnQtPnJlbmRlcmVyKCkpKTsKICAgICAgICAgICAgICAg ICAgICAgaWYgKHJlbmRlckltYWdlLmNhY2hlZEltYWdlKCkgJiYgIXJlbmRlckltYWdlLmNhY2hl ZEltYWdlKCktPmVycm9yT2NjdXJyZWQoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgaW5m by5pbWFnZVVSTCA9IFsoTlNVUkwgKillbGVtZW50LT5kb2N1bWVudCgpLmNvbXBsZXRlVVJMKHJl bmRlckltYWdlLmNhY2hlZEltYWdlKCktPnVybCgpKSBhYnNvbHV0ZVN0cmluZ107CiAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoSW1hZ2UqIGltYWdlID0gcmVuZGVySW1hZ2UuY2FjaGVkSW1h Z2UoKS0+aW1hZ2VGb3JSZW5kZXJlcigmcmVuZGVySW1hZ2UpKSB7Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW5mby5pc0FuaW1hdGVkSW1hZ2UgPSBpbWFnZS0+aXNBbmltYXRlZCgpOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZsb2F0U2l6ZSBzY3JlZW5TaXplSW5QaXhlbHMg PSBzY3JlZW5TaXplKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NyZWVuU2l6ZUlu UGl4ZWxzLnNjYWxlKGNvcmVQYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEZsb2F0U2l6ZSBzY2FsZWRTaXplID0gbGFyZ2VzdFJlY3RXaXRo QXNwZWN0UmF0aW9JbnNpZGVSZWN0KGltYWdlLT5zaXplKCkud2lkdGgoKSAvIGltYWdlLT5zaXpl KCkuaGVpZ2h0KCksIEZsb2F0UmVjdCgwLCAwLCBzY3JlZW5TaXplSW5QaXhlbHMud2lkdGgoKSwg c2NyZWVuU2l6ZUluUGl4ZWxzLmhlaWdodCgpKSkuc2l6ZSgpOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEZsb2F0U2l6ZSBiaXRtYXBTaXplID0gc2NhbGVkU2l6ZS53aWR0aCgpIDwgaW1h Z2UtPnNpemUoKS53aWR0aCgpID8gc2NhbGVkU2l6ZSA6IGltYWdlLT5zaXplKCk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IHNoYXJlZEJp dG1hcCA9IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlU2hhcmVhYmxlKEludFNpemUoYml0bWFwU2l6 ZSksIFNoYXJlYWJsZUJpdG1hcDo6U3VwcG9ydHNBbHBoYSkpIHsKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXV0byBncmFwaGljc0NvbnRleHQgPSBzaGFyZWRCaXRtYXAtPmNyZWF0 ZUdyYXBoaWNzQ29udGV4dCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBncmFw aGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZSwgQ29sb3JTcGFjZURldmljZVJHQiwgRmxvYXRS ZWN0KDAsIDAsIGJpdG1hcFNpemUud2lkdGgoKSwgYml0bWFwU2l6ZS5oZWlnaHQoKSkpOwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmltYWdlID0gc2hhcmVkQml0bWFwOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpbWFnZS0+d2lkdGgoKSA+IDEgJiYgaW1h Z2UtPmhlaWdodCgpID4gMSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZv LmltYWdlVVJMID0gWyhOU1VSTCAqKWVsZW1lbnQtPmRvY3VtZW50KCkuY29tcGxldGVVUkwocmVu ZGVySW1hZ2UuY2FjaGVkSW1hZ2UoKS0+dXJsKCkpIGFic29sdXRlU3RyaW5nXTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW5mby5pc0FuaW1hdGVkSW1hZ2UgPSBpbWFnZS0+aXNB bmltYXRlZCgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGbG9hdFNpemUgc2Ny ZWVuU2l6ZUluUGl4ZWxzID0gc2NyZWVuU2l6ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzY3JlZW5TaXplSW5QaXhlbHMuc2NhbGUoY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVG YWN0b3IoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZsb2F0U2l6ZSBzY2Fs ZWRTaXplID0gbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNpZGVSZWN0KGltYWdlLT5zaXpl KCkud2lkdGgoKSAvIGltYWdlLT5zaXplKCkuaGVpZ2h0KCksIEZsb2F0UmVjdCgwLCAwLCBzY3Jl ZW5TaXplSW5QaXhlbHMud2lkdGgoKSwgc2NyZWVuU2l6ZUluUGl4ZWxzLmhlaWdodCgpKSkuc2l6 ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGbG9hdFNpemUgYml0bWFwU2l6 ZSA9IHNjYWxlZFNpemUud2lkdGgoKSA8IGltYWdlLT5zaXplKCkud2lkdGgoKSA/IHNjYWxlZFNp emUgOiBpbWFnZS0+c2l6ZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo UmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gc2hhcmVkQml0bWFwID0gU2hhcmVhYmxlQml0bWFwOjpj cmVhdGVTaGFyZWFibGUoSW50U2l6ZShiaXRtYXBTaXplKSwgU2hhcmVhYmxlQml0bWFwOjpTdXBw b3J0c0FscGhhKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0byBn cmFwaGljc0NvbnRleHQgPSBzaGFyZWRCaXRtYXAtPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3 SW1hZ2UoaW1hZ2UsIENvbG9yU3BhY2VEZXZpY2VSR0IsIEZsb2F0UmVjdCgwLCAwLCBiaXRtYXBT aXplLndpZHRoKCksIGJpdG1hcFNpemUuaGVpZ2h0KCkpKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGluZm8uaW1hZ2UgPSBzaGFyZWRCaXRtYXA7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIH0K