Update to Chromium revision cb947c01 (#352221)

- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle
  instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest
  object passed to OnBeforeBrowse will no longer have an associated request
  identifier.
- Mac: Remove additional helper apps which are no longer required (see
  http://crbug.com/520680)
- Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see
  http://crbug.com/517114)
- Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and
  NPAPI plugins are no longer supported (see http://crbug.com/470301#c11)
- Add CefFormatUrlForSecurityDisplay function in cef_parser.h
- Fix crash when passing `--disable-extensions` command-line flag (issue #1721)
- Linux: Fix NSS handler loading (issue #1727)

libcef/browser/render_widget_host_view_osr.cc

@@ -472,9 +472,9 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
 #if !defined(OS_MACOSX)
   // On OS X the ui::Compositor is created/owned by the platform view.
   compositor_.reset(
-      new ui::Compositor(compositor_widget_,
-                         content::GetContextFactory(),
+      new ui::Compositor(content::GetContextFactory(),
                          base::ThreadTaskRunnerHandle::Get()));
+  compositor_->SetAcceleratedWidgetAndStartCompositor(compositor_widget_);
 #endif
   compositor_->SetDelegate(this);
   compositor_->SetRootLayer(root_layer_.get());
@@ -670,7 +670,8 @@ void CefRenderWidgetHostViewOSR::OnSwapCompositorFrame(
       cc::RenderPass* root_pass =
           frame->delegated_frame_data->render_pass_list.back();
       gfx::Size frame_size = root_pass->output_rect.size();
-      gfx::Rect damage_rect = gfx::ToEnclosingRect(root_pass->damage_rect);
+      gfx::Rect damage_rect =
+          gfx::ToEnclosingRect(gfx::RectF(root_pass->damage_rect));
       damage_rect.Intersect(gfx::Rect(frame_size));
 
       delegated_frame_host_->SwapDelegatedFrame(
@@ -689,6 +690,10 @@ void CefRenderWidgetHostViewOSR::OnSwapCompositorFrame(
   }
 }
 
+void CefRenderWidgetHostViewOSR::ClearCompositorFrame() {
+  delegated_frame_host_->ClearDelegatedFrame();
+}
+
 void CefRenderWidgetHostViewOSR::InitAsPopup(
     content::RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
@@ -830,12 +835,6 @@ void CefRenderWidgetHostViewOSR::SetTooltipText(
   }
 }
 
-void CefRenderWidgetHostViewOSR::SelectionChanged(
-    const base::string16& text,
-    size_t offset,
-    const gfx::Range& range) {
-}
-
 gfx::Size CefRenderWidgetHostViewOSR::GetRequestedRendererSize() const {
   return delegated_frame_host_->GetRequestedRendererSize();
 }
@@ -844,14 +843,16 @@ gfx::Size CefRenderWidgetHostViewOSR::GetPhysicalBackingSize() const {
   return gfx::ConvertSizeToPixel(scale_factor_, GetRequestedRendererSize());
 }
 
+#if !defined(OS_MACOSX)
 void CefRenderWidgetHostViewOSR::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
 }
+#endif
 
 void CefRenderWidgetHostViewOSR::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
-    content::ReadbackRequestCallback& callback,
+    const content::ReadbackRequestCallback& callback,
     const SkColorType color_type) {
   delegated_frame_host_->CopyFromCompositingSurface(
       src_subrect, dst_size, callback, color_type);
@@ -869,10 +870,6 @@ bool CefRenderWidgetHostViewOSR::CanCopyToVideoFrame() const {
   return delegated_frame_host_->CanCopyToVideoFrame();
 }
 
-bool CefRenderWidgetHostViewOSR::CanSubscribeFrame() const {
-  return delegated_frame_host_->CanSubscribeFrame();
-}
-
 void CefRenderWidgetHostViewOSR::BeginFrameSubscription(
     scoped_ptr<content::RenderWidgetHostViewFrameSubscriber> subscriber) {
   delegated_frame_host_->BeginFrameSubscription(subscriber.Pass());
@@ -882,10 +879,6 @@ void CefRenderWidgetHostViewOSR::EndFrameSubscription() {
   delegated_frame_host_->EndFrameSubscription();
 }
 
-void CefRenderWidgetHostViewOSR::AcceleratedSurfaceInitialized(
-    int route_id) {
-}
-
 bool CefRenderWidgetHostViewOSR::HasAcceleratedSurface(
     const gfx::Size& desired_size) {
   // CEF doesn't use GetBackingStore for accelerated pages, so it doesn't
@@ -929,6 +922,13 @@ void CefRenderWidgetHostViewOSR::GetScreenInfo(blink::WebScreenInfo* results) {
   *results = webScreenInfoFrom(screen_info);
 }
 
+bool CefRenderWidgetHostViewOSR::GetScreenColorProfile(
+    std::vector<char>* color_profile) {
+  DCHECK(color_profile->empty());
+  // TODO(cef): Maybe expose this method to the client?
+  return false;
+}
+
 gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() {
   if (!browser_impl_.get())
     return gfx::Rect();
@@ -941,11 +941,6 @@ gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() {
   return gfx::Rect();
 }
 
-gfx::GLSurfaceHandle CefRenderWidgetHostViewOSR::GetCompositingSurface() {
-  return content::ImageTransportFactory::GetInstance()->
-      GetSharedSurfaceHandle();
-}
-
 content::BrowserAccessibilityManager*
     CefRenderWidgetHostViewOSR::CreateBrowserAccessibilityManager(
         content::BrowserAccessibilityDelegate* delegate) {