Simplify code by moving WebKit initialization from CefRenderProcessObserver to CefContentRendererClient.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@968 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/renderer/content_renderer_client.cc

@@ -14,6 +14,7 @@ MSVC_POP_WARNING();
 #include "libcef/renderer/content_renderer_client.h"
 
 #include "libcef/common/cef_messages.h"
+#include "libcef/common/cef_switches.h"
 #include "libcef/common/content_client.h"
 #include "libcef/common/request_impl.h"
 #include "libcef/common/values_impl.h"
@@ -24,15 +25,21 @@ MSVC_POP_WARNING();
 #include "libcef/renderer/thread_util.h"
 #include "libcef/renderer/v8_impl.h"
 
+#include "base/command_line.h"
+#include "base/path_service.h"
+#include "base/string_number_conversions.h"
 #include "content/common/child_thread.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "ipc/ipc_sync_channel.h"
+#include "media/base/media.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPrerendererClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 
@@ -135,10 +142,15 @@ void CefContentRendererClient::AddCustomScheme(
   scheme_info_list_.push_back(info);
 }
 
-void CefContentRendererClient::RegisterCustomSchemes() {
+void CefContentRendererClient::WebKitInitialized() {
-  if (scheme_info_list_.empty())
+  WebKit::WebRuntimeFeatures::enableMediaPlayer(
-    return;
+      media::IsMediaLibraryInitialized());
 
+  // TODO(cef): Enable these once the implementation supports it.
+  WebKit::WebRuntimeFeatures::enableNotifications(false);
+
+  if (!scheme_info_list_.empty()) {
+    // Register the custom schemes.
     SchemeInfoList::const_iterator it = scheme_info_list_.begin();
     for (; it != scheme_info_list_.end(); ++it) {
       const SchemeInfo& info = *it;
@@ -153,6 +165,48 @@ void CefContentRendererClient::RegisterCustomSchemes() {
     }
   }
 
+  if (!cross_origin_whitelist_entries_.empty()) {
+    // Add the cross-origin white list entries.
+    for (size_t i = 0; i < cross_origin_whitelist_entries_.size(); ++i) {
+      const Cef_CrossOriginWhiteListEntry_Params& entry =
+          cross_origin_whitelist_entries_[i];
+      GURL gurl = GURL(entry.source_origin);
+      WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
+          gurl,
+          WebKit::WebString::fromUTF8(entry.target_protocol),
+          WebKit::WebString::fromUTF8(entry.target_domain),
+          entry.allow_target_subdomains);
+    }
+    cross_origin_whitelist_entries_.clear();
+  }
+
+  // The number of stack trace frames to capture for uncaught exceptions.
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kUncaughtExceptionStackSize)) {
+    int uncaught_exception_stack_size = 0;
+    base::StringToInt(
+        command_line.GetSwitchValueASCII(switches::kUncaughtExceptionStackSize),
+        &uncaught_exception_stack_size);
+
+    if (uncaught_exception_stack_size > 0) {
+      CefContentRendererClient::Get()->SetUncaughtExceptionStackSize(
+          uncaught_exception_stack_size);
+      v8::V8::AddMessageListener(&CefV8MessageHandler);
+      v8::V8::SetCaptureStackTraceForUncaughtExceptions(true,
+          uncaught_exception_stack_size, v8::StackTrace::kDetailed);
+    }
+  }
+
+  // Notify the render process handler.
+  CefRefPtr<CefApp> application = CefContentClient::Get()->application();
+  if (application.get()) {
+    CefRefPtr<CefRenderProcessHandler> handler =
+        application->GetRenderProcessHandler();
+    if (handler.get())
+      handler->OnWebKitInitialized();
+  }
+}
+
 void CefContentRendererClient::DevToolsAgentAttached() {
   CEF_REQUIRE_RT();
   ++devtools_agent_count_;
@@ -181,17 +235,21 @@ void CefContentRendererClient::RenderThreadStarted() {
   thread->AddObserver(observer_.get());
   thread->GetChannel()->AddFilter(new CefRenderMessageFilter);
 
+  // Note that under Linux, the media library will normally already have
+  // been initialized by the Zygote before this instance became a Renderer.
+  FilePath media_path;
+  PathService::Get(base::DIR_MODULE, &media_path);
+  if (!media_path.empty())
+    media::InitializeMediaLibrary(media_path);
+
   WebKit::WebPrerenderingSupport::initialize(new CefPrerenderingSupport());
 
   // Retrieve the new render thread information synchronously.
   CefProcessHostMsg_GetNewRenderThreadInfo_Params params;
   thread->Send(new CefProcessHostMsg_GetNewRenderThreadInfo(&params));
 
-  if (params.cross_origin_whitelist_entries.size() > 0) {
   // Cross-origin entries need to be added after WebKit is initialized.
-    observer_->set_pending_cross_origin_whitelist_entries(
+  cross_origin_whitelist_entries_ = params.cross_origin_whitelist_entries;
-        params.cross_origin_whitelist_entries);
-  }
 
   // Notify the render process handler.
   CefRefPtr<CefApp> application = CefContentClient::Get()->application();

libcef/renderer/content_renderer_client.h

@@ -9,6 +9,7 @@
 #include <list>
 #include <map>
 #include <string>
+#include <vector>
 
 #include "libcef/renderer/browser_impl.h"
 
@@ -18,7 +19,7 @@
 #include "content/public/renderer/content_renderer_client.h"
 
 class CefRenderProcessObserver;
-
+struct Cef_CrossOriginWhiteListEntry_Params;
 
 class CefContentRendererClient : public content::ContentRendererClient {
  public:
@@ -42,12 +43,11 @@ class CefContentRendererClient : public content::ContentRendererClient {
                        bool is_local,
                        bool is_display_isolated);
 
-  // Register the custom schemes with WebKit.
-  void RegisterCustomSchemes();
-
   // Render thread message loop proxy.
   base::MessageLoopProxy* render_loop() const { return render_loop_.get(); }
 
+  void WebKitInitialized();
+
   void DevToolsAgentAttached();
   void DevToolsAgentDetached();
   void SetUncaughtExceptionStackSize(int stackSize);
@@ -76,11 +76,15 @@ class CefContentRendererClient : public content::ContentRendererClient {
   typedef std::map<content::RenderView*, CefRefPtr<CefBrowserImpl> > BrowserMap;
   BrowserMap browsers_;
 
-  // Information about custom schemes that need to be registered with WebKit.
+  // Custom schemes that need to be registered with WebKit.
   struct SchemeInfo;
   typedef std::list<SchemeInfo> SchemeInfoList;
   SchemeInfoList scheme_info_list_;
 
+  // Cross-origin white list entries that need to be registered with WebKit.
+  typedef std::vector<Cef_CrossOriginWhiteListEntry_Params> CrossOriginList;
+  CrossOriginList cross_origin_whitelist_entries_;
+
   int devtools_agent_count_;
   int uncaught_exception_stack_size_;
 };

libcef/renderer/render_process_observer.cc

@@ -5,30 +5,13 @@
 
 #include "libcef/renderer/render_process_observer.h"
 #include "libcef/common/cef_messages.h"
-#include "libcef/common/cef_switches.h"
-#include "libcef/common/command_line_impl.h"
-#include "libcef/common/content_client.h"
 #include "libcef/renderer/content_renderer_client.h"
-#include "libcef/renderer/v8_impl.h"
 
-#include "base/bind.h"
-#include "base/path_service.h"
-#include "base/string_number_conversions.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_util.h"
-#include "media/base/media.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 
 CefRenderProcessObserver::CefRenderProcessObserver() {
-  // Note that under Linux, the media library will normally already have
-  // been initialized by the Zygote before this instance became a Renderer.
-  FilePath media_path;
-  PathService::Get(base::DIR_MODULE, &media_path);
-  if (!media_path.empty())
-    media::InitializeMediaLibrary(media_path);
 }
 
 CefRenderProcessObserver::~CefRenderProcessObserver() {
@@ -48,56 +31,7 @@ bool CefRenderProcessObserver::OnControlMessageReceived(
 }
 
 void CefRenderProcessObserver::WebKitInitialized() {
-  WebKit::WebRuntimeFeatures::enableMediaPlayer(
+  CefContentRendererClient::Get()->WebKitInitialized();
-      media::IsMediaLibraryInitialized());
-
-  // TODO(cef): Enable these once the implementation supports it.
-  WebKit::WebRuntimeFeatures::enableNotifications(false);
-
-  // Register any custom schemes with WebKit.
-  CefContentRendererClient::Get()->RegisterCustomSchemes();
-
-  if (pending_cross_origin_whitelist_entries_.size() > 0) {
-    // Add pending cross-origin white list entries.
-    for (size_t i = 0;
-         i < pending_cross_origin_whitelist_entries_.size(); ++i) {
-      const Cef_CrossOriginWhiteListEntry_Params& entry =
-          pending_cross_origin_whitelist_entries_[i];
-      GURL gurl = GURL(entry.source_origin);
-      WebKit::WebSecurityPolicy::addOriginAccessWhitelistEntry(
-          gurl,
-          WebKit::WebString::fromUTF8(entry.target_protocol),
-          WebKit::WebString::fromUTF8(entry.target_domain),
-          entry.allow_target_subdomains);
-    }
-    pending_cross_origin_whitelist_entries_.clear();
-  }
-
-  // The number of stack trace frames to capture for uncaught exceptions.
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kUncaughtExceptionStackSize)) {
-    int uncaught_exception_stack_size = 0;
-    base::StringToInt(
-        command_line.GetSwitchValueASCII(switches::kUncaughtExceptionStackSize),
-        &uncaught_exception_stack_size);
-
-    if (uncaught_exception_stack_size > 0) {
-      CefContentRendererClient::Get()->SetUncaughtExceptionStackSize(
-          uncaught_exception_stack_size);
-      v8::V8::AddMessageListener(&CefV8MessageHandler);
-      v8::V8::SetCaptureStackTraceForUncaughtExceptions(true,
-          uncaught_exception_stack_size, v8::StackTrace::kDetailed);
-    }
-  }
-
-  // Notify the render process handler.
-  CefRefPtr<CefApp> application = CefContentClient::Get()->application();
-  if (application.get()) {
-    CefRefPtr<CefRenderProcessHandler> handler =
-        application->GetRenderProcessHandler();
-    if (handler.get())
-      handler->OnWebKitInitialized();
-  }
 }
 
 void CefRenderProcessObserver::OnModifyCrossOriginWhitelistEntry(

libcef/renderer/render_process_observer.h

@@ -6,9 +6,7 @@
 #ifndef CEF_LIBCEF_RENDERER_RENDER_PROCESS_OBSERVER_H_
 #define CEF_LIBCEF_RENDERER_RENDER_PROCESS_OBSERVER_H_
 
-#include <string>
+#include "base/compiler_specific.h"
-#include <vector>
-#include "base/memory/ref_counted.h"
 #include "content/public/renderer/render_process_observer.h"
 
 struct Cef_CrossOriginWhiteListEntry_Params;
@@ -19,11 +17,6 @@ class CefRenderProcessObserver : public content::RenderProcessObserver {
   CefRenderProcessObserver();
   virtual ~CefRenderProcessObserver();
 
-  void set_pending_cross_origin_whitelist_entries(
-      const std::vector<Cef_CrossOriginWhiteListEntry_Params>& entries) {
-    pending_cross_origin_whitelist_entries_ = entries;
-  }
-
   // RenderProcessObserver implementation.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void WebKitInitialized() OVERRIDE;
@@ -35,11 +28,7 @@ class CefRenderProcessObserver : public content::RenderProcessObserver {
       const Cef_CrossOriginWhiteListEntry_Params& params);
   void OnClearCrossOriginWhitelist();
 
-  typedef std::vector<Cef_CrossOriginWhiteListEntry_Params> CrossOriginList;
-  CrossOriginList pending_cross_origin_whitelist_entries_;
-
   DISALLOW_COPY_AND_ASSIGN(CefRenderProcessObserver);
 };
 
-
 #endif  // CEF_LIBCEF_RENDERER_RENDER_PROCESS_OBSERVER_H_