133092 2014-05-19 16:26:50 -0700 REGRESSION: Standalone images need to take topContentInset into account 2014-05-19 16:58:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin benjamin commit-queue esprehn+autocc gyuyoung.kim sam simon.fraser thorton oldest_to_newest 1010332 0 bdakin 2014-05-19 16:26:50 -0700 Standalone images taller than the viewport are scaled to a size slightly taller than the viewport when there is a topContentInset. <rdar://problem/16945791> 1010337 1 231735 bdakin 2014-05-19 16:36:13 -0700 Created attachment 231735 Patch 1010343 2 231735 benjamin 2014-05-19 16:46:32 -0700 Comment on attachment 231735 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231735&action=review > Source/WebCore/html/ImageDocument.cpp:283 > + IntSize viewportSize = view->visibleSize(); Doesn't this also account for the scale factor? 1010347 3 bdakin 2014-05-19 16:53:36 -0700 (In reply to comment #2) > (From update of attachment 231735 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231735&action=review > > > Source/WebCore/html/ImageDocument.cpp:283 > > + IntSize viewportSize = view->visibleSize(); > > Doesn't this also account for the scale factor? I don't see any differences introduced by this change based on scale factor. 1010348 4 bdakin 2014-05-19 16:55:52 -0700 (In reply to comment #2) > (From update of attachment 231735 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231735&action=review > > > Source/WebCore/html/ImageDocument.cpp:283 > > + IntSize viewportSize = view->visibleSize(); > > Doesn't this also account for the scale factor? Oh, and to more directly answer the question, it does not take scale factor into account. It ends up calling unscaledUnobscuredVisibleContentSize(). 1010351 5 bdakin 2014-05-19 16:58:23 -0700 Thanks, Darin! http://trac.webkit.org/changeset/169084 231735 2014-05-19 16:36:13 -0700 2014-05-19 16:46:32 -0700 Patch for-review.txt text/plain 2839 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTA4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA1LTE5ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBTdGFuZGFsb25l IGltYWdlcyBuZWVkIHRvIHRha2UgdG9wQ29udGVudEluc2V0IGludG8gYWNjb3VudAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMDkyCisgICAgICAg IC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2OTQ1NzkxPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBGcmFt ZVZpZXfigJlzIHNpemUgaXMgYWNjdXJhdGUgaW4gdGVybXMgb2YgdGhlIE5TV2luZG93IHNpemUs IGJ1dCB0aGF0IGlzIG5vdCAKKyAgICAgICAgcmVhbGx5IHdoYXQgdGhlIEltYWdlRG9jdW1lbnQg Y29kZSBpcyBsb29raW5nIGZvciBoZXJlLiBUaGUgSW1hZ2VEb2N1bWVudCB3YW50cyB0byAKKyAg ICAgICAga25vdyB0aGUgc2l6ZSBvZiB0aGUgdW5vYnNjdXJlZCB2aWV3cG9ydCBhcmVhLiBXZSBz aG91bGQgdXNlIHZpc2libGVTaXplKCkgZm9yIAorICAgICAgICB0aGF0LgorICAgICAgICAqIGh0 bWwvSW1hZ2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50Ojpz Y2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUZpdHNJbldpbmRv dyk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUNsaWNrZWQpOgorCiAy MDE0LTA1LTE5ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBTY3Jv bGxiYXJzIGRpc3BsYXkgaW5jb3JyZWN0bHkgYWZ0ZXIgc3dpdGNoaW5nIGJldHdlZW4gZmFzdCBh bmQgc2xvdyBzY3JvbGxpbmcgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9jdW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5j cHAJKHJldmlzaW9uIDE2OTA1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4MCw4ICsyODAsOSBAQCBmbG9hdCBJbWFnZURvY3Vt ZW50OjpzY2FsZSgpCiAKICAgICBMYXlvdXRTaXplIGltYWdlU2l6ZSA9IHRoaXMtPmltYWdlU2l6 ZSgpOwogCi0gICAgZmxvYXQgd2lkdGhTY2FsZSA9IHZpZXctPndpZHRoKCkgLyBpbWFnZVNpemUu d2lkdGgoKS50b0Zsb2F0KCk7Ci0gICAgZmxvYXQgaGVpZ2h0U2NhbGUgPSB2aWV3LT5oZWlnaHQo KSAvIGltYWdlU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgSW50U2l6ZSB2aWV3cG9ydFNp emUgPSB2aWV3LT52aXNpYmxlU2l6ZSgpOworICAgIGZsb2F0IHdpZHRoU2NhbGUgPSB2aWV3cG9y dFNpemUud2lkdGgoKSAvIGltYWdlU2l6ZS53aWR0aCgpLnRvRmxvYXQoKTsKKyAgICBmbG9hdCBo ZWlnaHRTY2FsZSA9IHZpZXdwb3J0U2l6ZS5oZWlnaHQoKSAvIGltYWdlU2l6ZS5oZWlnaHQoKS50 b0Zsb2F0KCk7CiAKICAgICByZXR1cm4gc3RkOjptaW4od2lkdGhTY2FsZSwgaGVpZ2h0U2NhbGUp OwogfQpAQCAtMzI3LDggKzMyOCw4IEBAIGJvb2wgSW1hZ2VEb2N1bWVudDo6aW1hZ2VGaXRzSW5X aW5kb3coKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIExheW91dFNpemUgaW1hZ2VTaXpl ID0gdGhpcy0+aW1hZ2VTaXplKCk7Ci0gICAgTGF5b3V0U2l6ZSB3aW5kb3dTaXplID0gTGF5b3V0 U2l6ZSh2aWV3LT53aWR0aCgpLCB2aWV3LT5oZWlnaHQoKSk7Ci0gICAgcmV0dXJuIGltYWdlU2l6 ZS53aWR0aCgpIDw9IHdpbmRvd1NpemUud2lkdGgoKSAmJiBpbWFnZVNpemUuaGVpZ2h0KCkgPD0g d2luZG93U2l6ZS5oZWlnaHQoKTsKKyAgICBJbnRTaXplIHZpZXdwb3J0U2l6ZSA9IHZpZXctPnZp c2libGVTaXplKCk7CisgICAgcmV0dXJuIGltYWdlU2l6ZS53aWR0aCgpIDw9IHZpZXdwb3J0U2l6 ZS53aWR0aCgpICYmIGltYWdlU2l6ZS5oZWlnaHQoKSA8PSB2aWV3cG9ydFNpemUuaGVpZ2h0KCk7 CiB9CiAKIApAQCAtMzgyLDggKzM4Myw5IEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlj a2VkKGludCB4LCAKIAogICAgICAgICBmbG9hdCBzY2FsZSA9IHRoaXMtPnNjYWxlKCk7CiAKLSAg ICAgICAgaW50IHNjcm9sbFggPSBzdGF0aWNfY2FzdDxpbnQ+KHggLyBzY2FsZSAtIHZpZXcoKS0+ d2lkdGgoKSAvIDIuMGYpOwotICAgICAgICBpbnQgc2Nyb2xsWSA9IHN0YXRpY19jYXN0PGludD4o eSAvIHNjYWxlIC0gdmlldygpLT5oZWlnaHQoKSAvIDIuMGYpOworICAgICAgICBJbnRTaXplIHZp ZXdwb3J0U2l6ZSA9IHZpZXcoKS0+dmlzaWJsZVNpemUoKTsKKyAgICAgICAgaW50IHNjcm9sbFgg PSBzdGF0aWNfY2FzdDxpbnQ+KHggLyBzY2FsZSAtIHZpZXdwb3J0U2l6ZS53aWR0aCgpIC8gMi4w Zik7CisgICAgICAgIGludCBzY3JvbGxZID0gc3RhdGljX2Nhc3Q8aW50Pih5IC8gc2NhbGUgLSB2 aWV3cG9ydFNpemUuaGVpZ2h0KCkgLyAyLjBmKTsKIAogICAgICAgICB2aWV3KCktPnNldFNjcm9s bFBvc2l0aW9uKEludFBvaW50KHNjcm9sbFgsIHNjcm9sbFkpKTsKICAgICB9Cg==