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

Side by Side Diff: cc/raster/scoped_gpu_raster.cc

Issue 1144693002: cc: Move files out of cc/resources/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resources: android Created 5 years, 7 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
« no previous file with comments | « cc/raster/scoped_gpu_raster.h ('k') | cc/raster/scoped_gpu_raster_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/resources/scoped_gpu_raster.h" 5 #include "cc/raster/scoped_gpu_raster.h"
6 #include "gpu/command_buffer/client/gles2_interface.h" 6 #include "gpu/command_buffer/client/gles2_interface.h"
7 #include "third_party/khronos/GLES2/gl2.h" 7 #include "third_party/khronos/GLES2/gl2.h"
8 #include "third_party/khronos/GLES2/gl2ext.h" 8 #include "third_party/khronos/GLES2/gl2ext.h"
9 #include "third_party/skia/include/gpu/GrContext.h" 9 #include "third_party/skia/include/gpu/GrContext.h"
10 10
11 using gpu::gles2::GLES2Interface; 11 using gpu::gles2::GLES2Interface;
12 12
13 namespace cc { 13 namespace cc {
14 14
15 ScopedGpuRaster::ScopedGpuRaster(ContextProvider* context_provider) 15 ScopedGpuRaster::ScopedGpuRaster(ContextProvider* context_provider)
(...skipping 26 matching lines...) Expand all
42 // Restore default GL unpack alignment. TextureUploader expects this. 42 // Restore default GL unpack alignment. TextureUploader expects this.
43 gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4); 43 gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4);
44 44
45 // TODO(alokp): Use a trace macro to push/pop markers. 45 // TODO(alokp): Use a trace macro to push/pop markers.
46 // Using push/pop functions directly incurs cost to evaluate function 46 // Using push/pop functions directly incurs cost to evaluate function
47 // arguments even when tracing is disabled. 47 // arguments even when tracing is disabled.
48 gl->PopGroupMarkerEXT(); 48 gl->PopGroupMarkerEXT();
49 } 49 }
50 50
51 } // namespace cc 51 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/scoped_gpu_raster.h ('k') | cc/raster/scoped_gpu_raster_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698