Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Side by Side Diff: cc/CCVideoLayerImpl.h

Issue 10942040: Fix CC*Renderer and CC*LayerImpl to compile with Clang (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CCVideoLayerImpl_h 5 #ifndef CCVideoLayerImpl_h
6 #define CCVideoLayerImpl_h 6 #define CCVideoLayerImpl_h
7 7
8 #include "CCLayerImpl.h" 8 #include "CCLayerImpl.h"
9 #include "GraphicsContext3D.h" 9 #include "GraphicsContext3D.h"
10 #include "IntSize.h" 10 #include "IntSize.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 FramePlane() : resourceId(0) { } 55 FramePlane() : resourceId(0) { }
56 56
57 bool allocateData(CCResourceProvider*); 57 bool allocateData(CCResourceProvider*);
58 void freeData(CCResourceProvider*); 58 void freeData(CCResourceProvider*);
59 }; 59 };
60 60
61 private: 61 private:
62 CCVideoLayerImpl(int, WebKit::WebVideoFrameProvider*); 62 CCVideoLayerImpl(int, WebKit::WebVideoFrameProvider*);
63 63
64 static IntSize computeVisibleSize(const WebKit::WebVideoFrame&, unsigned pla ne); 64 static IntSize computeVisibleSize(const WebKit::WebVideoFrame&, unsigned pla ne);
65 virtual const char* layerTypeAsString() const OVERRIDE { return "VideoLayer" ; } 65 virtual const char* layerTypeAsString() const OVERRIDE;
66 66
67 void willDrawInternal(CCResourceProvider*); 67 void willDrawInternal(CCResourceProvider*);
68 bool allocatePlaneData(CCResourceProvider*); 68 bool allocatePlaneData(CCResourceProvider*);
69 bool copyPlaneData(CCResourceProvider*); 69 bool copyPlaneData(CCResourceProvider*);
70 void freePlaneData(CCResourceProvider*); 70 void freePlaneData(CCResourceProvider*);
71 void freeUnusedPlaneData(CCResourceProvider*); 71 void freeUnusedPlaneData(CCResourceProvider*);
72 72
73 // Guards the destruction of m_provider and the frame that it provides 73 // Guards the destruction of m_provider and the frame that it provides
74 Mutex m_providerMutex; 74 Mutex m_providerMutex;
75 WebKit::WebVideoFrameProvider* m_provider; 75 WebKit::WebVideoFrameProvider* m_provider;
76 76
77 WebKit::WebTransformationMatrix m_streamTextureMatrix; 77 WebKit::WebTransformationMatrix m_streamTextureMatrix;
78 78
79 WebKit::WebVideoFrame* m_frame; 79 WebKit::WebVideoFrame* m_frame;
80 GC3Denum m_format; 80 GC3Denum m_format;
81 CCResourceProvider::ResourceId m_externalTextureResource; 81 CCResourceProvider::ResourceId m_externalTextureResource;
82 82
83 // Each index in this array corresponds to a plane in WebKit::WebVideoFrame. 83 // Each index in this array corresponds to a plane in WebKit::WebVideoFrame.
84 FramePlane m_framePlanes[WebKit::WebVideoFrame::maxPlanes]; 84 FramePlane m_framePlanes[WebKit::WebVideoFrame::maxPlanes];
85 }; 85 };
86 86
87 } 87 }
88 88
89 #endif // CCVideoLayerImpl_h 89 #endif // CCVideoLayerImpl_h
OLDNEW
« cc/CCTiledLayerImpl.cpp ('K') | « cc/CCTiledLayerImpl.cpp ('k') | cc/CCVideoLayerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698