Index: Source/core/rendering/RenderThemeChromiumWin.cpp |
diff --git a/Source/core/rendering/RenderThemeChromiumWin.cpp b/Source/core/rendering/RenderThemeChromiumWin.cpp |
index 8324b05ac17beb4f6dc0e999153baa181f5d5266..ef3ca2d316a44805b8c22d0aae27c2f31c9bba73 100644 |
--- a/Source/core/rendering/RenderThemeChromiumWin.cpp |
+++ b/Source/core/rendering/RenderThemeChromiumWin.cpp |
@@ -301,8 +301,8 @@ bool RenderThemeChromiumWin::paintButton(RenderObject* o, const PaintInfo& i, co |
const ThemeData& themeData = getThemeData(o); |
ThemePainter painter(i.context, r); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintButton(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintButton(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); |
return false; |
} |
@@ -316,8 +316,8 @@ bool RenderThemeChromiumWin::paintSliderTrack(RenderObject* o, const PaintInfo& |
const ThemeData& themeData = getThemeData(o); |
ThemePainter painter(i.context, r); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); |
paintSliderTicks(o, i, r); |
@@ -329,8 +329,8 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo& |
const ThemeData& themeData = getThemeData(o); |
ThemePainter painter(i.context, r); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect())); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintTrackbar(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect())); |
return false; |
} |
@@ -338,7 +338,7 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo& |
static int menuListButtonWidth() |
{ |
static int width = isRunningLayoutTest() ? kStandardMenuListButtonWidth : |
- IntSize(WebKit::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); |
+ IntSize(blink::Platform::current()->themeEngine()->getSize(SBP_ARROWBTN)).width(); |
return width; |
} |
@@ -394,8 +394,8 @@ bool RenderThemeChromiumWin::paintMenuListButton(RenderObject* o, const PaintInf |
// Get the correct theme data for a textfield and paint the menu. |
ThemePainter painter(i.context, rect); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintMenuList(canvas, CP_DROPDOWNBUTTON, determineState(o), determineClassicState(o), WebKit::WebRect(painter.drawRect())); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintMenuList(canvas, CP_DROPDOWNBUTTON, determineState(o), determineClassicState(o), blink::WebRect(painter.drawRect())); |
return false; |
} |
@@ -571,8 +571,8 @@ bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o, |
{ |
const ThemeData& themeData = getThemeData(o); |
ThemePainter painter(i.context, r); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintTextField(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, WebKit::WebRect(painter.drawRect()), backgroundColor.rgb(), fillContentArea, drawEdges); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintTextField(canvas, themeData.m_part, themeData.m_state, themeData.m_classicState, blink::WebRect(painter.drawRect()), backgroundColor.rgb(), fillContentArea, drawEdges); |
// End of block commits the painter before restoring context. |
} |
if (o->style()->hasBorderRadius()) |
@@ -596,16 +596,16 @@ bool RenderThemeChromiumWin::paintInnerSpinButton(RenderObject* object, const Pa |
half.setHeight(rect.height() / 2); |
const ThemeData& upThemeData = getThemeData(object, SpinButtonUp); |
ThemePainter upPainter(info.context, half); |
- WebKit::WebCanvas* canvas = upPainter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintSpinButton(canvas, upThemeData.m_part, upThemeData.m_state, upThemeData.m_classicState, WebKit::WebRect(upPainter.drawRect())); |
+ blink::WebCanvas* canvas = upPainter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintSpinButton(canvas, upThemeData.m_part, upThemeData.m_state, upThemeData.m_classicState, blink::WebRect(upPainter.drawRect())); |
} |
{ |
half.setY(rect.y() + rect.height() / 2); |
const ThemeData& downThemeData = getThemeData(object, SpinButtonDown); |
ThemePainter downPainter(info.context, half); |
- WebKit::WebCanvas* canvas = downPainter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintSpinButton(canvas, downThemeData.m_part, downThemeData.m_state, downThemeData.m_classicState, WebKit::WebRect(downPainter.drawRect())); |
+ blink::WebCanvas* canvas = downPainter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintSpinButton(canvas, downThemeData.m_part, downThemeData.m_state, downThemeData.m_classicState, blink::WebRect(downPainter.drawRect())); |
} |
return false; |
} |
@@ -638,8 +638,8 @@ bool RenderThemeChromiumWin::paintProgressBar(RenderObject* o, const PaintInfo& |
double animatedSeconds = renderProgress->animationStartTime() ? WTF::currentTime() - renderProgress->animationStartTime() : 0; |
ThemePainter painter(i.context, r); |
DirectionFlippingScope scope(o, i, r); |
- WebKit::WebCanvas* canvas = painter.context()->canvas(); |
- WebKit::Platform::current()->themeEngine()->paintProgressBar(canvas, WebKit::WebRect(r), WebKit::WebRect(valueRect), renderProgress->isDeterminate(), animatedSeconds); |
+ blink::WebCanvas* canvas = painter.context()->canvas(); |
+ blink::Platform::current()->themeEngine()->paintProgressBar(canvas, blink::WebRect(r), blink::WebRect(valueRect), renderProgress->isDeterminate(), animatedSeconds); |
return false; |
} |