diff options
author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 17:05:31 +0000 |
---|---|---|
committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 17:05:31 +0000 |
commit | 77128dec2b067b305b9f749aa8a703af0159b350 (patch) | |
tree | f6b237cb5cee5152dfd29a88747691936100dd26 /chrome/common | |
parent | b61f4dbfaf2459e54203656e2d80588fbad1c931 (diff) | |
download | chromium_src-77128dec2b067b305b9f749aa8a703af0159b350.zip chromium_src-77128dec2b067b305b9f749aa8a703af0159b350.tar.gz chromium_src-77128dec2b067b305b9f749aa8a703af0159b350.tar.bz2 |
Deleted code associated with --enable-gpu-rendering and
--enable-video-layering flags. With the introduction of accelerated
compositing to Chromium this code is now obsolete, and it is causing
problems and bug reports when users experiment with these flags.
Tested on Linux in the following configurations:
- Compositor on, CSS 3D content
- Compositor on, HTML5 video content
- Compositor off, HTML5 video content
Also ran patch successfully through the try bots.
BUG=54932
TEST=none
Review URL: http://codereview.chromium.org/4399003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 7 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
-rw-r--r-- | chrome/common/gpu_messages.h | 1 | ||||
-rw-r--r-- | chrome/common/gpu_messages_internal.h | 49 | ||||
-rw-r--r-- | chrome/common/gpu_native_window_handle.h | 42 | ||||
-rw-r--r-- | chrome/common/gpu_param_traits.h | 1 | ||||
-rw-r--r-- | chrome/common/render_messages.h | 1 | ||||
-rw-r--r-- | chrome/common/render_messages_internal.h | 14 |
8 files changed, 0 insertions, 117 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 4160bc0..1a6b7d0 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -434,9 +434,6 @@ const char kEnableIPv6[] = "enable-ipv6"; // Enable the GPU plugin and Pepper 3D rendering. const char kEnableGPUPlugin[] = "enable-gpu-plugin"; -// Enable experimental GPU rendering for backing store and video. -const char kEnableGPURendering[] = "enable-gpu-rendering"; - // Force logging to be enabled. Logging is disabled by default in release // builds. const char kEnableLogging[] = "enable-logging"; @@ -531,10 +528,6 @@ const char kEnableVerticalTabs[] = "enable-vertical-tabs"; // incomplete and this flag is used for development and testing. const char kEnableVideoFullscreen[] = "enable-video-fullscreen"; -// Enables video layering where video is rendered as a separate layer outside -// of the backing store. -const char kEnableVideoLayering[] = "enable-video-layering"; - // Enables video logging where video elements log playback performance data to // the debug log. const char kEnableVideoLogging[] = "enable-video-logging"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 5a537ce..0e742a0 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -132,7 +132,6 @@ extern const char kEnableExtensionTimelineApi[]; extern const char kEnableFastback[]; extern const char kEnableFileCookies[]; extern const char kEnableGPUPlugin[]; -extern const char kEnableGPURendering[]; extern const char kEnableIPv6[]; extern const char kEnableLogging[]; extern const char kEnableMemoryInfo[]; @@ -163,7 +162,6 @@ extern const char kEnableTouch[]; extern const char kEnableVerbatimInstant[]; extern const char kEnableVerticalTabs[]; extern const char kEnableVideoFullscreen[]; -extern const char kEnableVideoLayering[]; extern const char kEnableVideoLogging[]; extern const char kEnableWatchdog[]; extern const char kEnableXSSAuditor[]; diff --git a/chrome/common/gpu_messages.h b/chrome/common/gpu_messages.h index 799bc98..f932c99 100644 --- a/chrome/common/gpu_messages.h +++ b/chrome/common/gpu_messages.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/process.h" #include "chrome/common/common_param_traits.h" -#include "chrome/common/gpu_native_window_handle.h" #include "chrome/common/gpu_param_traits.h" #include "gfx/native_widget_types.h" #include "gpu/command_buffer/common/command_buffer.h" diff --git a/chrome/common/gpu_messages_internal.h b/chrome/common/gpu_messages_internal.h index 0b8e3e6..1b51c03 100644 --- a/chrome/common/gpu_messages_internal.h +++ b/chrome/common/gpu_messages_internal.h @@ -47,10 +47,6 @@ IPC_BEGIN_MESSAGES(Gpu) // asynchronously.) Results in a GpuHostMsg_SynchronizeReply. IPC_MESSAGE_CONTROL0(GpuMsg_Synchronize) - IPC_MESSAGE_CONTROL2(GpuMsg_NewRenderWidgetHostView, - GpuNativeWindowHandle, /* parent window */ - int32 /* view_id */) - // Tells the GPU process to create a context for collecting graphics card // information. IPC_MESSAGE_CONTROL0(GpuMsg_CollectGraphicsInfo) @@ -61,45 +57,6 @@ IPC_BEGIN_MESSAGES(Gpu) // Tells the GPU process to hang. IPC_MESSAGE_CONTROL0(GpuMsg_Hang) - // Creates a new backing store. - IPC_MESSAGE_ROUTED2(GpuMsg_NewBackingStore, - int32, /* backing_store_routing_id */ - gfx::Size /* size */) - - // Creates a new video layer. - IPC_MESSAGE_ROUTED2(GpuMsg_NewVideoLayer, - int32, /* video_layer_routing_id */ - gfx::Size /* size */) - - // Updates the backing store with the given bitmap. The GPU process will send - // back a GpuHostMsg_PaintToBackingStore_ACK after the paint is complete to - // let the caller know the TransportDIB can be freed or reused. - IPC_MESSAGE_ROUTED4(GpuMsg_PaintToBackingStore, - base::ProcessId, /* process */ - TransportDIB::Id, /* bitmap */ - gfx::Rect, /* bitmap_rect */ - std::vector<gfx::Rect>) /* copy_rects */ - - - IPC_MESSAGE_ROUTED4(GpuMsg_ScrollBackingStore, - int, /* dx */ - int, /* dy */ - gfx::Rect, /* clip_rect */ - gfx::Size) /* view_size */ - - // Tells the GPU process that the RenderWidgetHost has painted the window. - // Depending on the platform, the accelerated content may need to be painted - // over the top. - IPC_MESSAGE_ROUTED0(GpuMsg_WindowPainted) - - // Updates the video layer with the given YUV data. The GPU process will send - // back a GpuHostMsg_PaintToVideoLayer_ACK after the paint is complete to - // let the caller know the TransportDIB can be freed or reused. - IPC_MESSAGE_ROUTED3(GpuMsg_PaintToVideoLayer, - base::ProcessId, /* process */ - TransportDIB::Id, /* bitmap */ - gfx::Rect) /* bitmap_rect */ - IPC_END_MESSAGES(Gpu) //------------------------------------------------------------------------------ @@ -107,12 +64,6 @@ IPC_END_MESSAGES(Gpu) // These are messages from the GPU process to the browser. IPC_BEGIN_MESSAGES(GpuHost) - // Sent in response to GpuMsg_PaintToBackingStore, see that for more. - IPC_MESSAGE_ROUTED0(GpuHostMsg_PaintToBackingStore_ACK) - - // Sent in response to GpuMsg_PaintToVideoLayer, see that for more. - IPC_MESSAGE_ROUTED0(GpuHostMsg_PaintToVideoLayer_ACK) - // Response to a GpuHostMsg_EstablishChannel message. IPC_MESSAGE_CONTROL2(GpuHostMsg_ChannelEstablished, IPC::ChannelHandle, /* channel_handle */ diff --git a/chrome/common/gpu_native_window_handle.h b/chrome/common/gpu_native_window_handle.h deleted file mode 100644 index cdc89f7..0000000 --- a/chrome/common/gpu_native_window_handle.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_COMMON_GPU_NATIVE_WINDOW_HANDLE_H_ -#define CHROME_COMMON_GPU_NATIVE_WINDOW_HANDLE_H_ -#pragma once - -#include "build/build_config.h" - -// This file defines the window handle type used by the GPU process IPC layer. -// This is different than gfx::NativeWindow[Id] since on X, this is an XID. -// Normally, Chrome deals with either GTK window pointers, or magic window -// IDs that the app generates. The GPU process needs to know the real XID. - -#if defined(OS_WIN) - -#include <windows.h> - -typedef HWND GpuNativeWindowHandle; - -#elif defined(OS_MACOSX) - -// The GPU process isn't supported on Mac yet. Defining this arbitrarily allows -// us to not worry about the integration points not compiling. -typedef int GpuNativeWindowHandle; - -#elif defined(USE_X11) - -// Forward declar XID ourselves to avoid pulling in all of the X headers, which -// can cause compile problems for some parts of the project. -typedef unsigned long XID; - -typedef XID GpuNativeWindowHandle; - -#else - -#error define GpuNativeWindowHandle - -#endif - -#endif // CHROME_COMMON_GPU_NATIVE_WINDOW_HANDLE_H_ diff --git a/chrome/common/gpu_param_traits.h b/chrome/common/gpu_param_traits.h index 59885ea..2aac31a 100644 --- a/chrome/common/gpu_param_traits.h +++ b/chrome/common/gpu_param_traits.h @@ -12,7 +12,6 @@ #include "chrome/common/dx_diag_node.h" #include "chrome/common/gpu_create_command_buffer_config.h" #include "chrome/common/gpu_info.h" -#include "chrome/common/gpu_native_window_handle.h" #include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 6c15dd4..fb68afa 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -23,7 +23,6 @@ #include "chrome/common/translate_errors.h" #include "chrome/common/view_types.h" #include "chrome/common/webkit_param_traits.h" -#include "gfx/native_widget_types.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_platform_file.h" // ifdefed typedef. #include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index a7fbf65..2c5ca31 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -203,12 +203,6 @@ IPC_BEGIN_MESSAGES(View) // This signals the render view that it can send another UpdateRect message. IPC_MESSAGE_ROUTED0(ViewMsg_UpdateRect_ACK) - // Replies to creating and updating videos. - IPC_MESSAGE_ROUTED1(ViewMsg_CreateVideo_ACK, - int32 /* video_id */) - IPC_MESSAGE_ROUTED1(ViewMsg_UpdateVideo_ACK, - int32 /* video_id */) - // Message payload includes: // 1. A blob that should be cast to WebInputEvent // 2. An optional boolean value indicating if a RawKeyDown event is associated @@ -1315,14 +1309,6 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_MESSAGE_ROUTED1(ViewHostMsg_UpdateRect, ViewHostMsg_UpdateRect_Params) - // Sent to create, update and destroy video layers. - IPC_MESSAGE_ROUTED1(ViewHostMsg_CreateVideo, - gfx::Size /* size */) - IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateVideo, - TransportDIB::Id /* bitmap */, - gfx::Rect /* bitmap_rect */) - IPC_MESSAGE_ROUTED0(ViewHostMsg_DestroyVideo) - // Sent by the renderer when GPU compositing is enabled or disabled to notify // the browser whether or not is should do paiting. IPC_MESSAGE_ROUTED1(ViewHostMsg_GpuRenderingActivated, |