Title: [126335] trunk/Source/WebCore
- Revision
- 126335
- Author
- [email protected]
- Date
- 2012-08-22 12:34:31 -0700 (Wed, 22 Aug 2012)
Log Message
Remove RenderBlock::paintEllipsisBoxes
https://bugs.webkit.org/show_bug.cgi?id=94709
Reviewed by Eric Seidel.
Remove unused method.
No change in functionality, no new tests.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintFloats):
* rendering/RenderBlock.h:
(RenderBlock):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126334 => 126335)
--- trunk/Source/WebCore/ChangeLog 2012-08-22 19:32:41 UTC (rev 126334)
+++ trunk/Source/WebCore/ChangeLog 2012-08-22 19:34:31 UTC (rev 126335)
@@ -1,3 +1,19 @@
+2012-08-22 Rob Buis <[email protected]>
+
+ Remove RenderBlock::paintEllipsisBoxes
+ https://bugs.webkit.org/show_bug.cgi?id=94709
+
+ Reviewed by Eric Seidel.
+
+ Remove unused method.
+
+ No change in functionality, no new tests.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintFloats):
+ * rendering/RenderBlock.h:
+ (RenderBlock):
+
2012-08-22 Tommy Widenflycht <[email protected]>
MediaStream API: Introduce RTCSessionDescription
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (126334 => 126335)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-08-22 19:32:41 UTC (rev 126334)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-08-22 19:34:31 UTC (rev 126335)
@@ -3080,31 +3080,6 @@
}
}
-void RenderBlock::paintEllipsisBoxes(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
- if (!paintInfo.shouldPaintWithinRoot(this) || !firstLineBox())
- return;
-
- if (style()->visibility() == VISIBLE && paintInfo.phase == PaintPhaseForeground) {
- // We can check the first box and last box and avoid painting if we don't
- // intersect.
- LayoutUnit yPos = paintOffset.y() + firstLineBox()->y();
- LayoutUnit h = lastLineBox()->y() + lastLineBox()->logicalHeight() - firstLineBox()->y();
- if (yPos >= paintInfo.rect.maxY() || yPos + h <= paintInfo.rect.y())
- return;
-
- // See if our boxes intersect with the dirty rect. If so, then we paint
- // them. Note that boxes can easily overlap, so we can't make any assumptions
- // based off positions of our first line box or our last line box.
- for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
- yPos = paintOffset.y() + curr->y();
- h = curr->logicalHeight();
- if (curr->ellipsisBox() && yPos < paintInfo.rect.maxY() && yPos + h > paintInfo.rect.y())
- curr->paintEllipsisBox(paintInfo, paintOffset, curr->lineTop(), curr->lineBottom());
- }
- }
-}
-
RenderInline* RenderBlock::inlineElementContinuation() const
{
RenderBoxModelObject* continuation = this->continuation();
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (126334 => 126335)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2012-08-22 19:32:41 UTC (rev 126334)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2012-08-22 19:34:31 UTC (rev 126335)
@@ -743,7 +743,6 @@
void paintContents(PaintInfo&, const LayoutPoint&);
void paintColumnContents(PaintInfo&, const LayoutPoint&, bool paintFloats = false);
void paintColumnRules(PaintInfo&, const LayoutPoint&);
- void paintEllipsisBoxes(PaintInfo&, const LayoutPoint&);
void paintSelection(PaintInfo&, const LayoutPoint&);
void paintCaret(PaintInfo&, const LayoutPoint&, CaretType);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
