Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1040)

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 24278008: [oilpan] Handlify Nodes in htmlediting (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 89814395d9568d8d7a29c9e64f2611b68e95bc1b..7ac16223ff205177832ea296f2df89ae6e941bcf 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -3987,7 +3987,7 @@ LayoutRect RenderBox::localCaretRect(InlineBox* box, int caretOffset, LayoutUnit
// FIXME: Border/padding should be added for all elements but this workaround
// is needed because we use offsets inside an "atomic" element to represent
// positions before and after the element in deprecated editing offsets.
- if (node() && !(editingIgnoresContent(node().handle().raw()) || isTableElement(node().handle().raw()))) {
+ if (node() && !(editingIgnoresContent(node()) || isTableElement(node()))) {
rect.setX(rect.x() + borderLeft() + paddingLeft());
rect.setY(rect.y() + paddingTop() + borderTop());
}
@@ -4002,7 +4002,7 @@ VisiblePosition RenderBox::positionForPoint(const LayoutPoint& point)
{
// no children...return this render object's element, if there is one, and offset 0
if (!firstChild())
- return createVisiblePosition(nonPseudoNode() ? firstPositionInOrBeforeNode(nonPseudoNode().handle().raw()) : Position());
+ return createVisiblePosition(nonPseudoNode() ? firstPositionInOrBeforeNode(nonPseudoNode()) : Position());
if (isTable() && nonPseudoNode()) {
LayoutUnit right = contentWidth() + borderAndPaddingWidth();
@@ -4010,8 +4010,8 @@ VisiblePosition RenderBox::positionForPoint(const LayoutPoint& point)
if (point.x() < 0 || point.x() > right || point.y() < 0 || point.y() > bottom) {
if (point.x() <= right / 2)
- return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode().handle().raw()));
- return createVisiblePosition(lastPositionInOrAfterNode(nonPseudoNode().handle().raw()));
+ return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode()));
+ return createVisiblePosition(lastPositionInOrAfterNode(nonPseudoNode()));
}
}
@@ -4079,7 +4079,7 @@ VisiblePosition RenderBox::positionForPoint(const LayoutPoint& point)
if (closestRenderer)
return closestRenderer->positionForPoint(adjustedPoint - closestRenderer->locationOffset());
- return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode().handle().raw()));
+ return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode()));
}
bool RenderBox::shrinkToAvoidFloats() const

Powered by Google App Engine
This is Rietveld 408576698