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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h

Issue 10543041: Merge 119227 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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 | « LayoutTests/fast/flexbox/line-clamp-removed-dynamically-expected.html ('k') | Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h
===================================================================
--- Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h (revision 119642)
+++ Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h (working copy)
@@ -40,6 +40,8 @@
void calcHorizontalPrefWidths();
void calcVerticalPrefWidths();
+ virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle) OVERRIDE;
+
virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0);
void layoutHorizontalBox(bool relayoutChildren);
void layoutVerticalBox(bool relayoutChildren);
@@ -65,6 +67,7 @@
private:
void applyLineClamp(FlexBoxIterator&, bool relayoutChildren);
+ void clearLineClamp();
};
} // namespace WebCore
« no previous file with comments | « LayoutTests/fast/flexbox/line-clamp-removed-dynamically-expected.html ('k') | Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698