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

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

Issue 129873004: RenderBlock::isSelfCollapsingBlock() should only be used when an object does not require layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update Created 6 years, 11 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/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderTextControlPlaceholder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 77b99b30e0ff38e48b956bd8632a847308beca28..22f2dad43404bc18048464ea502c3a950a56ce29 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -74,6 +74,7 @@
#include "core/rendering/RenderTableCell.h"
#include "core/rendering/RenderTableCol.h"
#include "core/rendering/RenderTableRow.h"
+#include "core/rendering/RenderTextControlPlaceholder.h"
#include "core/rendering/RenderTheme.h"
#include "core/rendering/RenderView.h"
#include "core/rendering/style/ContentData.h"
@@ -161,6 +162,9 @@ RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
return image;
}
+ if (element->shadowPseudoId() == "-webkit-input-placeholder")
ojan 2014/01/28 23:59:48 esprehn nagged me that we really shouldn't be addi
+ return new RenderTextControlPlaceholder(element);
+
if (element->hasTagName(rubyTag)) {
if (style->display() == INLINE)
return new RenderRubyAsInline(element);
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderTextControlPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698