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

Source/WebCore/html/canvas/CanvasRenderingContext2D.h

 /*
  * Copyright (C) 2006, 2007, 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "AffineTransform.h"
 #include "CanvasRenderingContext.h"
 #include "Color.h"
 #include "FloatSize.h"
 #include "Font.h"
 #include "GraphicsTypes.h"
 #include "Path.h"
 #include "PlatformString.h"
 #include <wtf/Vector.h>
 
-
 #if USE(ACCELERATED_COMPOSITING)
 #include "GraphicsLayer.h"
 #endif
 
 namespace WebCore {
 
 class CanvasGradient;
 class CanvasPattern;
 class CanvasStyle;
 class FloatRect;
 class GraphicsContext;
 class HTMLCanvasElement;
 class HTMLImageElement;
 class HTMLVideoElement;
 class ImageData;
 class TextMetrics;
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
 class DrawingBuffer;
-class GraphicsContext3D;
+class SharedGraphicsContext3D;
 #endif
 
 typedef int ExceptionCode;
 
 class CanvasRenderingContext2D : public CanvasRenderingContext {
 public:
     static PassOwnPtr<CanvasRenderingContext2D> create(HTMLCanvasElement* canvas, bool usesCSSCompatibilityParseMode, bool usesDashboardCompatibilityMode)
     {
         return adoptPtr(new CanvasRenderingContext2D(canvas, usesCSSCompatibilityParseMode, usesDashboardCompatibilityMode));
     }
@@ skipping 231 matching lines @@
 #endif
 
     Vector<State, 1> m_stateStack;
     bool m_usesCSSCompatibilityParseMode;
 #if ENABLE(DASHBOARD_SUPPORT)
     bool m_usesDashboardCompatibilityMode;
 #endif
 
 #if ENABLE(ACCELERATED_2D_CANVAS)
     RefPtr<DrawingBuffer> m_drawingBuffer;
-    RefPtr<GraphicsContext3D> m_context3D;
+    RefPtr<SharedGraphicsContext3D> m_context3D;
 #endif
 };
 
 } // namespace WebCore
 
 #endif