OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" | 46 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" |
47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" | 47 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" |
48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
49 #include "third_party/skia/include/core/SkShader.h" | 49 #include "third_party/skia/include/core/SkShader.h" |
50 #include "ui/base/ui_base_switches.h" | 50 #include "ui/base/ui_base_switches.h" |
51 #include "ui/gfx/rect_conversions.h" | 51 #include "ui/gfx/rect_conversions.h" |
52 #include "ui/gfx/size_conversions.h" | 52 #include "ui/gfx/size_conversions.h" |
53 #include "ui/gfx/skia_util.h" | 53 #include "ui/gfx/skia_util.h" |
54 #include "ui/gl/gl_switches.h" | 54 #include "ui/gl/gl_switches.h" |
55 #include "ui/surface/transport_dib.h" | 55 #include "ui/surface/transport_dib.h" |
56 #include "webkit/compositor_bindings/web_rendering_stats_impl.h" | |
57 #include "webkit/glue/webkit_glue.h" | 56 #include "webkit/glue/webkit_glue.h" |
58 #include "webkit/plugins/npapi/webplugin.h" | 57 #include "webkit/plugins/npapi/webplugin.h" |
59 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 58 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
| 59 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h" |
60 | 60 |
61 #if defined(OS_ANDROID) | 61 #if defined(OS_ANDROID) |
62 #include "content/renderer/android/synchronous_compositor_output_surface.h" | 62 #include "content/renderer/android/synchronous_compositor_output_surface.h" |
63 #endif | 63 #endif |
64 | 64 |
65 #if defined(OS_POSIX) | 65 #if defined(OS_POSIX) |
66 #include "ipc/ipc_channel_posix.h" | 66 #include "ipc/ipc_channel_posix.h" |
67 #include "third_party/skia/include/core/SkMallocPixelRef.h" | 67 #include "third_party/skia/include/core/SkMallocPixelRef.h" |
68 #include "third_party/skia/include/core/SkPixelRef.h" | 68 #include "third_party/skia/include/core/SkPixelRef.h" |
69 #endif // defined(OS_POSIX) | 69 #endif // defined(OS_POSIX) |
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2350 | 2350 |
2351 if (!context->Initialize( | 2351 if (!context->Initialize( |
2352 attributes, | 2352 attributes, |
2353 false /* bind generates resources */, | 2353 false /* bind generates resources */, |
2354 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) | 2354 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) |
2355 return NULL; | 2355 return NULL; |
2356 return context.release(); | 2356 return context.release(); |
2357 } | 2357 } |
2358 | 2358 |
2359 } // namespace content | 2359 } // namespace content |
OLD | NEW |