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

Side by Side Diff: cc/output/output_surface.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « cc/output/gl_renderer_unittest.cc ('k') | cc/output/software_renderer_unittest.cc » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/output/output_surface.h" 5 #include "cc/output/output_surface.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 return true; 57 return true;
58 if (!context3d_->makeContextCurrent()) 58 if (!context3d_->makeContextCurrent())
59 return false; 59 return false;
60 60
61 string extensions_string = UTF16ToASCII(context3d_->getString(GL_EXTENSIONS)); 61 string extensions_string = UTF16ToASCII(context3d_->getString(GL_EXTENSIONS));
62 vector<string> extensions_list; 62 vector<string> extensions_list;
63 base::SplitString(extensions_string, ' ', &extensions_list); 63 base::SplitString(extensions_string, ' ', &extensions_list);
64 set<string> extensions(extensions_list.begin(), extensions_list.end()); 64 set<string> extensions(extensions_list.begin(), extensions_list.end());
65 65
66 has_gl_discard_backbuffer_ = 66 has_gl_discard_backbuffer_ =
67 extensions.count("GL_CHROMIUM_discard_backbuffer"); 67 extensions.count("GL_CHROMIUM_discard_backbuffer") > 0;
68 68
69 return true; 69 return true;
70 } 70 }
71 71
72 void OutputSurface::SendFrameToParentCompositor(CompositorFrame* frame) { 72 void OutputSurface::SendFrameToParentCompositor(CompositorFrame* frame) {
73 NOTIMPLEMENTED(); 73 NOTIMPLEMENTED();
74 } 74 }
75 75
76 void OutputSurface::EnsureBackbuffer() { 76 void OutputSurface::EnsureBackbuffer() {
77 DCHECK(context3d_); 77 DCHECK(context3d_);
(...skipping 24 matching lines...) Expand all
102 context3d_->prepareTexture(); 102 context3d_->prepareTexture();
103 } 103 }
104 104
105 void OutputSurface::PostSubBuffer(gfx::Rect rect) { 105 void OutputSurface::PostSubBuffer(gfx::Rect rect) {
106 DCHECK(context3d_); 106 DCHECK(context3d_);
107 context3d_->postSubBufferCHROMIUM( 107 context3d_->postSubBufferCHROMIUM(
108 rect.x(), rect.y(), rect.width(), rect.height()); 108 rect.x(), rect.y(), rect.width(), rect.height());
109 } 109 }
110 110
111 } // namespace cc 111 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/gl_renderer_unittest.cc ('k') | cc/output/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698