content/renderer/pepper/pepper_in_process_resource_creation.cc - Issue 357203003: Move webpreferences.* from webkit/ to content/

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: content/renderer/pepper/pepper_in_process_resource_creation.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android fix - webview() -> web_view Created 6 years, 5 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: content/renderer/pepper/pepper_in_process_resource_creation.cc

diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.cc b/content/renderer/pepper/pepper_in_process_resource_creation.cc

index 596f149cc1815629ea45f509f53603b378d4d073..627c1f8c84b3347949cb9d0b2442f4310599ced6 100644

--- a/content/renderer/pepper/pepper_in_process_resource_creation.cc

+++ b/content/renderer/pepper/pepper_in_process_resource_creation.cc

@@ -11,6 +11,7 @@

#include "content/child/browser_font_resource_trusted.h"

#include "content/renderer/pepper/pepper_in_process_router.h"

#include "content/renderer/pepper/pepper_plugin_instance_impl.h"

+#include "content/renderer/pepper/ppapi_preferences_builder.h"

#include "content/renderer/pepper/renderer_ppapi_host_impl.h"

#include "content/renderer/render_view_impl.h"

#include "ipc/ipc_message.h"

@@ -52,8 +53,8 @@ PP_Resource PepperInProcessResourceCreation::CreateBrowserFont(

const PP_BrowserFont_Trusted_Description* description) {

if (!BrowserFontResource_Trusted::IsPPFontDescriptionValid(*description))

return 0;

- ppapi::Preferences prefs(

- host_impl_->GetRenderViewForInstance(instance)->GetWebkitPreferences());

+ ppapi::Preferences prefs(PpapiPreferencesBuilder::Build(

+ host_impl_->GetRenderViewForInstance(instance)->GetWebkitPreferences()));

return (new BrowserFontResource_Trusted(

host_impl_->in_process_router()->GetPluginConnection(instance),

instance,