Clean up initial CA layer setup for Mac Plugins

webkit/glue/plugins/webplugin_delegate_impl_mac.mm

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
@@ skipping 354 matching lines @@
       if (instance()->event_model() != NPEventModelCocoa)
         return false;
       window_.type = NPWindowTypeDrawable;
       // Ask the plug-in for the CALayer it created for rendering content. Have
       // the renderer tell the browser to create a "windowed plugin" to host
       // the IOSurface.
       CALayer* layer = nil;
       NPError err = instance()->NPP_GetValue(NPPVpluginCoreAnimationLayer,
                                              reinterpret_cast<void*>(&layer));
       if (!err) {
+        // Create the timer; it will be started when we get a window handle.
+        redraw_timer_.reset(new base::RepeatingTimer<WebPluginDelegateImpl>);
         layer_ = layer;
-        plugin_->BindFakePluginWindowHandle(false);
         surface_ = new AcceleratedSurface;
         surface_->Initialize(NULL, true);
         renderer_ = [[CARenderer rendererWithCGLContext:surface_->context()
                                                 options:NULL] retain];
         [renderer_ setLayer:layer_];
-        UpdateAcceleratedSurface();
-        redraw_timer_.reset(new base::RepeatingTimer<WebPluginDelegateImpl>);
-        // This will start the timer, but only if we are visible.
-        PluginVisibilityChanged();
+        plugin_->BindFakePluginWindowHandle(false);
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
   // TODO(stuartmorgan): We need real plugin container visibility information
   // when the plugin is initialized; for now, assume it's visible.
@@ skipping 576 matching lines @@
 #endif
 }
 
 void WebPluginDelegateImpl::PluginVisibilityChanged() {
 #ifndef NP_NO_CARBON
   if (instance()->event_model() == NPEventModelCarbon)
     UpdateIdleEventRate();
 #endif
   if (instance()->drawing_model() == NPDrawingModelCoreAnimation) {
     bool plugin_visible = container_is_visible_ && !clip_rect_.IsEmpty();
-    if (plugin_visible && !redraw_timer_->IsRunning()) {
+    if (plugin_visible && !redraw_timer_->IsRunning() && windowed_handle()) {
       redraw_timer_->Start(
           base::TimeDelta::FromMilliseconds(kCoreAnimationRedrawPeriodMs),
           this, &WebPluginDelegateImpl::DrawLayerInSurface);
     } else if (!plugin_visible) {
       redraw_timer_->Stop();
     }
   }
 }
 
 #pragma mark -
 #pragma mark Core Animation Support
 
 void WebPluginDelegateImpl::DrawLayerInSurface() {
+  // If we haven't plumbed up the surface yet, don't try to draw.
+  if (!windowed_handle())
+    return;
+
   surface_->MakeCurrent();
 
   surface_->Clear(window_rect_);
 
   [renderer_ beginFrameAtTime:CACurrentMediaTime() timeStamp:NULL];
   CGRect layerRect = [layer_ bounds];
   [renderer_ addUpdateRect:layerRect];
   [renderer_ render];
   [renderer_ endFrame];
 
@@ skipping 16 matching lines @@
 
   uint64 io_surface_id = surface_->SetSurfaceSize(window_rect_.size());
   if (io_surface_id) {
     plugin_->SetAcceleratedSurface(windowed_handle(),
                                    window_rect_.width(),
                                    window_rect_.height(),
                                    io_surface_id);
   }
 }
 
+void WebPluginDelegateImpl::set_windowed_handle(
+    gfx::PluginWindowHandle handle) {
+  windowed_handle_ = handle;
+  UpdateAcceleratedSurface();
+  // Kick off the drawing timer, if necessary.
+  PluginVisibilityChanged();
+}
+
 #pragma mark -
 #pragma mark Carbon Event support
 
 #ifndef NP_NO_CARBON
 void WebPluginDelegateImpl::UpdateDummyWindowBounds(
     const gfx::Point& plugin_origin) {
   WindowRef window = reinterpret_cast<WindowRef>(np_cg_context_.window);
   Rect current_bounds;
   GetWindowBounds(window, kWindowContentRgn, &current_bounds);
 
@@ skipping 93 matching lines @@
     return;
   }
 
   qd_manager_->SetFastPathEnabled(enabled);
   qd_port_.port = qd_manager_->port();
   WindowlessSetWindow();
   // Send a paint event so that the new buffer gets updated immediately.
   WindowlessPaint(buffer_context_, clip_rect_);
 }
 #endif  // !NP_NO_QUICKDRAW