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

Unified Diff: Source/core/rendering/RenderMediaControls.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/rendering/RenderMediaControls.h ('k') | Source/core/rendering/RenderMenuList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMediaControls.cpp
diff --git a/Source/core/rendering/RenderMediaControls.cpp b/Source/core/rendering/RenderMediaControls.cpp
index 6d2c5e4ff853242e08843e26fe364f93d3424886..fee61c4af93180ddef865b4005d69f0a31def839 100644
--- a/Source/core/rendering/RenderMediaControls.cpp
+++ b/Source/core/rendering/RenderMediaControls.cpp
@@ -66,7 +66,7 @@ static bool paintMediaButton(GraphicsContext* context, const IntRect& rect, Imag
return true;
}
-static bool paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaMuteButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -93,7 +93,7 @@ static bool paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInf
return paintMediaButton(paintInfo.context, rect, soundLevel3);
}
-static bool paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -110,7 +110,7 @@ static bool paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInf
return paintMediaButton(paintInfo.context, rect, image);
}
-static bool paintMediaOverlayPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaOverlayPlayButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -193,7 +193,7 @@ static void paintSliderRangeHighlight(const IntRect& rect, const RenderStyle& st
const int mediaSliderThumbWidth = 32;
-static bool paintMediaSlider(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaSlider(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -245,7 +245,7 @@ static bool paintMediaSlider(RenderObject* object, const PaintInfo& paintInfo, c
return true;
}
-static bool paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
if (!object->node())
return false;
@@ -263,7 +263,7 @@ static bool paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintIn
const int mediaVolumeSliderThumbWidth = 24;
-static bool paintMediaVolumeSlider(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaVolumeSlider(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -300,7 +300,7 @@ static bool paintMediaVolumeSlider(RenderObject* object, const PaintInfo& paintI
return true;
}
-static bool paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaVolumeSliderThumb(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
if (!object->node())
return false;
@@ -316,7 +316,7 @@ static bool paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& p
return paintMediaButton(paintInfo.context, rect, mediaVolumeSliderThumb);
}
-static bool paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaFullscreenButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -326,7 +326,7 @@ static bool paintMediaFullscreenButton(RenderObject* object, const PaintInfo& pa
return paintMediaButton(paintInfo.context, rect, mediaFullscreenButton);
}
-static bool paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaToggleClosedCaptionsButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -340,7 +340,7 @@ static bool paintMediaToggleClosedCaptionsButton(RenderObject* object, const Pai
return paintMediaButton(paintInfo.context, rect, mediaClosedCaptionButtonDisabled);
}
-static bool paintMediaCastButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+static bool paintMediaCastButton(LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
HTMLMediaElement* mediaElement = toParentMediaElement(object);
if (!mediaElement)
@@ -366,7 +366,7 @@ static bool paintMediaCastButton(RenderObject* object, const PaintInfo& paintInf
}
}
-bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
+bool RenderMediaControls::paintMediaControlsPart(MediaControlElementType part, LayoutObject* object, const PaintInfo& paintInfo, const IntRect& rect)
{
switch (part) {
case MediaMuteButton:
« no previous file with comments | « Source/core/rendering/RenderMediaControls.h ('k') | Source/core/rendering/RenderMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698