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

Unified Diff: Source/core/editing/Caret.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 10 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/editing/Caret.cpp
diff --git a/Source/core/editing/Caret.cpp b/Source/core/editing/Caret.cpp
index da6ba8a8207f1782f96362bbf14d6f288840cc88..28586fec2226410b3f450842310fc6e284a996e4 100644
--- a/Source/core/editing/Caret.cpp
+++ b/Source/core/editing/Caret.cpp
@@ -128,7 +128,7 @@ LayoutBlock* CaretBase::caretRenderer(Node* node)
if (!node)
return 0;
- LayoutObject* renderer = node->renderer();
+ LayoutObject* renderer = node->layoutObject();
if (!renderer)
return 0;
@@ -167,7 +167,7 @@ bool CaretBase::updateCaretRect(Document* document, const PositionWithAffinity&
if (caretPosition.position().isNull())
return false;
- ASSERT(caretPosition.position().deprecatedNode()->renderer());
+ ASSERT(caretPosition.position().deprecatedNode()->layoutObject());
// First compute a rect local to the renderer at the selection start.
LayoutObject* renderer;
@@ -215,7 +215,7 @@ void CaretBase::invalidateLocalCaretRect(Node* node, const LayoutRect& rect)
inflatedRect.inflate(1);
// FIXME: We should use mapLocalToContainer() since we know we're not un-rooted.
- mapCaretRectToCaretPainter(node->renderer(), caretPainter, inflatedRect);
+ mapCaretRectToCaretPainter(node->layoutObject(), caretPainter, inflatedRect);
// FIXME: We should not allow paint invalidation out of paint invalidation state. crbug.com/457415
DisablePaintInvalidationStateAsserts disabler;
@@ -272,8 +272,8 @@ void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoi
else
element = node->parentElement();
- if (element && element->renderer())
- caretColor = element->renderer()->resolveColor(CSSPropertyColor);
+ if (element && element->layoutObject())
+ caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
context->fillRect(caret, caretColor);
}

Powered by Google App Engine
This is Rietveld 408576698