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

Issue 296983005: Revert of Refactor avoidsFloats() to reflect CSS2.1 spec more clearly (Closed)

Created:
6 years, 7 months ago by rhogan
Modified:
6 years, 7 months ago
CC:
blink-reviews, mstensho+blink_opera.com, blink-reviews-rendering, zoltan1, dsinclair, eae+blinkwatch, leviw+renderwatch, jchaffraix+rendering, pdr., rune+blink
Visibility:
Public.

Description

Revert of Refactor avoidsFloats() to reflect CSS2.1 spec more clearly (https://codereview.chromium.org/268833003/) Reason for revert: May have caused a clusterfuzz regression: https://code.google.com/p/chromium/issues/detail?id=375954. Original issue's description: > Refactor avoidsFloats() to reflect CSS2.1 spec more clearly > > Introduce the 'createsBlockFormatting' concept to RenderBlock::avoidsFloats() > and remove a couple of now-redundant virtualizations of the function. > > BUG= > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=173549 TBR=leviw@chromium.org

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+25 lines, -18 lines) Patch
M Source/core/rendering/RenderBlock.h View 3 chunks +4 lines, -1 line 0 comments Download
M Source/core/rendering/RenderBlock.cpp View 2 chunks +12 lines, -0 lines 0 comments Download
M Source/core/rendering/RenderBlockFlow.cpp View 5 chunks +5 lines, -5 lines 0 comments Download
M Source/core/rendering/RenderBox.h View 1 chunk +0 lines, -2 lines 0 comments Download
M Source/core/rendering/RenderBox.cpp View 1 chunk +1 line, -10 lines 0 comments Download
M Source/core/rendering/RenderFieldset.h View 1 chunk +1 line, -0 lines 0 comments Download
M Source/core/rendering/RenderTable.h View 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 9 (0 generated)
rhogan
Created Revert of Refactor avoidsFloats() to reflect CSS2.1 spec more clearly
6 years, 7 months ago (2014-05-22 18:03:27 UTC) #1
rhogan
The CQ bit was checked by robhogan@gmail.com
6 years, 7 months ago (2014-05-22 18:03:37 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/robhogan@gmail.com/296983005/1
6 years, 7 months ago (2014-05-22 18:04:38 UTC) #3
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-22 18:04:39 UTC) #4
commit-bot: I haz the power
No LGTM from a valid reviewer yet. Only full committers are accepted. Even if an ...
6 years, 7 months ago (2014-05-22 18:04:40 UTC) #5
rhogan
The CQ bit was checked by robhogan@gmail.com
6 years, 7 months ago (2014-05-22 18:06:33 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/robhogan@gmail.com/296983005/1
6 years, 7 months ago (2014-05-22 18:07:09 UTC) #7
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-22 18:07:38 UTC) #8
commit-bot: I haz the power
6 years, 7 months ago (2014-05-22 18:07:39 UTC) #9
Failed to apply patch for Source/core/rendering/RenderBlock.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/RenderBlock.h
  Hunk #1 succeeded at 325 (offset -2 lines).
  Hunk #2 FAILED at 388.
  Hunk #3 succeeded at 468 (offset -1 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/rendering/RenderBlock.h.rej

Patch:       Source/core/rendering/RenderBlock.h
Index: Source/core/rendering/RenderBlock.h
diff --git a/Source/core/rendering/RenderBlock.h
b/Source/core/rendering/RenderBlock.h
index
94e6b7f797282e21ea2585fd61fa3d6dcf886811..74af6b2a6384b5eb30b59e35c550c92b8ded3761
100644
--- a/Source/core/rendering/RenderBlock.h
+++ b/Source/core/rendering/RenderBlock.h
@@ -327,7 +327,6 @@
 
     void setDesiredColumnCountAndWidth(int, LayoutUnit);
 
-    bool avoidsOrIgnoresFloats() { return isFloatingOrOutOfFlowPositioned() ||
avoidsFloats(); }
 public:
     virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false);
 protected:
@@ -389,6 +388,8 @@
 
     bool hasCaret() const { return hasCaret(CursorCaret) ||
hasCaret(DragCaret); }
     bool hasCaret(CaretType) const;
+
+    virtual bool avoidsFloats() const OVERRIDE;
 
     bool hitTestColumns(const HitTestRequest&, HitTestResult&, const
HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset,
HitTestAction);
     bool hitTestContents(const HitTestRequest&, HitTestResult&, const
HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset,
HitTestAction);
@@ -470,6 +471,8 @@
     enum PageBoundaryRule { ExcludePageBoundary, IncludePageBoundary };
     LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule =
ExcludePageBoundary) const;
 
+    bool createsBlockFormattingContext() const;
+
 public:
     LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
     LayoutUnit pageLogicalHeightForOffset(LayoutUnit offset) const;

Powered by Google App Engine
This is Rietveld 408576698