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

Unified Diff: Source/core/html/HTMLTextFormControlElement.cpp

Issue 1115353002: Update renderer to layoutObject in core/html. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/html/HTMLTableCellElement.cpp ('k') | Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLTextFormControlElement.cpp
diff --git a/Source/core/html/HTMLTextFormControlElement.cpp b/Source/core/html/HTMLTextFormControlElement.cpp
index 4f0657dbea22e6e1d6551d8b641eebcc37f33aa0..97396f7fe46049e5e9536dbaf9ef5a918743eed5 100644
--- a/Source/core/html/HTMLTextFormControlElement.cpp
+++ b/Source/core/html/HTMLTextFormControlElement.cpp
@@ -235,7 +235,7 @@ void HTMLTextFormControlElement::setRangeText(const String& replacement, unsigne
setInnerEditorValue(text);
- // FIXME: What should happen to the value (as in value()) if there's no renderer?
+ // FIXME: What should happen to the value (as in value()) if there's no layoutObject?
if (!layoutObject())
return;
@@ -641,7 +641,7 @@ void HTMLTextFormControlElement::setInnerEditorValue(const String& value)
static String finishText(StringBuilder& result)
{
- // Remove one trailing newline; there's always one that's collapsed out by rendering.
+ // Remove one trailing newline; there's always one that's collapsed out by layoutObject.
size_t size = result.length();
if (size && result[size - 1] == '\n')
result.resize(--size);
@@ -684,19 +684,19 @@ static void getNextSoftBreak(RootInlineBox*& line, Node*& breakNode, unsigned& b
String HTMLTextFormControlElement::valueWithHardLineBreaks() const
{
- // FIXME: It's not acceptable to ignore the HardWrap setting when there is no renderer.
+ // FIXME: It's not acceptable to ignore the HardWrap setting when there is no layoutObject.
// While we have no evidence this has ever been a practical problem, it would be best to fix it some day.
HTMLElement* innerText = innerEditorElement();
if (!innerText || !isTextFormControl())
return value();
- LayoutBlockFlow* renderer = toLayoutBlockFlow(innerText->layoutObject());
- if (!renderer)
+ LayoutBlockFlow* layoutObject = toLayoutBlockFlow(innerText->layoutObject());
+ if (!layoutObject)
return value();
Node* breakNode;
unsigned breakOffset;
- RootInlineBox* line = renderer->firstRootBox();
+ RootInlineBox* line = layoutObject->firstRootBox();
if (!line)
return value();
« no previous file with comments | « Source/core/html/HTMLTableCellElement.cpp ('k') | Source/core/html/ImageDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698