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

Unified Diff: Source/core/css/resolver/ViewportStyleResolver.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
« no previous file with comments | « Source/core/css/resolver/StyleResourceLoader.cpp ('k') | Source/core/dom/CSSSelectorWatch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ViewportStyleResolver.cpp
diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp
index eeeb75419db1065f8c0ef4f4781a10b718628b2f..be412e3f1b13d80007d3f7ca58cdc2fbabcc5122 100644
--- a/Source/core/css/resolver/ViewportStyleResolver.cpp
+++ b/Source/core/css/resolver/ViewportStyleResolver.cpp
@@ -38,7 +38,7 @@
#include "core/css/StyleRule.h"
#include "core/css/resolver/ScopedStyleResolver.h"
#include "core/dom/Document.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/ViewportDescription.h"
#include "core/frame/FrameView.h"
#include "core/frame/Settings.h"
@@ -147,7 +147,7 @@ float ViewportStyleResolver::viewportArgumentValue(CSSPropertyID id) const
return primitiveValue->getFloatValue();
if (primitiveValue->isFontRelativeLength())
- return primitiveValue->getFloatValue() * m_document->layoutStyle()->fontDescription().computedSize();
+ return primitiveValue->getFloatValue() * m_document->computedStyle()->fontDescription().computedSize();
if (primitiveValue->isPercentage()) {
float percentValue = primitiveValue->getFloatValue() / 100.0f;
@@ -196,7 +196,7 @@ Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
if (primitiveValue->getValueID() == CSSValueInternalExtendToZoom)
return Length(ExtendToZoom);
- LayoutStyle* documentStyle = m_document->mutableLayoutStyle();
+ ComputedStyle* documentStyle = m_document->mutableComputedStyle();
// If we have viewport units the conversion will mark the document style as having viewport units.
bool documentStyleHasViewportUnits = documentStyle->hasViewportUnits();
« no previous file with comments | « Source/core/css/resolver/StyleResourceLoader.cpp ('k') | Source/core/dom/CSSSelectorWatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698