Render using WebPaintSurface.

webkit/tools/test_shell/webwidget_host.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_
 #define WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_
 
 #include "base/basictypes.h"
 #include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
+#include "webkit/tools/test_shell/simple_webpaintsurface_impl.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace WebKit {
 class WebWidget;
 class WebWidgetClient;
 struct WebScreenInfo;
 }
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSEvent;
 #else
 class NSEvent;
 #endif
 #endif
 
 // This class is a simple NativeView-based host for a WebWidget
-class WebWidgetHost {
+class WebWidgetHost : public SimpleWebPaintSurfaceImpl::Delegate {
  public:
   // The new instance is deleted once the associated NativeView is destroyed.
   // The newly created window should be resized after it is created, using the
   // MoveWindow (or equivalent) function.
   static WebWidgetHost* Create(gfx::NativeView parent_view,
                                WebKit::WebWidgetClient* client);
 
 #if defined(OS_MACOSX)
   static void HandleEvent(gfx::NativeView view, NSEvent* event);
 #endif
 
   gfx::NativeView view_handle() const { return view_; }
   WebKit::WebWidget* webwidget() const { return webwidget_; }
 
+  WebKit::WebPaintSurface* GetPaintSurface();
+#if !WEBKIT_USING_PAINTSURFACE
   void DidInvalidateRect(const gfx::Rect& rect);
   void DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect);
+#endif
   void ScheduleComposite();
   void ScheduleAnimation();
 #if defined(OS_WIN)
   void SetCursor(HCURSOR cursor);
 #endif
 
   void DiscardBackingStore();
   // Allow clients to update the paint rect. For example, if we get a gdk
   // expose or WM_PAINT event, we need to update the paint rect.
   void UpdatePaintRect(const gfx::Rect& rect);
@@ skipping 58 matching lines @@
 #endif
 
   void ResetScrollRect();
 
   void set_painting(bool value) {
 #ifndef NDEBUG
     painting_ = value;
 #endif
   }
 
+  // SimpleWebPaintSurfaceImpl::Delegate methods:
+  virtual void DidModifyPaintSurface(const gfx::Rect& bounds);
+
   gfx::NativeView view_;
   WebKit::WebWidget* webwidget_;
   scoped_ptr<skia::PlatformCanvas> canvas_;
 
+  scoped_ptr<SimpleWebPaintSurfaceImpl> paint_surface_;
+  scoped_ptr<SimpleWebPaintSurfaceImpl> pending_paint_surface_;
+
   // specifies the portion of the webwidget that needs painting
   gfx::Rect paint_rect_;
 
   // specifies the portion of the webwidget that needs scrolling
   gfx::Rect scroll_rect_;
   int scroll_dx_;
   int scroll_dy_;
 
 #if defined(OS_WIN)
   bool track_mouse_leave_;
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
   // Since GtkWindow resize is asynchronous, we have to stash the dimensions,
   // so that the backing store doesn't have to wait for sizing to take place.
   gfx::Size logical_size_;
 #endif
 
 #ifndef NDEBUG
   bool painting_;
 #endif
 
  private:
   ScopedRunnableMethodFactory<WebWidgetHost> factory_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_