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

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

Issue 53373003: Remove display:run-in as per https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/_tHSX… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix test Created 7 years, 2 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/RenderFileUploadControl.cpp ('k') | Source/core/rendering/RenderListBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderInline.cpp
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
index b5a16d69c7445e2bb440d7db479323cb767abf90..f4155f84e8cc6f1d80a29dd192fd38e07cab6fac 100644
--- a/Source/core/rendering/RenderInline.cpp
+++ b/Source/core/rendering/RenderInline.cpp
@@ -125,7 +125,8 @@ void RenderInline::updateFromStyle()
{
RenderBoxModelObject::updateFromStyle();
- setInline(true); // Needed for run-ins, since run-in is considered a block display type.
+ // FIXME: Is this still needed. Was needed for run-ins, since run-in is considered a block display type.
+ setInline(true);
// FIXME: Support transforms and reflections on inline flows someday.
setHasTransform(false);
@@ -750,8 +751,6 @@ const char* RenderInline::renderName() const
return "RenderInline (generated)";
if (isAnonymous())
return "RenderInline (generated)";
- if (isRunIn())
- return "RenderInline (run-in)";
return "RenderInline";
}
@@ -999,8 +998,7 @@ LayoutRect RenderInline::linesVisualOverflowBoundingBox() const
LayoutRect RenderInline::clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const
{
- // Only run-ins are allowed in here during layout.
- ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());
+ ASSERT(!view() || !view()->layoutStateEnabled());
if (!firstLineBoxIncludingCulling() && !continuation())
return LayoutRect();
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.cpp ('k') | Source/core/rendering/RenderListBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698