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

Unified Diff: Source/core/layout/LayoutBlockFlow.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlockFlow.h
diff --git a/Source/core/layout/LayoutBlockFlow.h b/Source/core/layout/LayoutBlockFlow.h
index 36f26745ed5e3a3a92bac1dfaaa84a6b0ccc930d..3d7d29efe58f623d2db482ce6f5dcffaa7de3f1b 100644
--- a/Source/core/layout/LayoutBlockFlow.h
+++ b/Source/core/layout/LayoutBlockFlow.h
@@ -40,7 +40,7 @@
#include "core/layout/FloatingObjects.h"
#include "core/layout/LayoutBlock.h"
#include "core/layout/line/TrailingObjects.h"
-#include "core/layout/style/LayoutStyleConstants.h"
+#include "core/layout/style/ComputedStyleConstants.h"
namespace blink {
@@ -243,8 +243,8 @@ protected:
void createFloatingObjects();
- virtual void styleWillChange(StyleDifference, const LayoutStyle& newStyle) override;
- virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
+ virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
+ virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox&);
@@ -314,7 +314,7 @@ private:
virtual RootInlineBox* createRootInlineBox(); // Subclassed by SVG
- bool isPagedOverflow(const LayoutStyle&);
+ bool isPagedOverflow(const ComputedStyle&);
enum FlowThreadType {
NoFlowThread,
@@ -322,10 +322,10 @@ private:
PagedFlowThread
};
- FlowThreadType flowThreadType(const LayoutStyle&);
+ FlowThreadType flowThreadType(const ComputedStyle&);
LayoutMultiColumnFlowThread* createMultiColumnFlowThread(FlowThreadType);
- void createOrDestroyMultiColumnFlowThreadIfNeeded(const LayoutStyle* oldStyle);
+ void createOrDestroyMultiColumnFlowThreadIfNeeded(const ComputedStyle* oldStyle);
void updateLogicalWidthForAlignment(const ETextAlign&, const RootInlineBox*, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float& availableLogicalWidth, unsigned expansionOpportunityCount);
void checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight);
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698