Merge pull request #31 from rojkov/embedlite-nonfunctional

Non-functional beautifications and fixes
sailfishos · Nov 6, 2014 · 1efc815 · 1efc815
2 parents d0bf477 + 7cf6435
commit 1efc815
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 44 deletions.
diff --git a/embedding/embedlite/PEmbedLiteApp.ipdl b/embedding/embedlite/PEmbedLiteApp.ipdl
@@ -10,26 +10,26 @@ namespace embedlite {
 prio(normal upto high) intr protocol PEmbedLiteApp {
   manages PEmbedLiteView;
 parent:
-  async Initialized();
-  async ReadyToShutdown();
+  Initialized();
+  ReadyToShutdown();
   sync PEmbedLiteView(uint32_t id, uint32_t parentId);
   sync CreateWindow(uint32_t parentId, nsCString uri, uint32_t chromeFlags, uint32_t contextFlags)
     returns (uint32_t createdID, bool cancel);
 
 child:
-  async PreDestroy();
-  async CreateView(uint32_t id, uint32_t parentId);
-  async SetBoolPref(nsCString name, bool value);
-  async SetCharPref(nsCString name, nsCString value);
-  async SetIntPref(nsCString name, int value);
-  async LoadGlobalStyleSheet(nsCString uri, bool aEnable);
-  async AddObserver(nsCString topic);
-  async RemoveObserver(nsCString topic);
-  async LoadComponentManifest(nsCString manifest);
-  async AddObservers(nsCString [] observers);
-  async RemoveObservers(nsCString [] observers);
+  PreDestroy();
+  CreateView(uint32_t id, uint32_t parentId);
+  SetBoolPref(nsCString name, bool value);
+  SetCharPref(nsCString name, nsCString value);
+  SetIntPref(nsCString name, int value);
+  LoadGlobalStyleSheet(nsCString uri, bool aEnable);
+  AddObserver(nsCString topic);
+  RemoveObserver(nsCString topic);
+  LoadComponentManifest(nsCString manifest);
+  AddObservers(nsCString [] observers);
+  RemoveObservers(nsCString [] observers);
 both:
-  async Observe(nsCString topic, nsString data);
+  Observe(nsCString topic, nsString data);
 };
 
 }}
diff --git a/embedding/embedlite/PEmbedLiteView.ipdl b/embedding/embedlite/PEmbedLiteView.ipdl
@@ -30,19 +30,19 @@ namespace embedlite {
 prio(normal upto high) intr protocol PEmbedLiteView {
     manager PEmbedLiteApp;
 child:
-    async LoadURL(nsString url);
-    async GoBack();
-    async GoForward();
-    async StopLoad();
-    async Reload(bool hardReload);
-    async LoadFrameScript(nsString uri);
-    async SetViewSize(gfxSize aSize);
-    async SetGLViewSize(gfxSize aSize);
-    async SetIsActive(bool aIsActive);
-    async SetIsFocused(bool aIsFocused);
-    async SuspendTimeouts();
-    async ResumeTimeouts();
-    async AsyncScrollDOMEvent(gfxRect contentRect, gfxSize scrollSize);
+    LoadURL(nsString url);
+    GoBack();
+    GoForward();
+    StopLoad();
+    Reload(bool hardReload);
+    LoadFrameScript(nsString uri);
+    SetViewSize(gfxSize aSize);
+    SetGLViewSize(gfxSize aSize);
+    SetIsActive(bool aIsActive);
+    SetIsFocused(bool aIsFocused);
+    SuspendTimeouts();
+    ResumeTimeouts();
+    AsyncScrollDOMEvent(gfxRect contentRect, gfxSize scrollSize);
 
     UpdateFrame(FrameMetrics frame) compress;
     HandleDoubleTap(nsIntPoint point);
@@ -65,23 +65,23 @@ child:
     AddMessageListeners(nsString [] messageNames);
     RemoveMessageListeners(nsString [] messageNames);
 
-    async Destroy();
+    Destroy();
 
 parent:
-    async Initialized();
-    async __delete__();
-
-    async OnLocationChanged(nsCString aLocation, bool aCanGoBack, bool aCanGoForward);
-    async OnLoadStarted(nsCString aLocation);
-    async OnLoadFinished();
-    async OnLoadRedirect();
-    async OnLoadProgress(int32_t aProgress, int32_t aCurTotal, int32_t aMaxTotal);
-    async OnSecurityChanged(nsCString aStatus, uint32_t aState);
-    async OnFirstPaint(int32_t aX, int32_t aY);
-    async OnScrolledAreaChanged(uint32_t aWidth, uint32_t aHeight);
-    async OnScrollChanged(int32_t offSetX, int32_t offSetY);
-    async OnTitleChanged(nsString aTitle);
-    async OnWindowCloseRequested();
+    Initialized();
+     __delete__();
+
+    OnLocationChanged(nsCString aLocation, bool aCanGoBack, bool aCanGoForward);
+    OnLoadStarted(nsCString aLocation);
+    OnLoadFinished();
+    OnLoadRedirect();
+    OnLoadProgress(int32_t aProgress, int32_t aCurTotal, int32_t aMaxTotal);
+    OnSecurityChanged(nsCString aStatus, uint32_t aState);
+    OnFirstPaint(int32_t aX, int32_t aY);
+    OnScrolledAreaChanged(uint32_t aWidth, uint32_t aHeight);
+    OnScrollChanged(int32_t offSetX, int32_t offSetY);
+    OnTitleChanged(nsString aTitle);
+    OnWindowCloseRequested();
 
     /**
      * Updates the zoom constraints for a scrollable frame in this tab.
@@ -96,7 +96,7 @@ parent:
      * CSS pixels. This rect is relative to the document.
      */
     ZoomToRect(uint32_t aPresShellId, ViewID aViewId, CSSRect aRect);
-    async SetBackgroundColor(nscolor color);
+    SetBackgroundColor(nscolor color);
     ContentReceivedTouch(ScrollableLayerGuid aGuid, uint64_t aInputBlockId, bool aPreventDefault);
     sync GetGLViewSize()
       returns (gfxSize aSize);

diff --git a/embedding/embedlite/embedhelpers/EmbedLiteUILoop.cpp b/embedding/embedlite/embedhelpers/EmbedLiteUILoop.cpp
@@ -61,6 +61,7 @@ void EmbedLiteUILoop::DoQuit()
   DoIdleWork();
   if (type() == MessageLoop::TYPE_EMBED) {
     delete state_;
+    state_ = nullptr;
   }
 }
 

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -125,6 +125,7 @@ void
 EmbedLiteCompositorParent::ScheduleTask(CancelableTask* task, int time)
 {
   if (Invalidate()) {
+    task->Cancel();
     CancelCurrentCompositeTask();
   } else {
     CompositorParent::ScheduleTask(task, time);
@@ -138,7 +139,7 @@ EmbedLiteCompositorParent::Invalidate()
   EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);
   if (!view) {
     LOGE("view not available.. forgot SuspendComposition call?");
-    return false;
+    return true;
   }
 
   UpdateTransformState();