Merge 121076 - [chromium] LayerRendererChromium is not getting visibility messages in single thread…

Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h

 /*
  * Copyright (C) 2011 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:
  *
  * 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
@@ skipping 57 matching lines @@
     void setNeedsRedraw();
 
     struct FramePlane {
         unsigned textureId;
         IntSize size;
         GC3Denum format;
         IntSize visibleSize;
 
         FramePlane() : textureId(0) { }
 
-        bool allocateData(CCRenderer*);
-        void freeData(CCRenderer*);
+        bool allocateData(CCGraphicsContext*);
+        void freeData(CCGraphicsContext*);
     };
 
 private:
     CCVideoLayerImpl(int, WebKit::WebVideoFrameProvider*);
 
     static IntSize computeVisibleSize(const WebKit::WebVideoFrame&, unsigned plane);
     virtual const char* layerTypeAsString() const OVERRIDE { return "VideoLayer"; }
 
     void willDrawInternal(CCRenderer*, CCGraphicsContext*);
-    bool allocatePlaneData(CCRenderer*);
+    bool allocatePlaneData(CCRenderer*, CCGraphicsContext*);
     bool copyPlaneData(CCRenderer*, CCGraphicsContext*);
-    void freePlaneData(CCRenderer*);
-    void freeUnusedPlaneData(CCRenderer*);
+    void freePlaneData(CCGraphicsContext*);
+    void freeUnusedPlaneData(CCGraphicsContext*);
 
     // Guards the destruction of m_provider and the frame that it provides
     Mutex m_providerMutex;
     WebKit::WebVideoFrameProvider* m_provider;
 
     WebKit::WebTransformationMatrix m_streamTextureMatrix;
 
     WebKit::WebVideoFrame* m_frame;
     GC3Denum m_format;
 
     // Each index in this array corresponds to a plane in WebKit::WebVideoFrame.
     FramePlane m_framePlanes[WebKit::WebVideoFrame::maxPlanes];
 };
 
 }
 
 #endif // CCVideoLayerImpl_h