Bug 1475305 - Remove document.width and document.height from XULDocument;r=bz

MozReview-Commit-ID: 8jWcMUYA25R

--HG--
extra : rebase_source : c23a2e647922882fc1ca3d7153ec95c5d8a2aa9d

devtools/client/framework/toolbox-tabs-order-manager.js

@@ -112,8 +112,9 @@ class ToolboxTabsOrderManager {
   }
 
   onMouseOut(e) {
-    if (e.pageX <= 0 || this.dragTarget.ownerDocument.width <= e.pageX ||
+    const documentElement = this.dragTarget.ownerDocument.documentElement;
-        e.pageY <= 0 || this.dragTarget.ownerDocument.height <= e.pageY) {
+    if (e.pageX <= 0 || documentElement.clientWidth <= e.pageX ||
+        e.pageY <= 0 || documentElement.clientHeight <= e.pageY) {
       this.onMouseUp();
     }
   }

dom/webidl/XULDocument.webidl

@@ -26,11 +26,6 @@ interface XULDocument : Document {
 
   readonly attribute XULCommandDispatcher? commandDispatcher;
 
-  [Throws]
-  readonly attribute long width;
-  [Throws]
-  readonly attribute long height;
-
   NodeList getElementsByAttribute(DOMString name,
                                   [TreatNullAs=EmptyString] DOMString value);
   [Throws]

dom/xul/XULDocument.cpp

@@ -1100,47 +1100,6 @@ XULDocument::Persist(Element* aElement, int32_t aNameSpaceID,
     return mLocalStore->SetValue(uri, id, attrstr, valuestr);
 }
 
-
-nsresult
-XULDocument::GetViewportSize(int32_t* aWidth,
-                             int32_t* aHeight)
-{
-    *aWidth = *aHeight = 0;
-
-    FlushPendingNotifications(FlushType::Layout);
-
-    nsIPresShell *shell = GetShell();
-    NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE);
-
-    nsIFrame* frame = shell->GetRootFrame();
-    NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-
-    nsSize size = frame->GetSize();
-
-    *aWidth = nsPresContext::AppUnitsToIntCSSPixels(size.width);
-    *aHeight = nsPresContext::AppUnitsToIntCSSPixels(size.height);
-
-    return NS_OK;
-}
-
-int32_t
-XULDocument::GetWidth(ErrorResult& aRv)
-{
-    int32_t width = 0;
-    int32_t height = 0;
-    aRv = GetViewportSize(&width, &height);
-    return width;
-}
-
-int32_t
-XULDocument::GetHeight(ErrorResult& aRv)
-{
-    int32_t width = 0;
-    int32_t height = 0;
-    aRv = GetViewportSize(&width, &height);
-    return height;
-}
-
 static JSObject*
 GetScopeObjectOfNode(nsINode* node)
 {

dom/xul/XULDocument.h

@@ -153,8 +153,6 @@ public:
     {
         return mCommandDispatcher;
     }
-    int32_t GetWidth(ErrorResult& aRv);
-    int32_t GetHeight(ErrorResult& aRv);
     already_AddRefed<nsINodeList>
       GetElementsByAttribute(const nsAString& aAttribute,
                              const nsAString& aValue);
@@ -181,8 +179,6 @@ protected:
     nsresult Init(void) override;
     nsresult StartLayout(void);
 
-    nsresult GetViewportSize(int32_t* aWidth, int32_t* aHeight);
-
     nsresult PrepareToLoad(nsISupports* aContainer,
                            const char* aCommand,
                            nsIChannel* aChannel,

widget/tests/window_state_windows.xul

@@ -52,8 +52,8 @@
       
       // Windows resizes children to 0x0. Code in nsWindow filters these changes out. Without
       // this all sorts of screwy things can happen in child widgets.
-      ok(document.height > 0, "document height should not be zero for a minimized window!");
+      ok(document.documentElement.clientHeight > 0, "document height should not be zero for a minimized window!");
-      ok(document.width > 0, "document width should not be zero for a minimized window!");
+      ok(document.documentElement.clientWidth > 0, "document width should not be zero for a minimized window!");
       
       // Make sure size mode changes are reflected in the widget.
       win.restore();