Update to latest version from bug 900908

sailfishos · Apr 29, 2014 · 90599b6 · 90599b6
1 parent 2a28449
commit 90599b6
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 18 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp
@@ -51,7 +51,7 @@ EmbedLiteAppThreadChild::EmbedLiteAppThreadChild(MessageLoop* aParentLoop)
   sAppThreadChild = this;
 }
 
-NS_IMPL_ISUPPORTS1(EmbedLiteAppThreadChild, nsIObserver)
+NS_IMPL_ISUPPORTS(EmbedLiteAppThreadChild, nsIObserver)
 
 EmbedLiteAppThreadChild::~EmbedLiteAppThreadChild()
 {

diff --git a/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp
@@ -46,8 +46,8 @@ const size_t EmbedLitePuppetWidget::kMaxDimension = 4000;
 static nsTArray<EmbedLitePuppetWidget*> gTopLevelWindows;
 static bool sFailedToCreateGLContext = false;
 
-NS_IMPL_ISUPPORTS_INHERITED1(EmbedLitePuppetWidget, nsBaseWidget,
-                             nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS_INHERITED(EmbedLitePuppetWidget, nsBaseWidget,
+                            nsISupportsWeakReference)
 
 static bool
 IsPopup(const nsWidgetInitData* aInitData)

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -515,7 +515,7 @@ EmbedLiteViewThreadChild::RecvSetViewSize(const gfxSize& aSize)
   baseWindow->SetPositionAndSize(0, 0, mViewSize.width, mViewSize.height, true);
   baseWindow->SetVisibility(true);
 
-  mHelper->HandlePossibleViewportChange();
+  mHelper->ReportSizeUpdate(aSize);
 
   return true;
 }

diff --git a/embedding/embedlite/modules/EmbedLiteAppService.cpp b/embedding/embedlite/modules/EmbedLiteAppService.cpp
@@ -74,7 +74,7 @@ EmbedLiteAppService::~EmbedLiteAppService()
 {
 }
 
-NS_IMPL_ISUPPORTS2(EmbedLiteAppService, nsIObserver, nsIEmbedAppService)
+NS_IMPL_ISUPPORTS(EmbedLiteAppService, nsIObserver, nsIEmbedAppService)
 
 NS_IMETHODIMP
 EmbedLiteAppService::Observe(nsISupports* aSubject,

diff --git a/embedding/embedlite/modules/EmbedLiteJSON.cpp b/embedding/embedlite/modules/EmbedLiteJSON.cpp
@@ -26,7 +26,7 @@ EmbedLiteJSON::~EmbedLiteJSON()
 {
 }
 
-NS_IMPL_ISUPPORTS1(EmbedLiteJSON, nsIEmbedLiteJSON)
+NS_IMPL_ISUPPORTS(EmbedLiteJSON, nsIEmbedLiteJSON)
 
 nsresult
 CreateObjectStatic(nsIWritablePropertyBag2 * *aObject)

diff --git a/embedding/embedlite/utils/DirProvider.cpp b/embedding/embedlite/utils/DirProvider.cpp
@@ -16,9 +16,9 @@ nsCOMPtr<nsIFile> DirProvider::sProfileDir = 0;
 nsCOMPtr<nsIFile> DirProvider::sGREDir = 0;
 nsISupports* DirProvider::sProfileLock = 0;
 
-NS_IMPL_QUERY_INTERFACE2(DirProvider,
-                         nsIDirectoryServiceProvider,
-                         nsIDirectoryServiceProvider2)
+NS_IMPL_QUERY_INTERFACE(DirProvider,
+                        nsIDirectoryServiceProvider,
+                        nsIDirectoryServiceProvider2)
 
 NS_IMETHODIMP_(MozExternalRefCountType)
 DirProvider::AddRef()

diff --git a/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp b/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp
@@ -25,7 +25,7 @@ EmbedLiteXulAppInfo::~EmbedLiteXulAppInfo()
 {
 }
 
-NS_IMPL_ISUPPORTS2(EmbedLiteXulAppInfo, nsIXULRuntime, nsIXULAppInfo)
+NS_IMPL_ISUPPORTS(EmbedLiteXulAppInfo, nsIXULRuntime, nsIXULAppInfo)
 
 NS_IMETHODIMP EmbedLiteXulAppInfo::GetID(nsACString& aID)
 {

diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -50,6 +50,7 @@ static bool sPostAZPCAsJsonViewport(false);
 
 TabChildHelper::TabChildHelper(EmbedLiteViewThreadChild* aView)
   : mView(aView)
+  , mHasValidInnerSize(false)
 {
   LOGT();
 
@@ -199,6 +200,12 @@ TabChildHelper::InitTabChildGlobal()
   return true;
 }
 
+bool
+TabChildHelper::HasValidInnerSize()
+{
+  return mHasValidInnerSize;
+}
+
 NS_IMETHODIMP
 TabChildHelper::Observe(nsISupports* aSubject,
                         const char* aTopic,
@@ -495,3 +502,15 @@ TabChildHelper::DoUpdateZoomConstraints(const uint32_t& aPresShellId,
                                           aIsRoot,
                                           aConstraints);
 }
+
+void
+TabChildHelper::ReportSizeUpdate(const gfxSize& aSize)
+{
+  bool initialSizing = !HasValidInnerSize()
+                    && (aSize.width != 0 && aSize.height != 0);
+  if (initialSizing) {
+    mHasValidInnerSize = true;
+  }
+
+  HandlePossibleViewportChange();
+}
diff --git a/embedding/embedlite/utils/TabChildHelper.h b/embedding/embedlite/utils/TabChildHelper.h
@@ -61,6 +61,7 @@ class TabChildHelper : public nsIDOMEventListener,
                                        const mozilla::layers::FrameMetrics::ViewID& aViewId,
                                        const bool& aIsRoot,
                                        const mozilla::layers::ZoomConstraints& aConstraints) MOZ_OVERRIDE;
+  void ReportSizeUpdate(const gfxSize& aSize);
 
 protected:
   nsIWidget* GetWidget(nsPoint* aOffset);
@@ -69,6 +70,7 @@ class TabChildHelper : public nsIDOMEventListener,
   bool ConvertMutiTouchInputToEvent(const mozilla::MultiTouchInput& aData,
                                     WidgetTouchEvent& aEvent);
   void CancelTapTracking();
+  bool HasValidInnerSize();
 
 private:
   bool InitTabChildGlobal();
@@ -78,6 +80,7 @@ class TabChildHelper : public nsIDOMEventListener,
   friend class EmbedLiteViewThreadChild;
   EmbedLiteViewThreadChild* mView;
   mozilla::layers::FrameMetrics mLastSubFrameMetrics;
+  bool mHasValidInnerSize;
 };
 
 }

