webkit/support/test_webkit_platform_support.h - Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/support/test_webkit_platform_support.h

Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with master Created 8 years, 7 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

Index: webkit/support/test_webkit_platform_support.h

diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h

index 238d0089180f8e7aa9c6a1c8c5a5beee4e325922..b5c78ad5d192e20dcf72b47cdd3f9d10cc5f97cf 100644

--- a/webkit/support/test_webkit_platform_support.h

+++ b/webkit/support/test_webkit_platform_support.h

@@ -111,9 +111,9 @@ class TestWebKitPlatformSupport :

void setGamepadData(const WebKit::WebGamepads& data);

virtual string16 GetLocalizedString(int message_id) OVERRIDE;

- virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE;

- virtual base::StringPiece GetImageResource(int resource_id,

- float scale_factor) OVERRIDE;

+ virtual base::StringPiece GetDataResource(

+ int resource_id,

+ ui::ScaleFactor scale_factor) OVERRIDE;

virtual void GetPlugins(bool refresh,

std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;

virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(

« no previous file with comments | « webkit/support/platform_support_win.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »