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

Side by Side Diff: cc/texture_layer.cc

Issue 11439026: Revert 171403 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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
« no previous file with comments | « cc/test/fake_web_graphics_context_3d_unittest.cc ('k') | cc/texture_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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 #include "cc/texture_layer.h" 5 #include "cc/texture_layer.h"
6 6
7 #include "third_party/khronos/GLES2/gl2.h"
7 #include "cc/layer_tree_host.h" 8 #include "cc/layer_tree_host.h"
8 #include "cc/texture_layer_client.h" 9 #include "cc/texture_layer_client.h"
9 #include "cc/texture_layer_impl.h" 10 #include "cc/texture_layer_impl.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
11 #include "third_party/khronos/GLES2/gl2.h"
12 11
13 namespace cc { 12 namespace cc {
14 13
15 scoped_refptr<TextureLayer> TextureLayer::create(TextureLayerClient* client) 14 scoped_refptr<TextureLayer> TextureLayer::create(TextureLayerClient* client)
16 { 15 {
17 return scoped_refptr<TextureLayer>(new TextureLayer(client)); 16 return scoped_refptr<TextureLayer>(new TextureLayer(client));
18 } 17 }
19 18
20 TextureLayer::TextureLayer(TextureLayerClient* client) 19 TextureLayer::TextureLayer(TextureLayerClient* client)
21 : Layer() 20 : Layer()
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 124
126 TextureLayerImpl* textureLayer = static_cast<TextureLayerImpl*>(layer); 125 TextureLayerImpl* textureLayer = static_cast<TextureLayerImpl*>(layer);
127 textureLayer->setFlipped(m_flipped); 126 textureLayer->setFlipped(m_flipped);
128 textureLayer->setUVRect(m_uvRect); 127 textureLayer->setUVRect(m_uvRect);
129 textureLayer->setPremultipliedAlpha(m_premultipliedAlpha); 128 textureLayer->setPremultipliedAlpha(m_premultipliedAlpha);
130 textureLayer->setTextureId(m_textureId); 129 textureLayer->setTextureId(m_textureId);
131 m_contentCommitted = drawsContent(); 130 m_contentCommitted = drawsContent();
132 } 131 }
133 132
134 } // namespace cc 133 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_web_graphics_context_3d_unittest.cc ('k') | cc/texture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698