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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

Issue 2346663004: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "platform/graphics/gpu/DrawingBuffer.h" 31 #include "platform/graphics/gpu/DrawingBuffer.h"
32 32
33 #include "cc/resources/shared_bitmap.h" 33 #include "cc/resources/shared_bitmap.h"
34 #include "gpu/GLES2/gl2extchromium.h" 34 #include "gpu/GLES2/gl2extchromium.h"
35 #include "gpu/command_buffer/client/gles2_interface.h" 35 #include "gpu/command_buffer/client/gles2_interface.h"
36 #include "gpu/command_buffer/common/capabilities.h" 36 #include "gpu/command_buffer/common/capabilities.h"
37 #include "platform/RuntimeEnabledFeatures.h" 37 #include "platform/RuntimeEnabledFeatures.h"
38 #include "platform/TraceEvent.h"
39 #include "platform/graphics/AcceleratedStaticBitmapImage.h" 38 #include "platform/graphics/AcceleratedStaticBitmapImage.h"
40 #include "platform/graphics/GraphicsLayer.h" 39 #include "platform/graphics/GraphicsLayer.h"
41 #include "platform/graphics/ImageBuffer.h" 40 #include "platform/graphics/ImageBuffer.h"
42 #include "platform/graphics/gpu/Extensions3DUtil.h" 41 #include "platform/graphics/gpu/Extensions3DUtil.h"
42 #include "platform/tracing/TraceEvent.h"
43 #include "public/platform/Platform.h" 43 #include "public/platform/Platform.h"
44 #include "public/platform/WebCompositorSupport.h" 44 #include "public/platform/WebCompositorSupport.h"
45 #include "public/platform/WebExternalBitmap.h" 45 #include "public/platform/WebExternalBitmap.h"
46 #include "public/platform/WebExternalTextureLayer.h" 46 #include "public/platform/WebExternalTextureLayer.h"
47 #include "public/platform/WebGraphicsContext3DProvider.h" 47 #include "public/platform/WebGraphicsContext3DProvider.h"
48 #include "skia/ext/texture_handle.h" 48 #include "skia/ext/texture_handle.h"
49 #include "third_party/skia/include/gpu/GrContext.h" 49 #include "third_party/skia/include/gpu/GrContext.h"
50 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" 50 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
51 #include "wtf/CheckedNumeric.h" 51 #include "wtf/CheckedNumeric.h"
52 #include "wtf/PtrUtil.h" 52 #include "wtf/PtrUtil.h"
(...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 1238
1239 void DrawingBuffer::restoreTextureBindings() 1239 void DrawingBuffer::restoreTextureBindings()
1240 { 1240 {
1241 // This class potentially modifies the bindings for GL_TEXTURE_2D and 1241 // This class potentially modifies the bindings for GL_TEXTURE_2D and
1242 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since 1242 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since
1243 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE. 1243 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE.
1244 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); 1244 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding);
1245 } 1245 }
1246 1246
1247 } // namespace blink 1247 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698