Merge 89635 - 2011-06-23 John Bates <jbates@google.com>

Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

 /*
  * Copyright (C) 2010 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 130 matching lines @@
 
     CCHeadsUpDisplay* headsUpDisplay() { return m_headsUpDisplay.get(); }
 
     void setScissorToRect(const IntRect&);
 
     String layerTreeAsText() const;
 
     void addChildContext(GraphicsContext3D*);
     void removeChildContext(GraphicsContext3D*);
 
+    // Return true if the compositor context has an error.
+    bool isCompositorContextLost();
+
 #ifndef NDEBUG
     static bool s_inPaintLayerContents;
 #endif
 private:
     typedef Vector<RefPtr<CCLayerImpl> > LayerList;
     typedef HashMap<GraphicsContext3D*, int> ChildContextMap;
 
     // FIXME: This needs to be moved to the CCViewImpl when that class exists.
     RefPtr<CCLayerImpl> m_rootCCLayerImpl;
 
@@ skipping 70 matching lines @@
     OwnPtr<TextureManager> m_textureManager;
 
     OwnPtr<CCHeadsUpDisplay> m_headsUpDisplay;
 
     RefPtr<GraphicsContext3D> m_context;
 #if USE(SKIA)
     OwnPtr<GrContext> m_skiaContext;
 #endif
 
     ChildContextMap m_childContexts;
-    // If true, the child contexts were copied to the compositor texture targets
-    // and the compositor will need to wait on the proper latches before using
-    // the target textures. If false, the compositor is reusing the textures
-    // from last frame.
-    bool m_childContextsWereCopied;
 
     bool m_contextSupportsLatch;
     bool m_contextSupportsMapSub;
 
     bool m_animating;
 
     RenderSurfaceChromium* m_defaultRenderSurface;
 
     CCLayerSorter m_layerSorter;
 };
 
 // Setting DEBUG_GL_CALLS to 1 will call glGetError() after almost every GL
 // call made by the compositor. Useful for debugging rendering issues but
 // will significantly degrade performance.
 #define DEBUG_GL_CALLS 0
 
 #if DEBUG_GL_CALLS && !defined ( NDEBUG )
 #define GLC(context, x) { (x), LayerRendererChromium::debugGLCall(context, #x, __FILE__, __LINE__); }
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif