summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 19:34:44 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-16 19:34:44 +0000
commit650e4d7f574f4f122e122f11142f53133e467b6d (patch)
tree19d4550f0a6739b29105d29afbf53b0fad084472
parent9be0aff3b6e0d6cb7ee6e24245ba34626c913d6b (diff)
downloadchromium_src-650e4d7f574f4f122e122f11142f53133e467b6d.zip
chromium_src-650e4d7f574f4f122e122f11142f53133e467b6d.tar.gz
chromium_src-650e4d7f574f4f122e122f11142f53133e467b6d.tar.bz2
Part 2 (webkit/glue side) of cleaning RenderThemeChromiumWin.
R=macdome Review URL: http://codereview.chromium.org/18140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8203 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/webframe_impl.cc4
-rw-r--r--webkit/glue/webview_impl.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 33b218f..b0b55e5 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@8168",
+ "/trunk/deps/third_party/WebKit@8202",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 25cdce7..e8e009b 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -805,7 +805,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request,
start_in_selection);
if (found) {
#if defined(OS_WIN)
- WebCore::RenderThemeWin::setFindInPageMode(true);
+ WebCore::RenderThemeChromiumWin::setFindInPageMode(true);
#endif
// Store which frame was active. This will come in handy later when we
// change the active match ordinal below.
@@ -1213,7 +1213,7 @@ void WebFrameImpl::StopFinding(bool clear_selection) {
CancelPendingScopingEffort();
#if defined(OS_WIN)
- WebCore::RenderThemeWin::setFindInPageMode(false);
+ WebCore::RenderThemeChromiumWin::setFindInPageMode(false);
#endif
// Remove all markers for matches found and turn off the highlighting.
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index ac5588c..a4678da 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1269,7 +1269,7 @@ void WebViewImpl::SetPreferences(const WebPreferences& preferences) {
#if defined(OS_WIN)
// RenderTheme is a singleton that needs to know the default font size to
// draw some form controls. We let it know each time the size changes.
- WebCore::RenderThemeWin::setDefaultFontSize(preferences.default_font_size);
+ WebCore::RenderThemeChromiumWin::setDefaultFontSize(preferences.default_font_size);
#endif
}