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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 15063003: Cut content/browser dependency on webkit_media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/media_switches.h » ('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) 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #include "ipc/ipc_platform_file.h" 118 #include "ipc/ipc_platform_file.h"
119 #include "ipc/ipc_switches.h" 119 #include "ipc/ipc_switches.h"
120 #include "ipc/ipc_sync_channel.h" 120 #include "ipc/ipc_sync_channel.h"
121 #include "media/base/media_switches.h" 121 #include "media/base/media_switches.h"
122 #include "net/url_request/url_request_context_getter.h" 122 #include "net/url_request/url_request_context_getter.h"
123 #include "ppapi/shared_impl/ppapi_switches.h" 123 #include "ppapi/shared_impl/ppapi_switches.h"
124 #include "ui/base/ui_base_switches.h" 124 #include "ui/base/ui_base_switches.h"
125 #include "ui/gl/gl_switches.h" 125 #include "ui/gl/gl_switches.h"
126 #include "webkit/fileapi/sandbox_mount_point_provider.h" 126 #include "webkit/fileapi/sandbox_mount_point_provider.h"
127 #include "webkit/glue/resource_type.h" 127 #include "webkit/glue/resource_type.h"
128 #include "webkit/media/media_switches.h"
129 #include "webkit/plugins/plugin_switches.h" 128 #include "webkit/plugins/plugin_switches.h"
130 129
131 #if defined(OS_WIN) 130 #if defined(OS_WIN)
132 #include "base/win/scoped_com_initializer.h" 131 #include "base/win/scoped_com_initializer.h"
133 #include "content/common/font_cache_dispatcher_win.h" 132 #include "content/common/font_cache_dispatcher_win.h"
134 #include "content/common/sandbox_win.h" 133 #include "content/common/sandbox_win.h"
135 #include "content/public/common/sandboxed_process_launcher_delegate.h" 134 #include "content/public/common/sandboxed_process_launcher_delegate.h"
136 #endif 135 #endif
137 136
138 #include "third_party/skia/include/core/SkBitmap.h" 137 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 // These are unsupported and not fully tested modes, so don't enable them 894 // These are unsupported and not fully tested modes, so don't enable them
896 // for official Google Chrome builds. 895 // for official Google Chrome builds.
897 switches::kInProcessPlugins, 896 switches::kInProcessPlugins,
898 #endif // GOOGLE_CHROME_BUILD 897 #endif // GOOGLE_CHROME_BUILD
899 switches::kJavaScriptFlags, 898 switches::kJavaScriptFlags,
900 switches::kLoggingLevel, 899 switches::kLoggingLevel,
901 switches::kMemoryMetrics, 900 switches::kMemoryMetrics,
902 #if defined(OS_ANDROID) 901 #if defined(OS_ANDROID)
903 switches::kNetworkCountryIso, 902 switches::kNetworkCountryIso,
904 switches::kDisableGestureRequirementForMediaPlayback, 903 switches::kDisableGestureRequirementForMediaPlayback,
904 #endif
905 #if defined(GOOGLE_TV)
905 switches::kUseExternalVideoSurfaceThresholdInPixels, 906 switches::kUseExternalVideoSurfaceThresholdInPixels,
906 #endif 907 #endif
907 switches::kNoReferrers, 908 switches::kNoReferrers,
908 switches::kNoSandbox, 909 switches::kNoSandbox,
909 switches::kPpapiInProcess, 910 switches::kPpapiInProcess,
910 switches::kRegisterPepperPlugins, 911 switches::kRegisterPepperPlugins,
911 switches::kRendererAssertTest, 912 switches::kRendererAssertTest,
912 #if defined(OS_POSIX) 913 #if defined(OS_POSIX)
913 switches::kChildCleanExit, 914 switches::kChildCleanExit,
914 #endif 915 #endif
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 TRACE_EVENT0("renderer_host", 1747 TRACE_EVENT0("renderer_host",
1747 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1748 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1748 AcceleratedSurfaceMsg_BufferPresented_Params ack_params; 1749 AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
1749 ack_params.sync_point = 0; 1750 ack_params.sync_point = 0;
1750 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1751 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1751 gpu_process_host_id, 1752 gpu_process_host_id,
1752 ack_params); 1753 ack_params);
1753 } 1754 }
1754 1755
1755 } // namespace content 1756 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698