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

Source/WebCore/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 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,
@@ skipping 63 matching lines @@
     class Node;
     class PageGroup;
     class PluginData;
     class PluginHalter;
     class PluginHalterClient;
     class ProgressTracker;
     class RenderTheme;
     class VisibleSelection;
     class ScrollableArea;
     class Settings;
-    class GraphicsContext3D;
     class SpeechInput;
     class SpeechInputClient;
 #if ENABLE(DOM_STORAGE)
     class StorageNamespace;
 #endif
 #if ENABLE(NOTIFICATIONS)
     class NotificationPresenter;
 #endif
 
     typedef uint64_t LinkHash;
@@ skipping 164 matching lines @@
 
         static void setDebuggerForAllPages(JSC::Debugger*);
         void setDebugger(JSC::Debugger*);
         JSC::Debugger* debugger() const { return m_debugger; }
 
         static void removeAllVisitedLinks();
 
         static void allVisitedStateChanged(PageGroup*);
         static void visitedStateChanged(PageGroup*, LinkHash visitedHash);
 
-        GraphicsContext3D* sharedGraphicsContext3D();
-
 #if ENABLE(DOM_STORAGE)
         StorageNamespace* sessionStorage(bool optionalCreate = true);
         void setSessionStorage(PassRefPtr<StorageNamespace>);
 #endif
 
         void setCustomHTMLTokenizerTimeDelay(double);
         bool hasCustomHTMLTokenizerTimeDelay() const { return m_customHTMLTokenizerTimeDelay != -1; }
         double customHTMLTokenizerTimeDelay() const { ASSERT(m_customHTMLTokenizerTimeDelay != -1); return m_customHTMLTokenizerTimeDelay; }
 
         void setCustomHTMLTokenizerChunkSize(int);
@@ skipping 36 matching lines @@
 #endif
 
         MediaCanStartListener* takeAnyMediaCanStartListener();
 
         void setMinimumTimerInterval(double);
         double minimumTimerInterval() const;
 
         OwnPtr<Chrome> m_chrome;
         OwnPtr<DragCaretController> m_dragCaretController;
 
-#if ENABLE(ACCELERATED_2D_CANVAS)
-        RefPtr<GraphicsContext3D> m_sharedGraphicsContext3D;
-#endif
-        
 #if ENABLE(DRAG_SUPPORT)
         OwnPtr<DragController> m_dragController;
 #endif
         OwnPtr<FocusController> m_focusController;
 #if ENABLE(CONTEXT_MENUS)
         OwnPtr<ContextMenuController> m_contextMenuController;
 #endif
 #if ENABLE(INSPECTOR)
         OwnPtr<InspectorController> m_inspectorController;
 #endif
@@ skipping 73 matching lines @@
         bool m_isEditable;
 
 #if ENABLE(PAGE_VISIBILITY_API)
         PageVisibilityState m_visibilityState;
 #endif
     };
 
 } // namespace WebCore
     
 #endif // Page_h