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

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

Issue 463123003: Cleanup namespace usage in Source/core/rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 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/RenderObject.cpp ('k') | Source/core/rendering/RenderThemeChromiumAndroid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTheme.cpp
diff --git a/Source/core/rendering/RenderTheme.cpp b/Source/core/rendering/RenderTheme.cpp
index 6f323df0c4c80b2f6c48baa7865ef46a36890ca3..0a3bfb25764e16453b0ef29958bc1031110c223a 100644
--- a/Source/core/rendering/RenderTheme.cpp
+++ b/Source/core/rendering/RenderTheme.cpp
@@ -66,16 +66,16 @@ namespace blink {
using namespace HTMLNames;
-static blink::WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o)
+static WebFallbackThemeEngine::State getWebFallbackThemeState(const RenderTheme* theme, const RenderObject* o)
{
if (!theme->isEnabled(o))
- return blink::WebFallbackThemeEngine::StateDisabled;
+ return WebFallbackThemeEngine::StateDisabled;
if (theme->isPressed(o))
- return blink::WebFallbackThemeEngine::StatePressed;
+ return WebFallbackThemeEngine::StatePressed;
if (theme->isHovered(o))
- return blink::WebFallbackThemeEngine::StateHover;
+ return WebFallbackThemeEngine::StateHover;
- return blink::WebFallbackThemeEngine::StateNormal;
+ return WebFallbackThemeEngine::StateNormal;
}
RenderTheme::RenderTheme()
@@ -1061,12 +1061,12 @@ String RenderTheme::fileListNameForWidth(Locale& locale, const FileList* fileLis
String string;
if (fileList->isEmpty()) {
- string = locale.queryString(blink::WebLocalizedString::FileButtonNoFileSelectedLabel);
+ string = locale.queryString(WebLocalizedString::FileButtonNoFileSelectedLabel);
} else if (fileList->length() == 1) {
string = fileList->item(0)->name();
} else {
// FIXME: Localization of fileList->length().
- return StringTruncator::rightTruncate(locale.queryString(blink::WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font);
+ return StringTruncator::rightTruncate(locale.queryString(WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font);
}
return StringTruncator::centerTruncate(string, width, font);
@@ -1131,8 +1131,8 @@ void RenderTheme::setSizeIfAuto(RenderStyle* style, const IntSize& size)
bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
{
- blink::WebFallbackThemeEngine::ExtraParams extraParams;
- blink::WebCanvas* canvas = i.context->canvas();
+ WebFallbackThemeEngine::ExtraParams extraParams;
+ WebCanvas* canvas = i.context->canvas();
extraParams.button.checked = isChecked(o);
extraParams.button.indeterminate = isIndeterminate(o);
@@ -1147,7 +1147,7 @@ bool RenderTheme::paintCheckboxUsingFallbackTheme(RenderObject* o, const PaintIn
i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
- blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams);
+ Platform::current()->fallbackThemeEngine()->paint(canvas, WebFallbackThemeEngine::PartCheckbox, getWebFallbackThemeState(this, o), WebRect(unzoomedRect), &extraParams);
return false;
}
@@ -1157,7 +1157,7 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem
if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
return;
- IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartCheckbox);
+ IntSize size = Platform::current()->fallbackThemeEngine()->getSize(WebFallbackThemeEngine::PartCheckbox);
float zoomLevel = style->effectiveZoom();
size.setWidth(size.width() * zoomLevel);
size.setHeight(size.height() * zoomLevel);
@@ -1173,8 +1173,8 @@ void RenderTheme::adjustCheckboxStyleUsingFallbackTheme(RenderStyle* style, Elem
bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo& i, const IntRect& r)
{
- blink::WebFallbackThemeEngine::ExtraParams extraParams;
- blink::WebCanvas* canvas = i.context->canvas();
+ WebFallbackThemeEngine::ExtraParams extraParams;
+ WebCanvas* canvas = i.context->canvas();
extraParams.button.checked = isChecked(o);
extraParams.button.indeterminate = isIndeterminate(o);
@@ -1189,7 +1189,7 @@ bool RenderTheme::paintRadioUsingFallbackTheme(RenderObject* o, const PaintInfo&
i.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
}
- blink::Platform::current()->fallbackThemeEngine()->paint(canvas, blink::WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), blink::WebRect(unzoomedRect), &extraParams);
+ Platform::current()->fallbackThemeEngine()->paint(canvas, WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(this, o), WebRect(unzoomedRect), &extraParams);
return false;
}
@@ -1199,7 +1199,7 @@ void RenderTheme::adjustRadioStyleUsingFallbackTheme(RenderStyle* style, Element
if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
return;
- IntSize size = blink::Platform::current()->fallbackThemeEngine()->getSize(blink::WebFallbackThemeEngine::PartRadio);
+ IntSize size = Platform::current()->fallbackThemeEngine()->getSize(WebFallbackThemeEngine::PartRadio);
float zoomLevel = style->effectiveZoom();
size.setWidth(size.width() * zoomLevel);
size.setHeight(size.height() * zoomLevel);
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderThemeChromiumAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698