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

Source/WebCore/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 57 matching lines @@
 #include "SharedBuffer.h"
 #include "SpeechInput.h"
 #include "SpeechInputClient.h"
 #include "TextResourceDecoder.h"
 #include "Widget.h"
 #include <wtf/HashMap.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringHash.h>
 
-#if ENABLE(ACCELERATED_2D_CANVAS)
-#include "GraphicsContext3D.h"
-#endif
-
 #if ENABLE(DOM_STORAGE)
 #include "StorageArea.h"
 #include "StorageNamespace.h"
 #endif
 
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
 #include "GeolocationController.h"
 #endif
 
 namespace WebCore {
@@ skipping 653 matching lines @@
 {
     if (m_debugger == debugger)
         return;
 
     m_debugger = debugger;
 
     for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree()->traverseNext())
         frame->script()->attachDebugger(m_debugger);
 }
 
-GraphicsContext3D* Page::sharedGraphicsContext3D()
-{
-#if ENABLE(ACCELERATED_2D_CANVAS)
-    if (!m_sharedGraphicsContext3D) {
-        GraphicsContext3D::Attributes attr;
-        attr.depth = false;
-        attr.stencil = true;
-        attr.antialias = false;
-        attr.canRecoverFromContextLoss = false; // Canvas contexts can not handle lost contexts.
-        m_sharedGraphicsContext3D = GraphicsContext3D::create(attr, chrome());
-    }
-    return m_sharedGraphicsContext3D.get();
-#else // !ENABLE(ACCELERATED_2D_CANVAS)
-    return 0;
-#endif
-}
-
 #if ENABLE(DOM_STORAGE)
 StorageNamespace* Page::sessionStorage(bool optionalCreate)
 {
     if (!m_sessionStorage && optionalCreate)
         m_sessionStorage = StorageNamespace::sessionStorageNamespace(this, m_settings->sessionStorageQuota());
 
     return m_sessionStorage.get();
 }
 
 void Page::setSessionStorage(PassRefPtr<StorageNamespace> newStorage)
@@ skipping 185 matching lines @@
     , speechInputClient(0)
     , mediaStreamClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore