Merge http://trac.webkit.org/changeset/93131 : GraphicsContext3D should allow its hostWindow to b...

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 173 matching lines @@
     return buffer ? buffer->isAccelerated() : false;
 #elif ENABLE(ACCELERATED_2D_CANVAS)
     return m_context3D;
 #else
     return false;
 #endif
 }
 
 bool CanvasRenderingContext2D::paintsIntoCanvasBuffer() const
 {
-#if ENABLE(ACCELERATED_2D_CANVAS)
-    if (m_context3D)
-        return m_context3D->context()->paintsIntoCanvasBuffer();
+#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+    if (!isAccelerated())
+        return true;
+
+    RenderBox* renderBox = canvas()->renderBox();
+    if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing())
+        return false;
 #endif
     return true;
 }
 
 
 void CanvasRenderingContext2D::reset()
 {
     m_stateStack.resize(1);
     m_stateStack.first() = State();
     m_path.clear();
@@ skipping 1833 matching lines @@
     }
 
     // Try to accelerate.
     GraphicsContext* ctx = drawingContext();
     if (!ctx) {
         clearAcceleration();
         return;
     }
 
     if (!m_context3D) {
-        Page* page = canvas()->document()->page();
-        m_context3D = SharedGraphicsContext3D::create(page->chrome());
+        m_context3D = SharedGraphicsContext3D::create(0);
         if (!m_context3D) {
             clearAcceleration();
             return;
         }
     }
 
     if (m_drawingBuffer) {
         if (!m_drawingBuffer->reset(canvas()->size())) {
             clearAcceleration();
             return;
         }
     } else {
         m_drawingBuffer = m_context3D->context()->createDrawingBuffer(canvas()->size());
         if (!m_drawingBuffer) {
             clearAcceleration();
             return;
         }
     }
 
     ctx->setGraphicsContext3D(m_context3D->context(), m_drawingBuffer.get(), canvas()->size());
 }
 #endif
 
 } // namespace WebCore