Fixed compilation with upstream

sailfishos · Oct 12, 2014 · 27647dd · 27647dd
1 parent 19d7b5a
commit 27647dd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/embedding/embedlite/PEmbedLiteApp.ipdl b/embedding/embedlite/PEmbedLiteApp.ipdl
@@ -7,7 +7,7 @@ include protocol PEmbedLiteView;
 namespace mozilla {
 namespace embedlite {
 
-intr protocol PEmbedLiteApp {
+prio(normal upto high) intr protocol PEmbedLiteApp {
   manages PEmbedLiteView;
 parent:
   async Initialized();

diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -27,7 +27,7 @@ using struct mozilla::layers::ZoomConstraints from "FrameMetrics.h";
 namespace mozilla {
 namespace embedlite {
 
-intr protocol PEmbedLiteView {
+prio(normal upto high) intr protocol PEmbedLiteView {
     manager PEmbedLiteApp;
 child:
     async LoadURL(nsString url);
@@ -104,7 +104,7 @@ parent:
     sync SyncMessage(nsString aMessage, nsString aJSON)
       returns (nsString[] retval);
 
-    rpc RpcMessage(nsString aMessage, nsString aJSON)
+    prio(high) sync RpcMessage(nsString aMessage, nsString aJSON)
       returns (nsString[] retval);
 
     // IME

diff --git a/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp
@@ -310,9 +310,9 @@ EmbedLitePuppetWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStat
       mIMEComposing = false;
       mIMEComposingText.Truncate();
       break;
-    case NS_TEXT_TEXT:
+    case NS_COMPOSITION_CHANGE:
       MOZ_ASSERT(mIMEComposing);
-      mIMEComposingText = static_cast<WidgetTextEvent*>(event)->theText;
+      mIMEComposingText = static_cast<WidgetCompositionEvent*>(event)->mData;
       break;
   }
 
@@ -402,9 +402,9 @@ EmbedLitePuppetWidget::RemoveIMEComposition()
 
   nsRefPtr<EmbedLitePuppetWidget> kungFuDeathGrip(this);
 
-  WidgetTextEvent textEvent(true, NS_TEXT_TEXT, this);
+  WidgetCompositionEvent textEvent(true, NS_COMPOSITION_CHANGE, this);
   textEvent.time = PR_Now() / 1000;
-  textEvent.theText = mIMEComposingText;
+  textEvent.mData = mIMEComposingText;
   nsEventStatus status;
   DispatchEvent(&textEvent, status);
 

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -454,7 +454,7 @@ EmbedLiteViewThreadChild::DoCallRpcMessage(const char16_t* aMessageName, const c
 {
   LOGT("msg:%s, data:%s", NS_ConvertUTF16toUTF8(aMessageName).get(), NS_ConvertUTF16toUTF8(aMessage).get());
   if (mRegisteredMessages.Get(nsDependentString(aMessageName))) {
-    CallRpcMessage(nsDependentString(aMessageName), nsDependentString(aMessage), aJSONRetVal);
+    SendRpcMessage(nsDependentString(aMessageName), nsDependentString(aMessage), aJSONRetVal);
   }
   return true;
 }
@@ -751,12 +751,12 @@ EmbedLiteViewThreadChild::RecvHandleTextEvent(const nsString& commit, const nsSt
   if (StartComposite || UpdateComposite || EndComposite) {
     WidgetCompositionEvent updateEvent(true, NS_COMPOSITION_UPDATE, widget);
     InitEvent(updateEvent, nullptr);
-    updateEvent.data = pushStr;
+    updateEvent.mData = pushStr;
     mHelper->DispatchWidgetEvent(updateEvent);
 
-    WidgetTextEvent event(true, NS_TEXT_TEXT, widget);
+    WidgetCompositionEvent event(true, NS_COMPOSITION_CHANGE, widget);
     InitEvent(event, nullptr);
-    event.theText = pushStr;
+    event.mData = pushStr;
     mHelper->DispatchWidgetEvent(event);
 
     nsCOMPtr<nsIPresShell> ps = mHelper->GetPresContext()->GetPresShell();

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -490,9 +490,9 @@ EmbedLiteViewThreadParent::RecvSyncMessage(const nsString& aMessage,
 }
 
 bool
-EmbedLiteViewThreadParent::AnswerRpcMessage(const nsString& aMessage,
-                                            const nsString& aJSON,
-                                            InfallibleTArray<nsString>* aJSONRetVal)
+EmbedLiteViewThreadParent::RecvRpcMessage(const nsString& aMessage,
+                                          const nsString& aJSON,
+                                          InfallibleTArray<nsString>* aJSONRetVal)
 {
   return RecvSyncMessage(aMessage, aJSON, aJSONRetVal);
 }

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
@@ -78,9 +78,9 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
   virtual bool RecvSyncMessage(const nsString& aMessage,
                                const nsString& aJSON,
                                InfallibleTArray<nsString>* aJSONRetVal) MOZ_OVERRIDE;
-  virtual bool AnswerRpcMessage(const nsString& aMessage,
-                                const nsString& aJSON,
-                                InfallibleTArray<nsString>* aJSONRetVal) MOZ_OVERRIDE;
+  virtual bool RecvRpcMessage(const nsString& aMessage,
+                              const nsString& aJSON,
+                              InfallibleTArray<nsString>* aJSONRetVal) MOZ_OVERRIDE;
   virtual bool
   RecvUpdateZoomConstraints(const uint32_t& aPresShellId,
                             const ViewID& aViewId,