Changeset 85067 in webkit
- Timestamp:
- Apr 27, 2011 11:29:06 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r85066 r85067 1 2011-04-27 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Anders Carlsson. 4 5 <rdar://problem/9335973> REGRESSION (r84341): Buttons in the Mac App store are rendered incorrectly 6 https://bugs.webkit.org/show_bug.cgi?id=59622 7 8 * fast/borders/border-image-trumps-radius-expected.png: Added. 9 * fast/borders/border-image-trumps-radius-expected.txt: Added. 10 * fast/borders/border-image-trumps-radius.html: Added. 11 1 12 2011-04-27 Martin Robinson <mrobinson@igalia.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r85064 r85067 1 2011-04-27 Dan Bernstein <mitz@apple.com> 2 3 Reviewed by Anders Carlsson. 4 5 <rdar://problem/9335973> REGRESSION (r84341): Buttons in the Mac App store are rendered incorrectly 6 https://bugs.webkit.org/show_bug.cgi?id=59622 7 8 Test: fast/borders/border-image-trumps-radius.html 9 10 * rendering/RenderBox.cpp: 11 (WebCore::RenderBox::determineBackgroundBleedAvoidance): If there is a renderable, loaded border 12 image, then border radius is ignored, so no bleed avoidance is needed. 13 * rendering/RenderObject.cpp: 14 (WebCore::RenderObject::borderImageIsLoadedAndCanBeRendered): Added. Moved some logic here from... 15 (WebCore::RenderObject::mustRepaintBackgroundOrBorder): ...here. 16 * rendering/RenderObject.h: 17 1 18 2011-02-03 Martin Robinson <mrobinson@igalia.com> 2 19 -
trunk/Source/WebCore/rendering/RenderBox.cpp
r84991 r85067 821 821 const RenderStyle* style = this->style(); 822 822 823 if (!style->hasBackground() || !style->hasBorder() || !style->hasBorderRadius() )823 if (!style->hasBackground() || !style->hasBorder() || !style->hasBorderRadius() || borderImageIsLoadedAndCanBeRendered()) 824 824 return BackgroundBleedNone; 825 825 -
trunk/Source/WebCore/rendering/RenderObject.cpp
r84454 r85067 678 678 } 679 679 680 bool RenderObject::borderImageIsLoadedAndCanBeRendered() const 681 { 682 ASSERT(style()->hasBorder()); 683 684 StyleImage* borderImage = style()->borderImage().image(); 685 return borderImage && borderImage->canRender(style()->effectiveZoom()) && borderImage->isLoaded(); 686 } 687 680 688 bool RenderObject::mustRepaintBackgroundOrBorder() const 681 689 { … … 691 699 692 700 // Our fill layers are ok. Let's check border. 693 if (style()->hasBorder()) { 694 // Border images are not ok. 695 StyleImage* borderImage = style()->borderImage().image(); 696 bool shouldPaintBorderImage = borderImage && borderImage->canRender(style()->effectiveZoom()); 697 698 // If the image hasn't loaded, we're still using the normal border style. 699 if (shouldPaintBorderImage && borderImage->isLoaded()) 700 return true; 701 } 701 if (style()->hasBorder() && borderImageIsLoadedAndCanBeRendered()) 702 return true; 702 703 703 704 return false; -
trunk/Source/WebCore/rendering/RenderObject.h
r84589 r85067 417 417 418 418 bool hasBoxDecorations() const { return m_paintBackground; } 419 bool borderImageIsLoadedAndCanBeRendered() const; 419 420 bool mustRepaintBackgroundOrBorder() const; 420 421 bool hasBackground() const { return style()->hasBackground(); }
Note: See TracChangeset
for help on using the changeset viewer.