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

Unified Diff: chrome/gpu/gpu_thread.cc

Issue 4399003: Deleted code associated with --enable-gpu-rendering and... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/gpu/gpu_thread.h ('k') | chrome/gpu/gpu_video_layer_glx.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_thread.cc
===================================================================
--- chrome/gpu/gpu_thread.cc (revision 65168)
+++ chrome/gpu/gpu_thread.cc (working copy)
@@ -17,31 +17,19 @@
#include "chrome/gpu/gpu_info_collector.h"
#include "ipc/ipc_channel_handle.h"
-#if defined(OS_WIN)
-#include "chrome/gpu/gpu_view_win.h"
-#elif defined(GPU_USE_GLX)
-#include "chrome/gpu/gpu_backing_store_glx_context.h"
-#include "chrome/gpu/gpu_view_x.h"
-
-#include <X11/Xutil.h> // Must be last.
-#endif
-
#if defined(OS_LINUX)
#include "app/x11_util.h"
#include <gtk/gtk.h>
#endif
GpuThread::GpuThread() {
-#if defined(GPU_USE_GLX)
- display_ = ::XOpenDisplay(NULL);
-#endif
#if defined(OS_LINUX)
{
// The X11 port of the command buffer code assumes it can access the X
// display via the macro GDK_DISPLAY(), which implies that Gtk has been
// initialized. This code was taken from PluginThread. TODO(kbr):
// rethink whether initializing Gtk is really necessary or whether we
- // should just send the display connection down to the GPUProcessor.
+ // should just send a raw display connection down to the GPUProcessor.
g_thread_init(NULL);
const std::vector<std::string>& args =
CommandLine::ForCurrentProcess()->argv();
@@ -67,14 +55,6 @@
GpuThread::~GpuThread() {
}
-#if defined(GPU_USE_GLX)
-GpuBackingStoreGLXContext* GpuThread::GetGLXContext() {
- if (!glx_context_.get())
- glx_context_.reset(new GpuBackingStoreGLXContext(this));
- return glx_context_.get();
-}
-#endif
-
void GpuThread::RemoveChannel(int renderer_id) {
gpu_channels_.erase(renderer_id);
}
@@ -86,8 +66,6 @@
OnEstablishChannel)
IPC_MESSAGE_HANDLER(GpuMsg_Synchronize,
OnSynchronize)
- IPC_MESSAGE_HANDLER(GpuMsg_NewRenderWidgetHostView,
- OnNewRenderWidgetHostView)
IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo,
OnCollectGraphicsInfo)
IPC_MESSAGE_HANDLER(GpuMsg_Crash,
@@ -142,20 +120,6 @@
Send(new GpuHostMsg_SynchronizeReply());
}
-void GpuThread::OnNewRenderWidgetHostView(GpuNativeWindowHandle parent_window,
- int32 routing_id) {
- // The GPUView class' lifetime is controlled by the host, which will send a
- // message to destroy the GpuRWHView when necessary. So we don't manage the
- // lifetime of this object.
-#if defined(OS_WIN)
- new GpuViewWin(this, parent_window, routing_id);
-#elif defined(GPU_USE_GLX)
- new GpuViewX(this, parent_window, routing_id);
-#else
- NOTIMPLEMENTED();
-#endif
-}
-
void GpuThread::OnCollectGraphicsInfo() {
// Fail to establish a channel if some implementation of GL cannot be
// initialized.
« no previous file with comments | « chrome/gpu/gpu_thread.h ('k') | chrome/gpu/gpu_video_layer_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698