webkit/support/platform_support_android.cc - Issue 10387010: 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/platform_support_android.cc

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

Patch Set: Convert ptr to bool for win compile. 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:

Index: webkit/support/platform_support_android.cc

diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc

index 23ebe69f6056acb74d77762ced2f9c1a0987a0b1..7a82f7f392f398daabc07e3e59ca7cc53f2eebfe 100644

--- a/webkit/support/platform_support_android.cc

+++ b/webkit/support/platform_support_android.cc

@@ -14,6 +14,7 @@

#include "googleurl/src/gurl.h"

#include "grit/webkit_resources.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/base/resource/resource_handle.h"

#include "webkit/support/test_webkit_platform_support.h"

#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"

@@ -88,5 +89,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {

}

- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);

+ return ResourceBundle::GetSharedInstance().GetRawDataResource(

+ resource_id, ui::ResourceHandle::kScaleFactorNone);

}