wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 806300 Use intptr_t instead of int64_t for the 3rd argument of GetInputContext() of PBrowser r=cjones, feedback=Ms2ger

Browse Source
This commit is contained in:
Masayuki Nakano 2012-10-30 10:58:29 +09:00
parent bf9284fc79
commit df393c0357
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/PBrowser.ipdl
View File

@ -157,7 +157,7 @@ parent:
sync EndIMEComposition(bool cancel) returns (nsString composition);
sync GetInputContext() returns (int32_t IMEEnabled, int32_t IMEOpen,
int64_t NativeIMEContext);
intptr_t NativeIMEContext);
SetInputContext(int32_t IMEEnabled,
int32_t IMEOpen,

4
dom/ipc/TabParent.cpp
View File

@ -744,7 +744,7 @@ TabParent::RecvEndIMEComposition(const bool& aCancel,
bool
TabParent::RecvGetInputContext(int32_t* aIMEEnabled,
int32_t* aIMEOpen,
int64_t* aNativeIMEContext)
intptr_t* aNativeIMEContext)
{
nsCOMPtr<nsIWidget> widget = GetWidget();
if (!widget) {
@ -757,7 +757,7 @@ TabParent::RecvGetInputContext(int32_t* aIMEEnabled,
InputContext context = widget->GetInputContext();
*aIMEEnabled = static_cast<int32_t>(context.mIMEState.mEnabled);
*aIMEOpen = static_cast<int32_t>(context.mIMEState.mOpen);
*aNativeIMEContext = reinterpret_cast<int64_t>(context.mNativeIMEContext);
*aNativeIMEContext = reinterpret_cast<intptr_t>(context.mNativeIMEContext);
return true;
}

2
dom/ipc/TabParent.h
View File

@ -124,7 +124,7 @@ public:
nsString* aComposition);
virtual bool RecvGetInputContext(int32_t* aIMEEnabled,
int32_t* aIMEOpen,
int64_t* aNativeIMEContext);
intptr_t* aNativeIMEContext);
virtual bool RecvSetInputContext(const int32_t& aIMEEnabled,
const int32_t& aIMEOpen,
const nsString& aType,

2
widget/xpwidgets/PuppetWidget.cpp
View File

@ -382,7 +382,7 @@ PuppetWidget::GetInputContext()
InputContext context;
if (mTabChild) {
int32_t enabled, open;
int64_t nativeIMEContext;
intptr_t nativeIMEContext;
mTabChild->SendGetInputContext(&enabled, &open, &nativeIMEContext);
context.mIMEState.mEnabled = static_cast<IMEState::Enabled>(enabled);
context.mIMEState.mOpen = static_cast<IMEState::Open>(open);