mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
4e6138a54f
- remove PM alertTime custom (911dd825ec) - Bug 1208346 - Alert service Do Not Disturb backend. r=jaws (0047051b4e) - Bug 1208346 - Fix manualDoNotDisturb build bustage on Android. r=bustage (39275a49bd) - Add some shadow warnings back (64eb2adf55) - some window fixes by Roy (72e6a9b98e) - remove parameter of DoesD3D11DeviceWork (243dfb24f4) - Bug 1197296. Check the error code of Map. r=bas (9debd274fd) - Bug 1221348 - Part 1: Unify crash signatures. r=jrmuizel (80763d326d) - Bug 1221348 - Part 2: Fix texture sharing detection code on Intel. r=jrmuizel (fb0390850d) - Bug 1097321 - Add layers.amd-switchable-gfx.enabled pref. r=jrmuizel (3963a35cbc) - Bug 720589 - mMatchCounts may be accessed with a nonexisting index. r=neil (fdbdd7e228) - Bug 1224975 - add telemetry for font loading. r=m_kato (013a6e8fc7) - Bug 1188376: Split Hello Telemetry values from general WebRTC r=jib (3887cc3201) - Bug 1198883 - Part 1: Improve ICE candidates telemetry probes. r=bwc (2d02a3d752) - Bug 1198883 - Part 2: Added WebRTC ICE candidates to Telemetry. r+vladan (fa8032043f) - Bug 1201926 - Add support for keyed histograms to Fennec's Telemetry module, r=nalexander (8b96ebf026) - Bug 1213780 - Fix Telemetry reporting repeated hang annotations for Chrome hangs. r=aklotz (afde812b08) - Bug 1128768: Part 4 - Update telemetry to serialize BHR hang annotations; r=gfritzsche (7c1b8f5fa5) - Bug 1215540 - Fix Telemetry reporting repeated hang annotations for Thread hangs. r=aklotz (afed35f06f) - Bug 896740 - Limit the number of chrome-hangs reported to Telemetry. r=vladan (a37ba72225) - missing bits of Bug 932865 - Expose thread hang stats (c19c41ae06) - Bug 1187138 (part 1) - Replace nsBaseHashtable::Enumerate() calls in toolkit/ with iterators. r=froydnj. (ba92a8464f) - Bug 1121040 - Don't send RETURN keypresses to content while a satchel autocomplete entry is selected. r=Gijs,smaug (762efd7cc8) - Bug 1145146 - Remove offensive comment from nsFormFillController r=mak (7a6b0eb4e1) - Bug 1136085 - Part 1 - Don't store & collect subsession histograms on mobile. r=vladan (911084001c) - missing bits of Bug 1023461 - Add HangStack class to support internal string buffer; r=vladan (599bee2150) - Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp (ff8a632975) - fix misspatch of 1157282 and 1198883 (9a216ab188) - Bug 1034138 - a. Get native stack for permahangs in BHM; r=snorp (772970d0e0) - Bug 1211411 - Limit the number of thread hang stats reported to Telemetry. r=vladan (fd72bc8b62) - Bug 1219751 - Change the the depth limit of the thread hangs stack to use the 99th percentile. r=gfritzsche (fc59bd7598) - Bug 1133521 - Enable BHR on Beta. r=vladan (2501c6a0ff) - Bug 1219216 - Fix a wrong comment in BackgroundHangMonitor.h. r=gfritzsche (e974320361) - bits of Bug 1134279 - Change Telemetry data producers to use the correct (d00e84b7f3) - bits of Bug 977026 - Part 2: B2G loader (bf1208a73a) - bug 1198450 - Firefox fails to load about:home if Firefox was installed to a folder with non-Latin name r=jimm (c4df06a69e) - Bug 1222167 - fix initialization order in GeckoChildProcessHost; r=jld (6bad274479) - Bug 1141693 - Build and use a PIE plugin-container on Android 5.0+. Based on a patch by Mike Hommey. r=me,glandium (78dc877aec) - Bug 1187533 - Change how Gtk+2 plugin-container is started on Gtk+3 builds. r=billm (93c2b8a1b0) - Bug 1063359 - Unconditionally use -Wl,--no-as-needed when building with GNU ld/gold. r=mshal (643e92ca49) - Bug 971811 - Don't prepend an empty existing DYLD_INSERT_LIBRARIES path when launching the plugin. r=smichaud (c72df0073c) - Bug 1189352: Fix NSPR_LOG_FILE with absolute paths for sandboxed child on Windows. r=bbondy (f4bb51c123) - Bug 1189967 - Be slightly more explicit about some conversions to std::wstring. r=nfroyd (7bec611359) - Bug 1201438: Add non-sandboxed Windows content processes as target peers for handle duplication. r=bbondy (1ca7f499e9) - Bug 1201438 - Fixup for builds with disabled sandbox. (de125d156e) - Bug 1165895: Add NPAPI sandbox rule for the crash server pipe and x64 Temp dir write access. r=bbondy (e9f601912d) - Bug 1202988 - Don't use GetTempPath for flash's mms.cfg hack for low integrity. r=aklotz (b4a0d7f856) - Bug 1225023: Allow Flash Player to create Adobe\Flash Player and Macromedia\Flash Player directories. r=bbondy (c5120afc1d) - Bug 1218681 - add plugin-container standalone process code. The Code associate with ARCH. r=hev (03dfb21776) - bug 1130976 - Flash context menu causes CPOW deadlock with AdBlock Plus, plugins should spin even loop in content process instead of the chrome process r=billm (52f4d33633) - Bug 1157237: Move invocation of async NPP_New to an async task; r=jimm (7b6c1a577e) - Bug 1175147 - Don't do threadsafety asserts for NPN_MemAlloc and friends, r=jimm (b4ce5b33ce) - fix strange misspatch (8a96a61819) - Bug 1219244 - use UniquePtr instead of nsAutoArrayPtr in dom/plugins/; r=aklotz (19fabc55b5) - Bug 1155503: BrowserStreamParent should null out its NPStream pointer and we should check for it; r=jimm (eddb82b8b4) - some crashrep stuff (bb2b046090) - Bug 1192077 - Convert AndroidBridge JNIEnv calls; r=esawin (821453089e) - Bug 554171 - Add plugin thread checks to functions that must only be called on the main thread. r=jimm (f2eb3822da) - Bug 1149358: Ensure that plugin streams are not manipulated by PluginAsyncSurrogate if plugin destruction is imminent; r=jimm (6dd99c94ee) - Bug 1198302 - Ensure that PluginAsyncSurrogate::NotifyAsyncInitFailed properly aborts any PluginAsyncSurrogate::WaitForInit calls. r=jimm (23c1fbfcfe) - Bug 1201239 - Add a proper null check in PluginAsyncSurrogate::NotifyAsyncInitFailed; r=jimm (5d8ff9f8aa) - Bug 1208059: Make nsNPAPIPluginInstance support WeakPtr and modify PluginAsyncSurrogate to use it; r=jimm (174a3166b1) - Bug 1171453: Make ParentNPObjects aware of AsyncNPObject wrappers; r=jimm (92e608831d) - Bug 1217726 - Fix -Wimplicit-fallthrough warnings in dom/plugins. r=jimm (32db26ede8) - Bug 1167720 - Fix invalid window ID provided to GTK3 plugin container children. r=karlt (d8c2de0c19) - Remove Windows-specific synchronous plugin drawing code. (bug 1218688 part 1, r=jimm) (5e4b60ea33) - Remove Linux-specific synchronous plugin drawing code. (bug 1218688 part 2, r=jimm) (edb29f27b8) - Remove Mac-specific synchronous plugin drawing code. (bug 1218688 part 3, r=benwa) (acc6b57b23) - Assert that we do not attempt synchronous painting of windowless Desktop plugins. (bug 1218688 part 4, r=bsmedberg) (c34094b038) - Bug 1195472 - Call Show after Enable on puppet widgets to avoid an assertion when running crash tests. r=aklotz (405ed2c1d1) - Add explicit keyword to AsyncScrollBase constructor to fix static analysis build (bug 1139220 part 6, r=shu) (4cc37b9a3b) - Bug 1146561 - Add back the visibility check for Mac plugins. r=jmuizelaar (91a4a5a8e9) - namespace (9b4919f8fa) - Bug 1217307 - Remove some unnecessary null checks in rest of dom/. r=njn (de5d69880a) - Bug 1225137 - Avoid crash on some platforms if scrollbar fading is enabled and the duration is set to zero. r=spohl (a16954de2f) - Bug 1114554 - Disable NotificationStorage debug logging. r=dholbert (c2722fa4ed) - Bug 1073551 - fix doorhangers to not steal focus unless explicitly opened using mouse or keyboard, r=jaws (be6109cf6d) - Bug 1169629: Add-on install confirmation notification appears anchored to older dismissed anchors. r=dao (684535c7cc) - Bug 1194706: make sure that the notification icons and doorhangers are shown in undocked chat windows too. r=Mossop (68e0ced913) - Bug 1207089 - Telemetry for permission notifications. r=MattN,vladan (ff421236ea) - Bug 1215526 - part 4 - make preprocess-tab-svgs.py report extra dependencies; r=glandium (98b64b5c45)
327 lines
10 KiB
C++
327 lines
10 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:expandtab:shiftwidth=2:tabstop=2:
|
|
*/
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/**
|
|
* This file is the Gtk2 implementation of plugin native window.
|
|
*/
|
|
|
|
#include "nsDebug.h"
|
|
#include "nsPluginNativeWindowGtk.h"
|
|
#include "nsNPAPIPlugin.h"
|
|
#include "npapi.h"
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
#include <gdk/gdk.h>
|
|
|
|
#if (GTK_MAJOR_VERSION == 3)
|
|
#include <gtk/gtkx.h>
|
|
#else
|
|
#include "gtk2xtbin.h"
|
|
#endif
|
|
#include "mozilla/X11Util.h"
|
|
|
|
static gboolean plug_removed_cb (GtkWidget *widget, gpointer data);
|
|
static void socket_unrealize_cb (GtkWidget *widget, gpointer data);
|
|
|
|
nsPluginNativeWindowGtk::nsPluginNativeWindowGtk() : nsPluginNativeWindow()
|
|
{
|
|
// initialize the struct fields
|
|
window = nullptr;
|
|
x = 0;
|
|
y = 0;
|
|
width = 0;
|
|
height = 0;
|
|
memset(&clipRect, 0, sizeof(clipRect));
|
|
ws_info = &mWsInfo;
|
|
type = NPWindowTypeWindow;
|
|
mSocketWidget = 0;
|
|
mWsInfo.type = 0;
|
|
mWsInfo.display = nullptr;
|
|
mWsInfo.visual = nullptr;
|
|
mWsInfo.colormap = 0;
|
|
mWsInfo.depth = 0;
|
|
}
|
|
|
|
nsPluginNativeWindowGtk::~nsPluginNativeWindowGtk()
|
|
{
|
|
if(mSocketWidget) {
|
|
gtk_widget_destroy(mSocketWidget);
|
|
}
|
|
}
|
|
|
|
nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
|
|
*aPluginNativeWindow = new nsPluginNativeWindowGtk();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult PLUG_DeletePluginNativeWindow(nsPluginNativeWindow * aPluginNativeWindow)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
|
|
nsPluginNativeWindowGtk *p = (nsPluginNativeWindowGtk *)aPluginNativeWindow;
|
|
delete p;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsPluginNativeWindowGtk::CallSetWindow(RefPtr<nsNPAPIPluginInstance> &aPluginInstance)
|
|
{
|
|
if (aPluginInstance) {
|
|
if (type == NPWindowTypeWindow &&
|
|
XRE_IsContentProcess()) {
|
|
// In this case, most of the initialization code here has already happened
|
|
// in the chrome process. The window we have in content is the XID of the
|
|
// socket widget we need to hand to plugins.
|
|
SetWindow((XID)window);
|
|
} else if (type == NPWindowTypeWindow) {
|
|
if (!mSocketWidget) {
|
|
nsresult rv;
|
|
|
|
// The documentation on the types for many variables in NP(N|P)_GetValue
|
|
// is vague. Often boolean values are NPBool (1 byte), but
|
|
// https://developer.mozilla.org/en/XEmbed_Extension_for_Mozilla_Plugins
|
|
// treats NPPVpluginNeedsXEmbed as PRBool (int), and
|
|
// on x86/32-bit, flash stores to this using |movl 0x1,&needsXEmbed|.
|
|
// thus we can't use NPBool for needsXEmbed, or the three bytes above
|
|
// it on the stack would get clobbered. so protect with the larger bool.
|
|
int needsXEmbed = 0;
|
|
rv = aPluginInstance->GetValueFromPlugin(NPPVpluginNeedsXEmbed, &needsXEmbed);
|
|
// If the call returned an error code make sure we still use our default value.
|
|
if (NS_FAILED(rv)) {
|
|
needsXEmbed = 0;
|
|
}
|
|
#ifdef DEBUG
|
|
printf("nsPluginNativeWindowGtk: NPPVpluginNeedsXEmbed=%d\n", needsXEmbed);
|
|
#endif
|
|
|
|
bool isOOPPlugin = aPluginInstance->GetPlugin()->GetLibrary()->IsOOP();
|
|
if (needsXEmbed || isOOPPlugin) {
|
|
bool enableXtFocus = !needsXEmbed;
|
|
rv = CreateXEmbedWindow(enableXtFocus);
|
|
}
|
|
else {
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
rv = CreateXtWindow();
|
|
#else
|
|
return NS_ERROR_FAILURE;
|
|
#endif
|
|
}
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
if (!mSocketWidget) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Make sure to resize and re-place the window if required.
|
|
SetAllocation();
|
|
// Need to reset "window" each time as nsPluginFrame::DidReflow sets it
|
|
// to the ancestor window.
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
if (GTK_IS_XTBIN(mSocketWidget)) {
|
|
// Point the NPWindow structures window to the actual X window
|
|
SetWindow(GTK_XTBIN(mSocketWidget)->xtwindow);
|
|
}
|
|
else { // XEmbed or OOP&Xt
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
}
|
|
#else
|
|
// Gtk3 supports only OOP by GtkSocket
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
#endif
|
|
|
|
#ifdef DEBUG
|
|
printf("nsPluginNativeWindowGtk: call SetWindow with xid=%p\n", (void *)window);
|
|
#endif
|
|
} // NPWindowTypeWindow
|
|
aPluginInstance->SetWindow(this);
|
|
} else if (mPluginInstance) {
|
|
mPluginInstance->SetWindow(nullptr);
|
|
}
|
|
|
|
SetPluginInstance(aPluginInstance);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsPluginNativeWindowGtk::CreateXEmbedWindow(bool aEnableXtFocus) {
|
|
NS_ASSERTION(!mSocketWidget,"Already created a socket widget!");
|
|
GdkDisplay *display = gdk_display_get_default();
|
|
GdkWindow *parent_win = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
mSocketWidget = gtk_socket_new();
|
|
|
|
//attach the socket to the container widget
|
|
gtk_widget_set_parent_window(mSocketWidget, parent_win);
|
|
|
|
// enable/disable focus event handlers,
|
|
// see plugin_window_filter_func() for details
|
|
g_object_set_data(G_OBJECT(mSocketWidget), "enable-xt-focus", (void *)aEnableXtFocus);
|
|
|
|
// Make sure to handle the plug_removed signal. If we don't the
|
|
// socket will automatically be destroyed when the plug is
|
|
// removed, which means we're destroying it more than once.
|
|
// SYNTAX ERROR.
|
|
g_signal_connect(mSocketWidget, "plug_removed",
|
|
G_CALLBACK(plug_removed_cb), nullptr);
|
|
|
|
g_signal_connect(mSocketWidget, "unrealize",
|
|
G_CALLBACK(socket_unrealize_cb), nullptr);
|
|
|
|
g_signal_connect(mSocketWidget, "destroy",
|
|
G_CALLBACK(gtk_widget_destroyed), &mSocketWidget);
|
|
|
|
gpointer user_data = nullptr;
|
|
gdk_window_get_user_data(parent_win, &user_data);
|
|
|
|
GtkContainer *container = GTK_CONTAINER(user_data);
|
|
gtk_container_add(container, mSocketWidget);
|
|
gtk_widget_realize(mSocketWidget);
|
|
|
|
// The GtkSocket has a visible window, but the plugin's XEmbed plug will
|
|
// cover this window. Normally GtkSockets let the X server paint their
|
|
// background and this would happen immediately (before the plug is
|
|
// created). Setting the background to None prevents the server from
|
|
// painting this window, avoiding flicker.
|
|
// TODO GTK3
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
gdk_window_set_back_pixmap(gtk_widget_get_window(mSocketWidget), nullptr, FALSE);
|
|
#endif
|
|
|
|
// Resize before we show
|
|
SetAllocation();
|
|
|
|
gtk_widget_show(mSocketWidget);
|
|
|
|
gdk_flush();
|
|
SetWindow(gtk_socket_get_id(GTK_SOCKET(mSocketWidget)));
|
|
|
|
// Fill out the ws_info structure.
|
|
// (The windowless case is done in nsPluginFrame.cpp.)
|
|
GdkWindow *gdkWindow = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
if(!gdkWindow)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
mWsInfo.display = GDK_WINDOW_XDISPLAY(gdkWindow);
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
mWsInfo.colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(gdkWindow));
|
|
GdkVisual* gdkVisual = gdk_drawable_get_visual(gdkWindow);
|
|
mWsInfo.depth = gdkVisual->depth;
|
|
#else
|
|
mWsInfo.colormap = None;
|
|
GdkVisual* gdkVisual = gdk_window_get_visual(gdkWindow);
|
|
mWsInfo.depth = gdk_visual_get_depth(gdkVisual);
|
|
#endif
|
|
mWsInfo.visual = GDK_VISUAL_XVISUAL(gdkVisual);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsPluginNativeWindowGtk::SetAllocation() {
|
|
if (!mSocketWidget)
|
|
return;
|
|
|
|
GtkAllocation new_allocation;
|
|
new_allocation.x = 0;
|
|
new_allocation.y = 0;
|
|
new_allocation.width = width;
|
|
new_allocation.height = height;
|
|
gtk_widget_size_allocate(mSocketWidget, &new_allocation);
|
|
}
|
|
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
nsresult nsPluginNativeWindowGtk::CreateXtWindow() {
|
|
NS_ASSERTION(!mSocketWidget,"Already created a socket widget!");
|
|
|
|
#ifdef DEBUG
|
|
printf("About to create new xtbin of %i X %i from %p...\n",
|
|
width, height, (void*)window);
|
|
#endif
|
|
GdkDisplay *display = gdk_display_get_default();
|
|
GdkWindow *gdkWindow = gdk_x11_window_lookup_for_display(display, GetWindow());
|
|
mSocketWidget = gtk_xtbin_new(gdkWindow, 0);
|
|
// Check to see if creating the xtbin failed for some reason.
|
|
// if it did, we can't go any further.
|
|
if (!mSocketWidget)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
g_signal_connect(mSocketWidget, "destroy",
|
|
G_CALLBACK(gtk_widget_destroyed), &mSocketWidget);
|
|
|
|
gtk_widget_set_size_request(mSocketWidget, width, height);
|
|
|
|
#ifdef DEBUG
|
|
printf("About to show xtbin(%p)...\n", (void*)mSocketWidget); fflush(nullptr);
|
|
#endif
|
|
gtk_widget_show(mSocketWidget);
|
|
#ifdef DEBUG
|
|
printf("completed gtk_widget_show(%p)\n", (void*)mSocketWidget); fflush(nullptr);
|
|
#endif
|
|
|
|
// Fill out the ws_info structure.
|
|
GtkXtBin* xtbin = GTK_XTBIN(mSocketWidget);
|
|
// The xtbin has its own Display structure.
|
|
mWsInfo.display = xtbin->xtdisplay;
|
|
mWsInfo.colormap = xtbin->xtclient.xtcolormap;
|
|
mWsInfo.visual = xtbin->xtclient.xtvisual;
|
|
mWsInfo.depth = xtbin->xtclient.xtdepth;
|
|
// Leave mWsInfo.type = 0 - Who knows what this is meant to be?
|
|
|
|
XFlush(mWsInfo.display);
|
|
|
|
return NS_OK;
|
|
}
|
|
#endif
|
|
|
|
/* static */
|
|
gboolean
|
|
plug_removed_cb (GtkWidget *widget, gpointer data)
|
|
{
|
|
// Gee, thanks for the info!
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
socket_unrealize_cb(GtkWidget *widget, gpointer data)
|
|
{
|
|
// Unmap and reparent any child windows that GDK does not yet know about.
|
|
// (See bug 540114 comment 10.)
|
|
GdkWindow* socket_window = gtk_widget_get_window(widget);
|
|
GdkDisplay* gdkDisplay = gdk_display_get_default();
|
|
Display* display = GDK_DISPLAY_XDISPLAY(gdkDisplay);
|
|
|
|
// Ignore X errors that may happen if windows get destroyed (possibly
|
|
// requested by the plugin) between XQueryTree and when we operate on them.
|
|
gdk_error_trap_push();
|
|
|
|
Window root, parent;
|
|
Window* children;
|
|
unsigned int nchildren;
|
|
if (!XQueryTree(display, gdk_x11_window_get_xid(socket_window),
|
|
&root, &parent, &children, &nchildren))
|
|
return;
|
|
|
|
for (unsigned int i = 0; i < nchildren; ++i) {
|
|
Window child = children[i];
|
|
if (!gdk_x11_window_lookup_for_display(gdkDisplay, child)) {
|
|
// This window is not known to GDK.
|
|
XUnmapWindow(display, child);
|
|
XReparentWindow(display, child, DefaultRootWindow(display), 0, 0);
|
|
}
|
|
}
|
|
|
|
if (children) XFree(children);
|
|
|
|
mozilla::FinishX(display);
|
|
#if (MOZ_WIDGET_GTK == 3)
|
|
gdk_error_trap_pop_ignored();
|
|
#else
|
|
gdk_error_trap_pop();
|
|
#endif
|
|
}
|