Implementing ACCELERATED_COMPOSITING via Skia

WebKit/chromium/src/WebFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1625 matching lines @@
 }
 
 void WebFrameImpl::layout()
 {
     // layout this frame
     FrameView* view = m_frame->view();
     if (view)
         view->layoutIfNeededRecursive();
 }
 
+void WebFrameImpl::paintWithContext(GraphicsContext& gc, const WebRect& rect)
+{
+    IntRect dirtyRect(rect);
+    gc.save();
+    if (m_frame->document() && frameView()) {
+        gc.clip(dirtyRect);
+        frameView()->paint(&gc, dirtyRect);
+        m_frame->page()->inspectorController()->drawNodeHighlight(gc);
+    } else
+        gc.fillRect(dirtyRect, Color::white, DeviceColorSpace);
+    gc.restore();
+}
+
 void WebFrameImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     if (rect.isEmpty())
         return;
-    IntRect dirtyRect(rect);
 #if WEBKIT_USING_CG
     GraphicsContext gc(canvas);
     LocalCurrentGraphicsContext localContext(&gc);
 #elif WEBKIT_USING_SKIA
     PlatformContextSkia context(canvas);
 
     // PlatformGraphicsContext is actually a pointer to PlatformContextSkia
     GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
 #else
     notImplemented();
 #endif
-    gc.save();
-    if (m_frame->document() && frameView()) {
-        gc.clip(dirtyRect);
-        frameView()->paint(&gc, dirtyRect);
-        m_frame->page()->inspectorController()->drawNodeHighlight(gc);
-    } else
-        gc.fillRect(dirtyRect, Color::white, DeviceColorSpace);
-    gc.restore();
+    paintWithContext(gc, rect);
 }
 
 void WebFrameImpl::createFrameView()
 {
     ASSERT(m_frame); // If m_frame doesn't exist, we probably didn't init properly.
 
     Page* page = m_frame->page();
     ASSERT(page);
     ASSERT(page->mainFrame());
 
@@ skipping 324 matching lines @@
 
     if (!m_frame->redirectScheduler()->locationChangePending()) {
         m_frame->loader()->stopAllLoaders();
         m_frame->loader()->begin(m_frame->loader()->url(), true, securityOrigin);
         m_frame->loader()->write(scriptResult);
         m_frame->loader()->end();
     }
 }
 
 } // namespace WebKit