mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 682759: Use fixed size integer in NPRemoteWindow to store window reference. r=m_kato r=cjones

This commit is contained in:
Josh Aas 2011-09-07 00:54:21 -04:00
Родитель 8483b15865
Коммит e1a3d3c8b5
3 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
dom/plugins/ipc/PluginInstanceChild.cpp
Просмотреть файл

@ -985,7 +985,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
#ifdef MOZ_WIDGET_GTK2 #ifdef MOZ_WIDGET_GTK2
if (gtk_check_version(2,18,7) != NULL) { // older if (gtk_check_version(2,18,7) != NULL) { // older
if (aWindow.type == NPWindowTypeWindow) { if (aWindow.type == NPWindowTypeWindow) {
GdkWindow* socket_window = gdk_window_lookup(aWindow.window); GdkWindow* socket_window = gdk_window_lookup(static_cast<GdkNativeWindow>(aWindow.window));
if (socket_window) { if (socket_window) {
// A GdkWindow for the socket already exists. Need to // A GdkWindow for the socket already exists. Need to
// workaround https://bugzilla.gnome.org/show_bug.cgi?id=607061 // workaround https://bugzilla.gnome.org/show_bug.cgi?id=607061
@ -1039,7 +1039,7 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow)
if (!CreatePluginWindow()) if (!CreatePluginWindow())
return false; return false;
ReparentPluginWindow((HWND)aWindow.window); ReparentPluginWindow(reinterpret_cast<HWND>(aWindow.window));
SizePluginWindow(aWindow.width, aWindow.height); SizePluginWindow(aWindow.width, aWindow.height);
mWindow.window = (void*)mPluginWindowHWND; mWindow.window = (void*)mPluginWindowHWND;

6
dom/plugins/ipc/PluginInstanceParent.cpp
Просмотреть файл

@ -604,7 +604,7 @@ PluginInstanceParent::AsyncSetWindow(NPWindow* aWindow)
{ {
NPRemoteWindow window; NPRemoteWindow window;
mWindowType = aWindow->type; mWindowType = aWindow->type;
window.window = reinterpret_cast<uintptr_t>(aWindow->window); window.window = reinterpret_cast<uint64_t>(aWindow->window);
window.x = aWindow->x; window.x = aWindow->x;
window.y = aWindow->y; window.y = aWindow->y;
window.width = aWindow->width; window.width = aWindow->width;
@ -911,7 +911,7 @@ PluginInstanceParent::NPP_SetWindow(const NPWindow* aWindow)
else { else {
SubclassPluginWindow(reinterpret_cast<HWND>(aWindow->window)); SubclassPluginWindow(reinterpret_cast<HWND>(aWindow->window));
window.window = reinterpret_cast<uintptr_t>(aWindow->window); window.window = reinterpret_cast<uint64_t>(aWindow->window);
window.x = aWindow->x; window.x = aWindow->x;
window.y = aWindow->y; window.y = aWindow->y;
window.width = aWindow->width; window.width = aWindow->width;
@ -919,7 +919,7 @@ PluginInstanceParent::NPP_SetWindow(const NPWindow* aWindow)
window.type = aWindow->type; window.type = aWindow->type;
} }
#else #else
window.window = reinterpret_cast<unsigned long>(aWindow->window); window.window = reinterpret_cast<uint64_t>(aWindow->window);
window.x = aWindow->x; window.x = aWindow->x;
window.y = aWindow->y; window.y = aWindow->y;
window.width = aWindow->width; window.width = aWindow->width;

8
dom/plugins/ipc/PluginMessageUtils.h
Просмотреть файл

@ -110,7 +110,7 @@ typedef nsCString Buffer;
struct NPRemoteWindow struct NPRemoteWindow
{ {
unsigned long window; uint64_t window;
int32_t x; int32_t x;
int32_t y; int32_t y;
uint32_t width; uint32_t width;
@ -363,7 +363,7 @@ struct ParamTraits<mozilla::plugins::NPRemoteWindow>
static void Write(Message* aMsg, const paramType& aParam) static void Write(Message* aMsg, const paramType& aParam)
{ {
aMsg->WriteULong(aParam.window); aMsg->WriteUInt64(aParam.window);
WriteParam(aMsg, aParam.x); WriteParam(aMsg, aParam.x);
WriteParam(aMsg, aParam.y); WriteParam(aMsg, aParam.y);
WriteParam(aMsg, aParam.width); WriteParam(aMsg, aParam.width);
@ -381,12 +381,12 @@ struct ParamTraits<mozilla::plugins::NPRemoteWindow>
static bool Read(const Message* aMsg, void** aIter, paramType* aResult) static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{ {
unsigned long window; uint64_t window;
int32_t x, y; int32_t x, y;
uint32_t width, height; uint32_t width, height;
NPRect clipRect; NPRect clipRect;
NPWindowType type; NPWindowType type;
if (!(aMsg->ReadULong(aIter, &window) && if (!(aMsg->ReadUInt64(aIter, &window) &&
ReadParam(aMsg, aIter, &x) && ReadParam(aMsg, aIter, &x) &&
ReadParam(aMsg, aIter, &y) && ReadParam(aMsg, aIter, &y) &&
ReadParam(aMsg, aIter, &width) && ReadParam(aMsg, aIter, &width) &&