Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(176)

Issue 10379031: Merge 114095 - Background width (or height) is wrong if width (or height) * zoom < 1. (Closed)

Created:
8 years, 4 months ago by Hironori Bono
Modified:
8 years, 4 months ago
Reviewers:
shinyak
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Visibility:
Public.

Description

Merge 114095 - Background width (or height) is wrong if width (or height) * zoom < 1. https://bugs.webkit.org/show_bug.cgi?id=83350 Reviewed by Nikolas Zimmermann. Source/WebCore: calculateImageIntrinsicDimension will return wrong size if the calculated size is 0. 0 is used for expressing unspecfied, so the method returns the box width(height) instead. Since CachedImage has already similar code, we moved it to IntSize and shared it. Tests: fast/css/zoom-background-repeat-x-expected.html fast/css/zoom-background-repeat-x.html fast/css/zoom-background-repeat-y-expected.html fast/css/zoom-background-repeat-y.html * loader/cache/CachedImage.cpp: (WebCore::CachedImage::imageSizeForRenderer): * platform/graphics/IntSize.h: (IntSize): (WebCore::IntSize::scale): (WebCore::IntSize::clampToMinimumSize): * rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::calculateImageIntrinsicDimensions): LayoutTests: * fast/css/zoom-background-repeat-x-expected.html: Added. * fast/css/zoom-background-repeat-x.html: Added. * fast/css/zoom-background-repeat-y-expected.html: Added. * fast/css/zoom-background-repeat-y.html: Added. TBR=shinyak@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=116271

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+43 lines, -37 lines) Patch
A + LayoutTests/fast/css/zoom-background-repeat-x.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/css/zoom-background-repeat-x-expected.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/css/zoom-background-repeat-y.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/css/zoom-background-repeat-y-expected.html View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/loader/cache/CachedImage.cpp View 1 chunk +6 lines, -9 lines 0 comments Download
M Source/WebCore/platform/graphics/IntSize.h View 2 chunks +16 lines, -3 lines 0 comments Download
M Source/WebCore/rendering/RenderBoxModelObject.cpp View 1 chunk +25 lines, -29 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Hironori Bono
8 years, 4 months ago (2012-05-07 05:03:21 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698