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

Unified Diff: Source/core/layout/style/StyleBoxData.cpp

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
Index: Source/core/layout/style/StyleBoxData.cpp
diff --git a/Source/core/layout/style/StyleBoxData.cpp b/Source/core/layout/style/StyleBoxData.cpp
index e1eb2172b4489f38dd8771c22bb1898fa7520e75..93f8321e6ccd0c147a67483b1a9881e3f7e70672 100644
--- a/Source/core/layout/style/StyleBoxData.cpp
+++ b/Source/core/layout/style/StyleBoxData.cpp
@@ -22,7 +22,7 @@
#include "config.h"
#include "core/layout/style/StyleBoxData.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
namespace blink {
@@ -35,10 +35,10 @@ struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), "StyleBoxData should stay small");
StyleBoxData::StyleBoxData()
- : m_minWidth(LayoutStyle::initialMinSize())
- , m_maxWidth(LayoutStyle::initialMaxSize())
- , m_minHeight(LayoutStyle::initialMinSize())
- , m_maxHeight(LayoutStyle::initialMaxSize())
+ : m_minWidth(ComputedStyle::initialMinSize())
+ , m_maxWidth(ComputedStyle::initialMaxSize())
+ , m_minHeight(ComputedStyle::initialMinSize())
+ , m_maxHeight(ComputedStyle::initialMaxSize())
, m_zIndex(0)
, m_hasAutoZIndex(true)
, m_boxSizing(CONTENT_BOX)
« no previous file with comments | « Source/core/layout/style/StyleBoxData.h ('k') | Source/core/layout/style/StyleDeprecatedFlexibleBoxData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698