corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 544192 - Qt Xembed version required for IPC browser content embedding. r=bzbarsky,mozbugz

Browse Source
This commit is contained in:
Oleg Romashin
2010-02-04 18:00:52 +02:00
parent 832bd76125
commit fc808a2aae
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
content/base/src/nsFrameLoader.cpp
View File

@@ -99,6 +99,10 @@
#include "nsIDOMChromeWindow.h"
#ifdef MOZ_WIDGET_QT
#include <QtGui/QX11EmbedWidget>
#endif
#ifdef MOZ_WIDGET_GTK2
#include "mozcontainer.h"
@@ -684,6 +688,13 @@ nsFrameLoader::ShowRemoteFrame(nsIFrameFrame* frame, nsIView* view)
gtk_widget_show(mRemoteSocket);
GdkNativeWindow id = gtk_socket_get_id(GTK_SOCKET(mRemoteSocket));
mChildProcess->SendcreateWidget(id);
#elif defined(MOZ_WIDGET_QT)
QWidget* parent_win = static_cast<QWidget*>(w->GetNativeData(NS_NATIVE_WINDOW));
mRemoteSocket = new QX11EmbedContainer(parent_win);
NS_ENSURE_TRUE(mRemoteSocket, false);
mRemoteSocket->show();
mRemoteSocket->resize(size.width, size.height);
mChildProcess->SendcreateWidget(mRemoteSocket->winId());
#elif defined(XP_MACOSX)
# warning IMPLEMENT ME
@@ -1346,6 +1357,9 @@ nsFrameLoader::UpdatePositionAndSize(nsIFrame *aIFrame)
GtkAllocation alloc = {0, 0, size.width, size.height };
gtk_widget_size_allocate(mRemoteSocket, &alloc);
}
#elif defined(MOZ_WIDGET_QT)
if (mRemoteSocket)
mRemoteSocket->resize(size.width, size.height);
#endif
mChildProcess->Move(0, 0, size.width, size.height);