Use the WebKit default fonts when specifying generic font families.

content/renderer/pepper_plugin_delegate_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/callback.h"
@@ skipping 27 matching lines @@
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/ppapi_preferences.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/surface/transport_dib.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/plugins/npapi/webplugin.h"
@@ skipping 263 matching lines @@
                           handle, socket_handle, length));
   }
 }
 
 class DispatcherWrapper
     : public webkit::ppapi::PluginDelegate::OutOfProcessProxy {
  public:
   DispatcherWrapper() {}
   virtual ~DispatcherWrapper() {}
 
-  bool Init(base::ProcessHandle plugin_process_handle,
+  bool Init(RenderView* render_view,
+            base::ProcessHandle plugin_process_handle,
             const IPC::ChannelHandle& channel_handle,
             PP_Module pp_module,
             pp::proxy::Dispatcher::GetInterfaceFunc local_get_interface);
 
   // OutOfProcessProxy implementation.
   virtual const void* GetProxiedInterface(const char* name) {
     return dispatcher_->GetProxiedInterface(name);
   }
   virtual void AddInstance(PP_Instance instance) {
     pp::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get());
   }
   virtual void RemoveInstance(PP_Instance instance) {
     pp::proxy::HostDispatcher::RemoveForInstance(instance);
   }
 
  private:
   scoped_ptr<pp::proxy::HostDispatcher> dispatcher_;
 };
 
 }  // namespace
 
 bool DispatcherWrapper::Init(
+    RenderView* render_view,
     base::ProcessHandle plugin_process_handle,
     const IPC::ChannelHandle& channel_handle,
     PP_Module pp_module,
     pp::proxy::Dispatcher::GetInterfaceFunc local_get_interface) {
   dispatcher_.reset(new pp::proxy::HostDispatcher(
       plugin_process_handle, pp_module, local_get_interface));
 
-  if (!dispatcher_->InitHostWithChannel(PepperPluginRegistry::GetInstance(),
-                                        channel_handle, true)) {
+  if (!dispatcher_->InitHostWithChannel(
+          PepperPluginRegistry::GetInstance(),
+          channel_handle, true,
+          ppapi::Preferences(render_view->webkit_preferences()))) {
     dispatcher_.reset();
     return false;
   }
   dispatcher_->channel()->SetRestrictDispatchToSameChannel(true);
   return true;
 }
 
 BrokerDispatcherWrapper::BrokerDispatcherWrapper() {
 }
 
@@ skipping 228 matching lines @@
   }
 
   // Create a new HostDispatcher for the proxying, and hook it to a new
   // PluginModule. Note that AddLiveModule must be called before any early
   // returns since the module's destructor will remove itself.
   module = new webkit::ppapi::PluginModule(info->name, path,
                                            PepperPluginRegistry::GetInstance());
   PepperPluginRegistry::GetInstance()->AddLiveModule(path, module);
   scoped_ptr<DispatcherWrapper> dispatcher(new DispatcherWrapper);
   if (!dispatcher->Init(
+          render_view_,
           plugin_process_handle, channel_handle,
           module->pp_module(),
           webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc()))
     return scoped_refptr<webkit::ppapi::PluginModule>();
   module->InitAsProxied(dispatcher.release());
   return module;
 }
 
 scoped_refptr<PpapiBrokerImpl> PepperPluginDelegateImpl::CreatePpapiBroker(
     webkit::ppapi::PluginModule* plugin_module) {
@@ skipping 691 matching lines @@
     DLOG(WARNING) << "Browser allocation request message failed";
     return NULL;
   }
   if (!base::SharedMemory::IsHandleValid(handle)) {
     DLOG(WARNING) << "Browser failed to allocate shared memory";
     return NULL;
   }
   shm.reset(new base::SharedMemory(handle, false));
   return shm.release();
 }
+
+::ppapi::Preferences PepperPluginDelegateImpl::GetPreferences() {
+  return ::ppapi::Preferences(render_view_->webkit_preferences());

[yzshen1, 2011/05/25 23:40:11]

I think here the '::' prefix is not mandatory, right?
If it is here just for readability, it might be good to keep consistent and
change other occurrences such as line 367.

+}