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

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

Issue 394773003: Implement HTMLMarqueeElement's animation in private scripts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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/html/HTMLMarqueeElement.js ('k') | Source/core/rendering/RenderMarquee.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 711b4af53f44cbb468e3d0391f5c0177cf72cf2d..dcfc9037449d93cf40bbe05936f79bd6f8ad1540 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -53,7 +53,6 @@
#include "core/rendering/RenderGrid.h"
#include "core/rendering/RenderInline.h"
#include "core/rendering/RenderLayer.h"
-#include "core/rendering/RenderMarquee.h"
#include "core/rendering/RenderObjectInlines.h"
#include "core/rendering/RenderRegion.h"
#include "core/rendering/RenderTableCell.h"
@@ -3156,10 +3155,6 @@ void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay
adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth);
- // A horizontal marquee with inline children has no minimum width.
- if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal())
- minLogicalWidth = 0;
-
if (isTableCell()) {
Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth();
if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
« no previous file with comments | « Source/core/html/HTMLMarqueeElement.js ('k') | Source/core/rendering/RenderMarquee.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698