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

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

Issue 18156005: cc: Remove unused WebKit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 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/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "third_party/skia/include/core/SkSurface.h" 47 #include "third_party/skia/include/core/SkSurface.h"
48 #include "third_party/skia/include/gpu/GrContext.h" 48 #include "third_party/skia/include/gpu/GrContext.h"
49 #include "third_party/skia/include/gpu/GrTexture.h" 49 #include "third_party/skia/include/gpu/GrTexture.h"
50 #include "third_party/skia/include/gpu/SkGpuDevice.h" 50 #include "third_party/skia/include/gpu/SkGpuDevice.h"
51 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h" 51 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h"
52 #include "third_party/skia/include/gpu/gl/GrGLInterface.h" 52 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
53 #include "ui/gfx/quad_f.h" 53 #include "ui/gfx/quad_f.h"
54 #include "ui/gfx/rect_conversions.h" 54 #include "ui/gfx/rect_conversions.h"
55 55
56 using WebKit::WebGraphicsContext3D; 56 using WebKit::WebGraphicsContext3D;
57 using WebKit::WebGraphicsMemoryAllocation;
58 57
59 namespace cc { 58 namespace cc {
60 59
61 namespace { 60 namespace {
62 61
63 // TODO(epenner): This should probably be moved to output surface. 62 // TODO(epenner): This should probably be moved to output surface.
64 // 63 //
65 // This implements a simple fence based on client side swaps. 64 // This implements a simple fence based on client side swaps.
66 // This is to isolate the ResourceProvider from 'frames' which 65 // This is to isolate the ResourceProvider from 'frames' which
67 // it shouldn't need to care about, while still allowing us to 66 // it shouldn't need to care about, while still allowing us to
(...skipping 2978 matching lines...) Expand 10 before | Expand all | Expand 10 after
3046 std::string unique_context_name = base::StringPrintf( 3045 std::string unique_context_name = base::StringPrintf(
3047 "%s-Offscreen-%p", 3046 "%s-Offscreen-%p",
3048 Settings().compositor_name.c_str(), 3047 Settings().compositor_name.c_str(),
3049 context_); 3048 context_);
3050 resource_provider()->offscreen_context_provider()->Context3d()-> 3049 resource_provider()->offscreen_context_provider()->Context3d()->
3051 pushGroupMarkerEXT(unique_context_name.c_str()); 3050 pushGroupMarkerEXT(unique_context_name.c_str());
3052 } 3051 }
3053 3052
3054 3053
3055 } // namespace cc 3054 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698