Index: Source/core/rendering/RenderTheme.cpp |
diff --git a/Source/core/rendering/RenderTheme.cpp b/Source/core/rendering/RenderTheme.cpp |
index 393e34e5223a1d531b7e22423619ded52b854c4d..04af283b615142cf5348c35ebae339964623ad99 100644 |
--- a/Source/core/rendering/RenderTheme.cpp |
+++ b/Source/core/rendering/RenderTheme.cpp |
@@ -75,16 +75,16 @@ static Color& customFocusRingColor() |
return color; |
} |
-static WebKit::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o) |
+static blink::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o) |
{ |
if (!theme->isEnabled(o)) |
- return WebKit::WebFallbackThemeEngine::StateDisabled; |
+ return blink::WebFallbackThemeEngine::StateDisabled; |
if (theme->isPressed(o)) |
- return WebKit::WebFallbackThemeEngine::StatePressed; |
+ return blink::WebFallbackThemeEngine::StatePressed; |
if (theme->isHovered(o)) |
- return WebKit::WebFallbackThemeEngine::StateHover; |
+ return blink::WebFallbackThemeEngine::StateHover; |
- return WebKit::WebFallbackThemeEngine::StateNormal; |
+ return blink::WebFallbackThemeEngine::StateNormal; |
} |
RenderTheme::RenderTheme() |
@@ -1154,12 +1154,12 @@ String RenderTheme::fileListNameForWidth(Locale& locale, const FileList* fileLis |
String string; |
if (fileList->isEmpty()) { |
- string = locale.queryString(WebKit::WebLocalizedString::FileButtonNoFileSelectedLabel); |
+ string = locale.queryString(blink::WebLocalizedString::FileButtonNoFileSelectedLabel); |
} else if (fileList->length() == 1) { |
string = fileList->item(0)->name(); |
} else { |
// FIXME: Localization of fileList->length(). |
- return StringTruncator::rightTruncate(locale.queryString(WebKit::WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font, StringTruncator::EnableRoundingHacks); |
+ return StringTruncator::rightTruncate(locale.queryString(blink::WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font, StringTruncator::EnableRoundingHacks); |
} |
return StringTruncator::centerTruncate(string, width, font, StringTruncator::EnableRoundingHacks); |
@@ -1238,8 +1238,8 @@ void RenderTheme::setSizeIfAuto(RenderStyle* style, const IntSize& size) |
bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r) |
{ |
- WebKit::WebFallbackThemeEngine::ExtraParams extraParams; |
- WebKit::WebCanvas* canvas = i.context->canvas(); |
+ blink::WebFallbackThemeEngine::ExtraParams extraParams; |
+ blink::WebCanvas* canvas = i.context->canvas(); |
extraParams.button.checked = isChecked(o); |
extraParams.button.indeterminate = isIndeterminate(o); |
@@ -1254,7 +1254,7 @@ bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintIn |
i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); |
} |
- WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); |
+ blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); |
return false; |
} |
@@ -1264,7 +1264,7 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem |
if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) |
return; |
- IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartCheckbox); |
+ IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartCheckbox); |
float zoomLevel = style->effectiveZoom(); |
size.setWidth(size.width() * zoomLevel); |
size.setHeight(size.height() * zoomLevel); |
@@ -1280,8 +1280,8 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem |
bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r) |
{ |
- WebKit::WebFallbackThemeEngine::ExtraParams extraParams; |
- WebKit::WebCanvas* canvas = i.context->canvas(); |
+ blink::WebFallbackThemeEngine::ExtraParams extraParams; |
+ blink::WebCanvas* canvas = i.context->canvas(); |
extraParams.button.checked = isChecked(o); |
extraParams.button.indeterminate = isIndeterminate(o); |
@@ -1296,7 +1296,7 @@ bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& |
i.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); |
} |
- WebKit::Platform::current()->fallbackThemeEngine()->paint(canvas, WebKit::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), WebKit::WebRect(unzoomedRect), &extraParams); |
+ blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams); |
return false; |
} |
@@ -1306,7 +1306,7 @@ void RenderTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle* style, Element |
if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) |
return; |
- IntSize size = WebKit::Platform::current()->fallbackThemeEngine()->getSize(WebKit::WebFallbackThemeEngine::PartRadio); |
+ IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartRadio); |
float zoomLevel = style->effectiveZoom(); |
size.setWidth(size.width() * zoomLevel); |
size.setHeight(size.height() * zoomLevel); |