summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/gpu_process_host.cc34
-rw-r--r--chrome/browser/gpu_process_host.h2
-rw-r--r--gfx/gtk_native_view_id_manager.cc124
-rw-r--r--gfx/gtk_native_view_id_manager.h26
4 files changed, 170 insertions, 16 deletions
diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc
index f4c6164..8e2242e 100644
--- a/chrome/browser/gpu_process_host.cc
+++ b/chrome/browser/gpu_process_host.cc
@@ -177,7 +177,7 @@ void GpuProcessHost::OnControlMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
OnGraphicsInfoCollected)
#if defined(OS_LINUX)
- IPC_MESSAGE_HANDLER(GpuHostMsg_GetViewXID, OnGetViewXID)
+ IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_GetViewXID, OnGetViewXID)
#elif defined(OS_MACOSX)
IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSetIOSurface,
OnAcceleratedSurfaceSetIOSurface)
@@ -210,12 +210,38 @@ void GpuProcessHost::OnGraphicsInfoCollected(const GPUInfo& gpu_info) {
}
#if defined(OS_LINUX)
-void GpuProcessHost::OnGetViewXID(gfx::NativeViewId id, unsigned long* xid) {
+
+namespace {
+
+void SendDelayedReply(IPC::Message* reply_msg) {
+ GpuProcessHost::Get()->Send(reply_msg);
+}
+
+void GetViewXIDDispatcher(gfx::NativeViewId id, IPC::Message* reply_msg) {
+ unsigned long xid;
+
GtkNativeViewManager* manager = Singleton<GtkNativeViewManager>::get();
- if (!manager->GetXIDForId(xid, id)) {
+ if (!manager->GetPermanentXIDForId(&xid, id)) {
DLOG(ERROR) << "Can't find XID for view id " << id;
- *xid = 0;
+ xid = 0;
}
+
+ GpuHostMsg_GetViewXID::WriteReplyParams(reply_msg, xid);
+
+ // Have to reply from IO thread.
+ ChromeThread::PostTask(
+ ChromeThread::IO, FROM_HERE,
+ NewRunnableFunction(&SendDelayedReply, reply_msg));
+}
+
+}
+
+void GpuProcessHost::OnGetViewXID(gfx::NativeViewId id,
+ IPC::Message *reply_msg) {
+ // Have to request a permanent overlay from UI thread.
+ ChromeThread::PostTask(
+ ChromeThread::UI, FROM_HERE,
+ NewRunnableFunction(&GetViewXIDDispatcher, id, reply_msg));
}
#elif defined(OS_MACOSX)
diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h
index e4d4559..a5268ba 100644
--- a/chrome/browser/gpu_process_host.h
+++ b/chrome/browser/gpu_process_host.h
@@ -95,7 +95,7 @@ class GpuProcessHost : public BrowserChildProcessHost {
void OnSynchronizeReply();
void OnGraphicsInfoCollected(const GPUInfo& gpu_info);
#if defined(OS_LINUX)
- void OnGetViewXID(gfx::NativeViewId id, unsigned long* xid);
+ void OnGetViewXID(gfx::NativeViewId id, IPC::Message* reply_msg);
#elif defined(OS_MACOSX)
void OnAcceleratedSurfaceSetIOSurface(
const GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params& params);
diff --git a/gfx/gtk_native_view_id_manager.cc b/gfx/gtk_native_view_id_manager.cc
index 0cb96df..680ec13 100644
--- a/gfx/gtk_native_view_id_manager.cc
+++ b/gfx/gtk_native_view_id_manager.cc
@@ -4,31 +4,87 @@
#include "gfx/gtk_native_view_id_manager.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
+#include <X11/Xlib.h>
+
#include "base/logging.h"
#include "base/rand_util.h"
#include "gfx/rect.h"
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
// -----------------------------------------------------------------------------
// Bounce functions for GTK to callback into a C++ object...
+namespace {
-static void OnRealize(gfx::NativeView widget, void* arg) {
+void OnRealize(gfx::NativeView widget, void* arg) {
GtkNativeViewManager* manager = reinterpret_cast<GtkNativeViewManager*>(arg);
manager->OnRealize(widget);
}
-static void OnUnrealize(gfx::NativeView widget, void *arg) {
+void OnUnrealize(gfx::NativeView widget, void *arg) {
GtkNativeViewManager* manager = reinterpret_cast<GtkNativeViewManager*>(arg);
manager->OnUnrealize(widget);
}
-static void OnDestroy(GtkObject* obj, void* arg) {
+void OnDestroy(GtkObject* obj, void* arg) {
GtkNativeViewManager* manager = reinterpret_cast<GtkNativeViewManager*>(arg);
manager->OnDestroy(reinterpret_cast<GtkWidget*>(obj));
}
+void OnSizeAllocate(gfx::NativeView widget,
+ GtkAllocation* alloc,
+ void* arg) {
+ GtkNativeViewManager* manager = reinterpret_cast<GtkNativeViewManager*>(arg);
+ manager->OnSizeAllocate(widget, alloc);
+}
+
+XID CreateOverlay(XID underlying) {
+ XID overlay = 0;
+ Display* dpy = gdk_x11_get_default_xdisplay();
+
+ // Prevent interference with reparenting/mapping of overlay
+ XSetWindowAttributes attr;
+ attr.override_redirect = True;
+
+ if (underlying) {
+ XID root;
+ int x, y;
+ unsigned int width, height;
+ unsigned int border_width;
+ unsigned int depth;
+ XGetGeometry(
+ dpy, underlying, &root, &x, &y,
+ &width, &height, &border_width, &depth);
+ overlay = XCreateWindow(
+ dpy, // display
+ underlying, // parent
+ 0, 0, width, height, // x, y, width, height
+ 0, // border width
+ CopyFromParent, // depth
+ InputOutput, // class
+ CopyFromParent, // visual
+ CWOverrideRedirect, // value mask
+ &attr); // value attributes
+ XMapWindow(dpy, overlay);
+ } else {
+ overlay = XCreateWindow(
+ dpy, // display
+ gdk_x11_get_default_root_xwindow(), // parent
+ 0, 0, 1, 1, // x, y, width, height
+ 0, // border width
+ CopyFromParent, // depth
+ InputOutput, // class
+ CopyFromParent, // visual
+ CWOverrideRedirect, // value mask
+ &attr); // value attributes
+ }
+ XSync(dpy, False);
+ return overlay;
+}
+
+}
+
// -----------------------------------------------------------------------------
@@ -65,13 +121,14 @@ gfx::NativeViewId GtkNativeViewManager::GetIdForWidget(gfx::NativeView widget) {
CHECK(gdk_window);
info.x_window_id = GDK_WINDOW_XID(gdk_window);
}
-
native_view_to_id_[widget] = new_id;
id_to_info_[new_id] = info;
g_signal_connect(widget, "realize", G_CALLBACK(::OnRealize), this);
g_signal_connect(widget, "unrealize", G_CALLBACK(::OnUnrealize), this);
g_signal_connect(widget, "destroy", G_CALLBACK(::OnDestroy), this);
+ g_signal_connect(
+ widget, "size-allocate", G_CALLBACK(::OnSizeAllocate), this);
return new_id;
}
@@ -89,6 +146,24 @@ bool GtkNativeViewManager::GetXIDForId(XID* output, gfx::NativeViewId id) {
return true;
}
+bool GtkNativeViewManager::GetPermanentXIDForId(XID* output,
+ gfx::NativeViewId id) {
+ AutoLock locked(lock_);
+
+ std::map<gfx::NativeViewId, NativeViewInfo>::iterator i =
+ id_to_info_.find(id);
+
+ if (i == id_to_info_.end())
+ return false;
+
+ if (!i->second.permanent_window_id) {
+ i->second.permanent_window_id = CreateOverlay(i->second.x_window_id);
+ }
+
+ *output = i->second.permanent_window_id;
+ return true;
+}
+
// -----------------------------------------------------------------------------
@@ -116,6 +191,14 @@ void GtkNativeViewManager::OnRealize(gfx::NativeView widget) {
CHECK(widget->window);
i->second.x_window_id = GDK_WINDOW_XID(widget->window);
+
+ if (i->second.permanent_window_id) {
+ Display* dpy = gdk_x11_get_default_xdisplay();
+ XReparentWindow(
+ dpy, i->second.permanent_window_id, i->second.x_window_id, 0, 0);
+ XMapWindow(dpy, i->second.permanent_window_id);
+ XSync(dpy, False);
+ }
}
void GtkNativeViewManager::OnUnrealize(gfx::NativeView widget) {
@@ -129,6 +212,13 @@ void GtkNativeViewManager::OnUnrealize(gfx::NativeView widget) {
CHECK(i != id_to_info_.end());
i->second.x_window_id = 0;
+ if (i->second.permanent_window_id) {
+ Display* dpy = gdk_x11_get_default_xdisplay();
+ XUnmapWindow(dpy, i->second.permanent_window_id);
+ XReparentWindow(dpy, i->second.permanent_window_id,
+ gdk_x11_get_default_root_xwindow(), 0, 0);
+ XSync(dpy, False);
+ }
}
void GtkNativeViewManager::OnDestroy(gfx::NativeView widget) {
@@ -142,8 +232,28 @@ void GtkNativeViewManager::OnDestroy(gfx::NativeView widget) {
id_to_info_.find(i->second);
CHECK(j != id_to_info_.end());
+ if (j->second.permanent_window_id) {
+ XDestroyWindow(gdk_x11_get_default_xdisplay(),
+ j->second.permanent_window_id);
+ }
+
native_view_to_id_.erase(i);
id_to_info_.erase(j);
}
+void GtkNativeViewManager::OnSizeAllocate(
+ gfx::NativeView widget, GtkAllocation *alloc) {
+ AutoLock locked(lock_);
+
+ const gfx::NativeViewId id = GetWidgetId(widget);
+ std::map<gfx::NativeViewId, NativeViewInfo>::iterator i =
+ id_to_info_.find(id);
+
+ if (i->second.permanent_window_id) {
+ XResizeWindow(gdk_x11_get_default_xdisplay(),
+ i->second.permanent_window_id,
+ alloc->width, alloc->height);
+ }
+}
+
// -----------------------------------------------------------------------------
diff --git a/gfx/gtk_native_view_id_manager.h b/gfx/gtk_native_view_id_manager.h
index 0a90e2f..439d843 100644
--- a/gfx/gtk_native_view_id_manager.h
+++ b/gfx/gtk_native_view_id_manager.h
@@ -6,6 +6,7 @@
#define GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
#pragma once
+#include <gtk/gtk.h>
#include <map>
#include "base/singleton.h"
@@ -59,10 +60,27 @@ class GtkNativeViewManager {
// |*xid| is set to 0.
bool GetXIDForId(XID* xid, gfx::NativeViewId id);
+ // Generate an XID that doesn't change.
+ //
+ // The GPU process assumes that the XID associated with a GL context
+ // does not change. To maintain this invariant we create and overlay
+ // whose XID is static. This requires reparenting as the underlying
+ // window comes and goes. It incurs a bit of overhead, so a permanent
+ // XID must be requested.
+ //
+ // Must be called from the UI thread so that the widget that we
+ // overlay does not change while we construct the overlay.
+ //
+ // xid: (output) the resulting X window
+ // id: a value previously returned from GetIdForWidget
+ // returns: true if |id| is a valid id, false otherwise.
+ bool GetPermanentXIDForId(XID* xid, gfx::NativeViewId id);
+
// These are actually private functions, but need to be called from statics.
void OnRealize(gfx::NativeView widget);
void OnUnrealize(gfx::NativeView widget);
void OnDestroy(gfx::NativeView widget);
+ void OnSizeAllocate(gfx::NativeView widget, GtkAllocation *alloc);
Lock& unrealize_lock() { return unrealize_lock_; }
@@ -73,11 +91,11 @@ class GtkNativeViewManager {
friend struct DefaultSingletonTraits<GtkNativeViewManager>;
struct NativeViewInfo {
- NativeViewInfo()
- : x_window_id(0) {
- }
-
+ NativeViewInfo() : x_window_id(0), permanent_window_id(0) { }
+ // XID associated with GTK widget.
XID x_window_id;
+ // Permanent overlay (0 if not requested yet).
+ XID permanent_window_id;
};
gfx::NativeViewId GetWidgetId(gfx::NativeView id);
generated by cgit v1.1 at 2025-02-10 18:22:50 +0000