2011-08-25 Igor Oliveira <igor.oliveira@openbossa.org>

Rollout r93799: Caused bad clipping on the bottom of tall glyphs inside a button label * rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::layoutInlineChildren): * rendering/RenderBox.cpp: * rendering/RenderBox.h: (WebCore::RenderBox::hasControlClip): (WebCore::RenderBox::controlClipRect): * rendering/RenderButton.cpp: (WebCore::RenderButton::setupInnerStyle): LayoutTests: Rollout r93799: Caused bad clipping on the bottom of tall glyphs inside a button label * fast/css/button-overflow-ellipsis.html: Removed. * platform/qt/fast/css/button-overflow-ellipsis-expected.txt: Removed. Canonical link: https://commits.webkit.org/82766@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93820 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Aug 25, 2011 · 6c9bbf5 · 6c9bbf5
1 parent 30b3524
commit 6c9bbf5
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 45 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-25  Igor Oliveira  <igor.oliveira@openbossa.org>
+
+        Rollout r93799: Caused bad clipping on the bottom of tall glyphs inside a button label
+
+        * fast/css/button-overflow-ellipsis.html: Removed.
+        * platform/qt/fast/css/button-overflow-ellipsis-expected.txt: Removed.
+
 2011-08-25  Anders Carlsson  <andersca@apple.com>
 
         Return the correct value for NPNVsupportsCarbonBool

diff --git a/LayoutTests/fast/css/button-overflow-ellipsis.html b/LayoutTests/fast/css/button-overflow-ellipsis.html
diff --git a/LayoutTests/platform/qt/fast/css/button-overflow-ellipsis-expected.txt b/LayoutTests/platform/qt/fast/css/button-overflow-ellipsis-expected.txt
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-08-25  Igor Oliveira  <igor.oliveira@openbossa.org>
+
+        Rollout r93799: Caused bad clipping on the bottom of tall glyphs inside a button label
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+        * rendering/RenderBox.cpp:
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::hasControlClip):
+        (WebCore::RenderBox::controlClipRect):
+        * rendering/RenderButton.cpp:
+        (WebCore::RenderButton::setupInnerStyle):
+
 2011-08-25  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
 
         [Qt] Enable password echo on Symbian builds

diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -1221,7 +1221,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
     // FIXME: CSS3 says that descendants that are clipped must also know how to truncate.  This is insanely
     // difficult to figure out (especially in the middle of doing layout), and is really an esoteric pile of nonsense
     // anyway, so we won't worry about following the draft here.
-    bool hasTextOverflow = style()->textOverflow() && (hasOverflowClip() || hasControlClip());
+    bool hasTextOverflow = style()->textOverflow() && hasOverflowClip();
 
     // Walk all the lines and delete our ellipsis line boxes if they exist.
     if (hasTextOverflow)

diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
@@ -1107,16 +1107,6 @@ void RenderBox::paintCustomHighlight(const LayoutPoint& paintOffset, const Atomi
 
 #endif
 
-LayoutRect RenderBox::controlClipRect(const LayoutPoint& additionalOffset) const
-{
-    if (!hasControlClip())
-        return LayoutRect();
-
-    LayoutRect clipRect(additionalOffset + IntSize(borderLeft(), borderTop()),
-        size() - IntSize(borderLeft() + borderRight(), borderTop() + borderBottom()));
-    return clipRect;
-}
-
 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset)
 {
     if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)

diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
@@ -343,8 +343,8 @@ class RenderBox : public RenderBoxModelObject {
 
     virtual LayoutRect overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
     LayoutRect clipRect(const LayoutPoint& location);
-    virtual bool hasControlClip() const { return isAnonymousBlock() && parentBox() && parentBox()->hasControlClip(); }
-    virtual LayoutRect controlClipRect(const LayoutPoint&) const;
+    virtual bool hasControlClip() const { return false; }
+    virtual LayoutRect controlClipRect(const LayoutPoint&) const { return LayoutRect(); }
     bool pushContentsClip(PaintInfo&, const LayoutPoint& accumulatedOffset);
     void popContentsClip(PaintInfo&, PaintPhase originalPhase, const LayoutPoint& accumulatedOffset);
 

diff --git a/Source/WebCore/rendering/RenderButton.cpp b/Source/WebCore/rendering/RenderButton.cpp
@@ -104,7 +104,6 @@ void RenderButton::setupInnerStyle(RenderStyle* innerStyle)
     ASSERT(innerStyle->refCount() == 1);
     // RenderBlock::createAnonymousBlock creates a new RenderStyle, so this is
     // safe to modify.
-    innerStyle->setTextOverflow(style()->textOverflow());
     innerStyle->setBoxFlex(1.0f);
     innerStyle->setBoxOrient(style()->boxOrient());
 }