Title: [157677] trunk/Source/WebCore
- Revision
- 157677
- Author
- [email protected]
- Date
- 2013-10-19 13:26:58 -0700 (Sat, 19 Oct 2013)
Log Message
Move m_lineBoxes from RenderBlock to RenderBlockFlow (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=122969
Reviewed by Andreas Kling.
- Move containsNonZeroBidiLevel to RenderBlockFlow.
* editing/Editor.cpp:
(WebCore::Editor::hasBidiSelection):
* rendering/RenderBlock.cpp:
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::containsNonZeroBidiLevel):
* rendering/RenderBlockFlow.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (157676 => 157677)
--- trunk/Source/WebCore/ChangeLog 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/ChangeLog 2013-10-19 20:26:58 UTC (rev 157677)
@@ -1,3 +1,20 @@
+2013-10-19 Sam Weinig <[email protected]>
+
+ Move m_lineBoxes from RenderBlock to RenderBlockFlow (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=122969
+
+ Reviewed by Andreas Kling.
+
+ - Move containsNonZeroBidiLevel to RenderBlockFlow.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::hasBidiSelection):
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::containsNonZeroBidiLevel):
+ * rendering/RenderBlockFlow.h:
+
2013-10-18 Sam Weinig <[email protected]>
Move m_lineBoxes from RenderBlock to RenderBlockFlow (Part 2)
Modified: trunk/Source/WebCore/editing/Editor.cpp (157676 => 157677)
--- trunk/Source/WebCore/editing/Editor.cpp 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/editing/Editor.cpp 2013-10-19 20:26:58 UTC (rev 157677)
@@ -585,7 +585,7 @@
startNode = m_frame.selection().selection().visibleStart().deepEquivalent().deprecatedNode();
auto renderer = startNode->renderer();
- while (renderer && !renderer->isRenderBlock())
+ while (renderer && !renderer->isRenderBlockFlow())
renderer = renderer->parent();
if (!renderer)
@@ -595,7 +595,7 @@
if (!style->isLeftToRightDirection())
return true;
- return toRenderBlock(renderer)->containsNonZeroBidiLevel();
+ return toRenderBlockFlow(renderer)->containsNonZeroBidiLevel();
}
TriState Editor::selectionUnorderedListState() const
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (157676 => 157677)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-10-19 20:26:58 UTC (rev 157677)
@@ -4912,17 +4912,6 @@
return -1;
}
-bool RenderBlock::containsNonZeroBidiLevel() const
-{
- for (RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox()) {
- for (InlineBox* box = root->firstLeafChild(); box; box = box->nextLeafChild()) {
- if (box->bidiLevel())
- return true;
- }
- }
- return false;
-}
-
RenderBlock* RenderBlock::firstLineBlock() const
{
RenderBlock* firstLineBlock = const_cast<RenderBlock*>(this);
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (157676 => 157677)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2013-10-19 20:26:58 UTC (rev 157677)
@@ -235,8 +235,6 @@
RootInlineBox* firstRootBox() const { return static_cast<RootInlineBox*>(firstLineBox()); }
RootInlineBox* lastRootBox() const { return static_cast<RootInlineBox*>(lastLineBox()); }
- bool containsNonZeroBidiLevel() const;
-
GapRects selectionGapRectsForRepaint(const RenderLayerModelObject* repaintContainer);
LayoutRect logicalLeftSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
RenderObject* selObj, LayoutUnit logicalLeft, LayoutUnit logicalTop, LayoutUnit logicalHeight, const LogicalSelectionOffsetCaches&, const PaintInfo*);
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (157676 => 157677)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2013-10-19 20:26:58 UTC (rev 157677)
@@ -2523,4 +2523,15 @@
}
}
+bool RenderBlockFlow::containsNonZeroBidiLevel() const
+{
+ for (auto root = firstRootBox(); root; root = root->nextRootBox()) {
+ for (auto box = root->firstLeafChild(); box; box = box->nextLeafChild()) {
+ if (box->bidiLevel())
+ return true;
+ }
+ }
+ return false;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (157676 => 157677)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2013-10-19 20:18:11 UTC (rev 157676)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2013-10-19 20:26:58 UTC (rev 157677)
@@ -305,6 +305,8 @@
void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }
bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }
+ bool containsNonZeroBidiLevel() const;
+
protected:
LayoutUnit maxPositiveMarginBefore() const { return m_rareData ? m_rareData->m_margins.positiveMarginBefore() : RenderBlockFlowRareData::positiveMarginBeforeDefault(this); }
LayoutUnit maxNegativeMarginBefore() const { return m_rareData ? m_rareData->m_margins.negativeMarginBefore() : RenderBlockFlowRareData::negativeMarginBeforeDefault(this); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
