diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 74c9e4ca6bd..67b1a685434 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -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, diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index a3d9686d94f..f291e56a54f 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -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 widget = GetWidget(); if (!widget) { @@ -757,7 +757,7 @@ TabParent::RecvGetInputContext(int32_t* aIMEEnabled, InputContext context = widget->GetInputContext(); *aIMEEnabled = static_cast(context.mIMEState.mEnabled); *aIMEOpen = static_cast(context.mIMEState.mOpen); - *aNativeIMEContext = reinterpret_cast(context.mNativeIMEContext); + *aNativeIMEContext = reinterpret_cast(context.mNativeIMEContext); return true; } diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h index 2810c2eef26..e6c265d1108 100644 --- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -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, diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp index 78c52986ee6..6f63acbeb12 100644 --- a/widget/xpwidgets/PuppetWidget.cpp +++ b/widget/xpwidgets/PuppetWidget.cpp @@ -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(enabled); context.mIMEState.mOpen = static_cast(open);