Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 48 matching lines @@
 #include "Settings.h"
 #include "StrokeStyleApplier.h"
 #include "TextMetrics.h"
 #include "TextRun.h"
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "DrawingBuffer.h"
 #include "FrameView.h"
+#include "SharedGraphicsContext3D.h"
 #if USE(ACCELERATED_COMPOSITING)
 #include "RenderLayer.h"
 #endif
 #endif
 
 #include <wtf/ByteArray.h>
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/UnusedParam.h>
 
@@ skipping 56 matching lines @@
     CanvasRenderingContext2D* m_canvasContext;
 };
 
 CanvasRenderingContext2D::CanvasRenderingContext2D(HTMLCanvasElement* canvas, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode)
     : CanvasRenderingContext(canvas)
     , m_stateStack(1)
     , m_usesCSSCompatibilityParseMode(usesCSSCompatibilityParseMode)
 #if ENABLE(DASHBOARD_SUPPORT)
     , m_usesDashboardCompatibilityMode(usesDashboardCompatibilityMode)
 #endif
-#if ENABLE(ACCELERATED_2D_CANVAS)
-    , m_context3D(0)
-#endif
 {
 #if !ENABLE(DASHBOARD_SUPPORT)
     ASSERT_UNUSED(usesDashboardCompatibilityMode, !usesDashboardCompatibilityMode);
 #endif
 
     // Make sure that even if the drawingContext() has a different default
     // thickness, it is in sync with the canvas thickness.
     setLineWidth(lineWidth());
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
@@ skipping 30 matching lines @@
     return m_context3D;
 #else
     return false;
 #endif
 }
 
 bool CanvasRenderingContext2D::paintsIntoCanvasBuffer() const
 {
 #if ENABLE(ACCELERATED_2D_CANVAS)
     if (m_context3D)
-        return m_context3D->paintsIntoCanvasBuffer();
+        return m_context3D->context()->paintsIntoCanvasBuffer();
 #endif
     return true;
 }
 
 
 void CanvasRenderingContext2D::reset()
 {
     m_stateStack.resize(1);
     m_stateStack.first() = State();
     m_path.clear();
@@ skipping 1834 matching lines @@
 
     // Try to accelerate.
     GraphicsContext* ctx = drawingContext();
     if (!ctx) {
         clearAcceleration();
         return;
     }
 
     if (!m_context3D) {
         Page* page = canvas()->document()->page();
-        m_context3D = page->sharedGraphicsContext3D();
+        m_context3D = SharedGraphicsContext3D::create(page->chrome());
         if (!m_context3D) {
             clearAcceleration();
             return;
         }
     }
 
     if (m_drawingBuffer) {
         if (!m_drawingBuffer->reset(canvas()->size())) {
             clearAcceleration();
             return;
         }
     } else {
-        m_drawingBuffer = m_context3D->createDrawingBuffer(canvas()->size());
+        m_drawingBuffer = m_context3D->context()->createDrawingBuffer(canvas()->size());
         if (!m_drawingBuffer) {
             clearAcceleration();
             return;
         }
     }
 
-    ctx->setGraphicsContext3D(m_context3D.get(), m_drawingBuffer.get(), canvas()->size());
+    ctx->setGraphicsContext3D(m_context3D->context(), m_drawingBuffer.get(), canvas()->size());
 }
 #endif
 
 } // namespace WebCore