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

Unified Diff: Source/core/layout/LayoutMediaControls.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/layout/LayoutMediaControls.h ('k') | Source/core/layout/LayoutMenuList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMediaControls.cpp
diff --git a/Source/core/layout/LayoutMediaControls.cpp b/Source/core/layout/LayoutMediaControls.cpp
index ec8754fbb41c3c7f34b3cb0c5bdf977c6ee5ff58..ba3f84072b174f37b4cba226d87874ddfd5f5b23 100644
--- a/Source/core/layout/LayoutMediaControls.cpp
+++ b/Source/core/layout/LayoutMediaControls.cpp
@@ -130,7 +130,7 @@ static Image* getMediaSliderThumb()
return mediaSliderThumb;
}
-static void paintRoundedSliderBackground(const IntRect& rect, const LayoutStyle&, GraphicsContext* context)
+static void paintRoundedSliderBackground(const IntRect& rect, const ComputedStyle&, GraphicsContext* context)
{
int borderRadius = rect.height() / 2;
IntSize radii(borderRadius, borderRadius);
@@ -138,7 +138,7 @@ static void paintRoundedSliderBackground(const IntRect& rect, const LayoutStyle&
context->fillRoundedRect(rect, radii, radii, radii, radii, sliderBackgroundColor);
}
-static void paintSliderRangeHighlight(const IntRect& rect, const LayoutStyle& style, GraphicsContext* context, int startPosition, int endPosition, Color startColor, Color endColor)
+static void paintSliderRangeHighlight(const IntRect& rect, const ComputedStyle& style, GraphicsContext* context, int startPosition, int endPosition, Color startColor, Color endColor)
{
// Calculate border radius; need to avoid being smaller than half the slider height
// because of https://bugs.webkit.org/show_bug.cgi?id=30143.
@@ -200,7 +200,7 @@ static bool paintMediaSlider(LayoutObject* object, const PaintInfo& paintInfo, c
if (!mediaElement)
return false;
- const LayoutStyle& style = object->styleRef();
+ const ComputedStyle& style = object->styleRef();
GraphicsContext* context = paintInfo.context;
paintRoundedSliderBackground(rect, style, context);
@@ -279,7 +279,7 @@ static bool paintMediaVolumeSlider(LayoutObject* object, const PaintInfo& paintI
return false;
GraphicsContext* context = paintInfo.context;
- const LayoutStyle& style = object->styleRef();
+ const ComputedStyle& style = object->styleRef();
paintRoundedSliderBackground(rect, style, context);
@@ -421,7 +421,7 @@ bool LayoutMediaControls::paintMediaControlsPart(MediaControlElementType part, L
const int mediaSliderThumbHeight = 24;
const int mediaVolumeSliderThumbHeight = 24;
-void LayoutMediaControls::adjustMediaSliderThumbSize(LayoutStyle& style)
+void LayoutMediaControls::adjustMediaSliderThumbSize(ComputedStyle& style)
{
static Image* mediaSliderThumb = platformResource("mediaplayerSliderThumb");
static Image* mediaVolumeSliderThumb = platformResource("mediaplayerVolumeSliderThumb");
« no previous file with comments | « Source/core/layout/LayoutMediaControls.h ('k') | Source/core/layout/LayoutMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698