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

Unified Diff: Source/core/frame/FrameView.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/editing/iterators/TextIterator.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 4570d9b42ddb835ece1e4a98d41c3e7018303549..bd382ae5d5e6afe31828e9440225061ba32a4448 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -60,7 +60,7 @@
#include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
#include "core/layout/compositing/CompositedSelectionBound.h"
#include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "core/layout/svg/LayoutSVGRoot.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/FrameLoaderClient.h"
@@ -1299,7 +1299,7 @@ void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged,
for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
LayoutObject* renderer = viewportConstrainedObject;
- const LayoutStyle& style = renderer->styleRef();
+ const ComputedStyle& style = renderer->styleRef();
if (widthChanged) {
if (style.width().isFixed() && (style.left().isAuto() || style.right().isAuto()))
renderer->setNeedsPositionedMovementLayout();
@@ -2419,7 +2419,7 @@ void FrameView::updateAnnotatedRegions()
void FrameView::updateScrollCorner()
{
- RefPtr<LayoutStyle> cornerStyle;
+ RefPtr<ComputedStyle> cornerStyle;
IntRect cornerRect = scrollCornerRect();
Document* doc = m_frame->document();
« no previous file with comments | « Source/core/editing/iterators/TextIterator.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698