diff --git a/embedding/embedlite/utils/WebBrowserChrome.cpp b/embedding/embedlite/utils/WebBrowserChrome.cpp
@@ -56,13 +56,13 @@ WebBrowserChrome::~WebBrowserChrome()
   LOGT();
 }
 
-NS_IMPL_ISUPPORTS6(WebBrowserChrome,
-                   nsIWebBrowserChrome,
-                   nsIWebBrowserChromeFocus,
-                   nsIInterfaceRequestor,
-                   nsIEmbeddingSiteWindow,
-                   nsIWebProgressListener,
-                   nsSupportsWeakReference)
+NS_IMPL_ISUPPORTS(WebBrowserChrome,
+                  nsIWebBrowserChrome,
+                  nsIWebBrowserChromeFocus,
+                  nsIInterfaceRequestor,
+                  nsIEmbeddingSiteWindow,
+                  nsIWebProgressListener,
+                  nsSupportsWeakReference)
 
 NS_IMETHODIMP WebBrowserChrome::GetInterface(const nsIID& aIID, void** aInstancePtr)
 {

diff --git a/embedding/embedlite/utils/WindowCreator.cpp b/embedding/embedlite/utils/WindowCreator.cpp
@@ -26,7 +26,7 @@ WindowCreator::~WindowCreator()
   LOGT();
 }
 
-NS_IMPL_ISUPPORTS2(WindowCreator, nsIWindowCreator, nsIWindowCreator2)
+NS_IMPL_ISUPPORTS(WindowCreator, nsIWindowCreator, nsIWindowCreator2)
 
 NS_IMETHODIMP
 WindowCreator::CreateChromeWindow2(nsIWebBrowserChrome* aParent,