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

Unified Diff: Source/core/paint/ObjectPainter.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/paint/ObjectPainter.h ('k') | Source/core/paint/SVGInlineTextBoxPainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/ObjectPainter.cpp
diff --git a/Source/core/paint/ObjectPainter.cpp b/Source/core/paint/ObjectPainter.cpp
index b310c2986405d59647c9a7079e7bd1c68227365d..16412741519feca9ea49a0ce4851c2d8af1de1ab 100644
--- a/Source/core/paint/ObjectPainter.cpp
+++ b/Source/core/paint/ObjectPainter.cpp
@@ -8,14 +8,14 @@
#include "core/layout/LayoutObject.h"
#include "core/layout/LayoutTheme.h"
#include "core/layout/PaintInfo.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "core/paint/LayoutObjectDrawingRecorder.h"
#include "platform/geometry/LayoutPoint.h"
#include "platform/graphics/GraphicsContextStateSaver.h"
namespace blink {
-void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const LayoutStyle& style, const Vector<LayoutRect>& focusRingRects)
+void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const ComputedStyle& style, const Vector<LayoutRect>& focusRingRects)
{
ASSERT(style.outlineStyleIsAuto());
Vector<IntRect> focusRingIntRects;
@@ -26,7 +26,7 @@ void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const LayoutStyle
void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& objectBounds, const LayoutRect& visualOverflowBounds)
{
- const LayoutStyle& styleToUse = m_layoutObject.styleRef();
+ const ComputedStyle& styleToUse = m_layoutObject.styleRef();
if (!styleToUse.hasOutline())
return;
« no previous file with comments | « Source/core/paint/ObjectPainter.h ('k') | Source/core/paint/SVGInlineTextBoxPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698