Attachment 9021394 Details for Bug 1503070

[patch] part 6. Remove getContentDimensions() method from BrowserElement

nix-browserelement-getContentDimensions (text/plain), 12.07 KB, created by Boris Zbarsky [:bzbarsky]

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Zbarsky [:bzbarsky]

Size: 12.07 KB

patch

obsolete

># HG changeset patch
># User Boris Zbarsky <bzbarsky@mit.edu>
># Date 1540931066 14400
>#      Tue Oct 30 16:24:26 2018 -0400
># Node ID 128179a9c44d815824ff7fb74bbdc58c08f93db7
># Parent  fa9b8968ab3dbb9585f066715924d31b90b7d004
>Bug 1503070 part 6.  Remove getContentDimensions() method from BrowserElement.  r=ehsan
>
>diff --git a/dom/base/test/chrome/window_swapFrameLoaders.xul b/dom/base/test/chrome/window_swapFrameLoaders.xul
>--- a/dom/base/test/chrome/window_swapFrameLoaders.xul
>+++ b/dom/base/test/chrome/window_swapFrameLoaders.xul
>@@ -161,18 +161,6 @@ Test swapFrameLoaders with different fra
>         is(pongB, "B", "Frame B message manager gets reply B before swap");
>       }
> 
>-      // Check height before swap
>-      {
>-        if (frameA.getContentDimensions) {
>-          let { height } = await frameA.getContentDimensions();
>-          is(height, heightA, "Frame A's content height is 200px before swap");
>-        }
>-        if (frameB.getContentDimensions) {
>-          let { height } = await frameB.getContentDimensions();
>-          is(height, heightB, "Frame B's content height is 400px before swap");
>-        }
>-      }
>-
>       // Ping after swap using message managers acquired before
>       {
>         let mmA = frameA.frameLoader.messageManager;
>diff --git a/dom/base/test/mozbrowser_api_utils.js b/dom/base/test/mozbrowser_api_utils.js
>--- a/dom/base/test/mozbrowser_api_utils.js
>+++ b/dom/base/test/mozbrowser_api_utils.js
>@@ -9,7 +9,6 @@ const METHODS = {
>   stop: {},
>   getCanGoBack: {},
>   getCanGoForward: {},
>-  getContentDimensions: {},
>   findAll: {},
>   findNext: {},
>   clearMatch: {},
>diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js
>--- a/dom/browser-element/BrowserElementChildPreload.js
>+++ b/dom/browser-element/BrowserElementChildPreload.js
>@@ -270,7 +270,6 @@ BrowserElementChild.prototype = {
>     let self = this;
> 
>     let mmCalls = {
>-      "get-contentdimensions": this._recvGetContentDimensions,
>       "send-mouse-event": this._recvSendMouseEvent,
>       "send-touch-event": this._recvSendTouchEvent,
>       "get-can-go-back": this._recvCanGoBack,
>@@ -964,14 +963,6 @@ BrowserElementChild.prototype = {
>     }
>   },
> 
>-  _recvGetContentDimensions: function(data) {
>-    debug("Received getContentDimensions message: (" + data.json.id + ")");
>-    sendAsyncMsg('got-contentdimensions', {
>-      id: data.json.id,
>-      successRv: this._getContentDimensions()
>-    });
>-  },
>-
>   _mozScrollAreaChanged: function(e) {
>     sendAsyncMsg('scrollareachanged', {
>       width: e.width,
>@@ -993,13 +984,6 @@ BrowserElementChild.prototype = {
>     sendAsyncMsg("exit-dom-fullscreen");
>   },
> 
>-  _getContentDimensions: function() {
>-    return {
>-      width: content.document.body.scrollWidth,
>-      height: content.document.body.scrollHeight
>-    }
>-  },
>-
>   _recvFireCtxCallback: function(data) {
>     debug("Received fireCtxCallback message: (" + data.json.menuitem + ")");
> 
>diff --git a/dom/browser-element/BrowserElementParent.js b/dom/browser-element/BrowserElementParent.js
>--- a/dom/browser-element/BrowserElementParent.js
>+++ b/dom/browser-element/BrowserElementParent.js
>@@ -156,7 +156,6 @@ BrowserElementParent.prototype = {
>       "error": this._fireEventFromMsg,
>       "firstpaint": this._fireProfiledEventFromMsg,
>       "documentfirstpaint": this._fireProfiledEventFromMsg,
>-      "got-contentdimensions": this._gotDOMRequestResult,
>       "got-can-go-back": this._gotDOMRequestResult,
>       "got-can-go-forward": this._gotDOMRequestResult,
>       "requested-dom-fullscreen": this._requestedDOMFullscreen,
>@@ -572,7 +571,6 @@ BrowserElementParent.prototype = {
> 
>   getCanGoBack: defineDOMRequestMethod('get-can-go-back'),
>   getCanGoForward: defineDOMRequestMethod('get-can-go-forward'),
>-  getContentDimensions: defineDOMRequestMethod('get-contentdimensions'),
> 
>   findAll: defineNoReturnMethod(function(searchString, caseSensitivity) {
>     return this._sendAsyncMsg('find-all', {
>diff --git a/dom/browser-element/mochitest/browserElement_GetContentDimensions.js b/dom/browser-element/mochitest/browserElement_GetContentDimensions.js
>deleted file mode 100644
>--- a/dom/browser-element/mochitest/browserElement_GetContentDimensions.js
>+++ /dev/null
>@@ -1,66 +0,0 @@
>-/* Any copyright is dedicated to the public domain.
>-   http://creativecommons.org/publicdomain/zero/1.0/ */
>-
>-// Bug 757859 - Test the getContentDimensions functionality of mozbrowser
>-
>-"use strict";
>-SimpleTest.waitForExplicitFinish();
>-browserElementTestHelpers.setEnabledPref(true);
>-
>-var resizeContent = function() {
>-  var innerBox = content.document.getElementById('abox');
>-  innerBox.style.width = '800px';
>-  innerBox.style.height = '800px';
>-}
>-
>-function runTest() {
>-
>-  var iframe1 = document.createElement('iframe');
>-  iframe1.setAttribute('mozbrowser', 'true');
>-
>-  var iframeWidth = 400;
>-  var iframeHeight = 400;
>-  var numIframeLoaded = 0;
>-  var numResizeEvents = 0;
>-  var mm;
>-
>-  iframe1.src = 'data:text/html,<html><body><div id=\'abox\' ' +
>-    'style=\'background:blue;width:200px;height:200px\'>test</div></body></html>';
>-  iframe1.style.width = iframeWidth + 'px';
>-  iframe1.style.height = iframeHeight + 'px';
>-  document.body.appendChild(iframe1);
>-
>-  function iframeScrollAreaChanged(e) {
>-    numResizeEvents++;
>-    if (numResizeEvents === 1) {
>-      ok(true, 'Resize event when changing content size');
>-      ok(e.detail.width > iframeWidth, 'Iframes content is larger than iframe');
>-      ok(e.detail.height > iframeHeight, 'Iframes content is larger than iframe');
>-      iframe1.src = 'data:text/html,<html><body><div id=\'abox\' ' +
>-        'style=\'background:blue;width:200px;height:200px\'>test</div></body></html>';
>-    } else if (numResizeEvents === 2) {
>-      ok(true, 'Resize event when changing src');
>-      iframe1.removeEventListener('mozbrowserresize', iframeScrollAreaChanged);
>-      SimpleTest.finish();
>-    }
>-  }
>-
>-  function iframeLoadedHandler() {
>-    iframe1.removeEventListener('mozbrowserloadend', iframeLoadedHandler);
>-    mm = SpecialPowers.getBrowserFrameMessageManager(iframe1);
>-    iframe1.getContentDimensions(). {
>-      ok(typeof e.target.result.width === 'number', 'Received width');
>-      ok(typeof e.target.result.height === 'number', 'Received height');
>-      ok(e.target.result.height <= iframeHeight, 'Iframes content is smaller than iframe');
>-      ok(e.target.result.width <= iframeWidth, 'Iframes content is smaller than iframe');
>-      iframe1.addEventListener('mozbrowserscrollareachanged', iframeScrollAreaChanged);
>-      mm.loadFrameScript('data:,(' + resizeContent.toString() + ')();', false);
>-    }
>-  }
>-
>-  iframe1.addEventListener('mozbrowserloadend', iframeLoadedHandler);
>-}
>-
>-addEventListener('load', function() {
>-  SimpleTest.executeSoon(runTest);
>-});
>diff --git a/dom/browser-element/mochitest/chrome.ini b/dom/browser-element/mochitest/chrome.ini
>--- a/dom/browser-element/mochitest/chrome.ini
>+++ b/dom/browser-element/mochitest/chrome.ini
>@@ -9,7 +9,6 @@ support-files =
>   browserElement_DocumentFirstPaint.js
>   browserElement_ExecuteScript.js
>   browserElement_Find.js
>-  browserElement_GetContentDimensions.js
>   browserElement_getWebManifest.js
>   browserElement_ReloadPostRequest.js
>   browserElement_SendEvent.js
>@@ -28,7 +27,6 @@ support-files =
> [test_browserElement_inproc_ExecuteScript.html]
> [test_browserElement_inproc_Find.html]
> disabled = Bug 1458393
>-[test_browserElement_inproc_GetContentDimensions.html]
> [test_browserElement_inproc_getWebManifest.html]
> [test_browserElement_inproc_ReloadPostRequest.html]
> disabled = no modal prompt on POST reload for chrome window
>diff --git a/dom/browser-element/mochitest/mochitest-oop.ini b/dom/browser-element/mochitest/mochitest-oop.ini
>--- a/dom/browser-element/mochitest/mochitest-oop.ini
>+++ b/dom/browser-element/mochitest/mochitest-oop.ini
>@@ -77,8 +77,6 @@ disabled = Disabling some OOP tests for 
> [test_browserElement_oop_CloseFromOpener.html]
> [test_browserElement_oop_ExposableURI.html]
> skip-if = !e10s # Bug 1391349
>-[test_browserElement_oop_GetContentDimensions.html]
>-disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re-enabling)
> [test_browserElement_oop_getWebManifest.html]
> disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re-enabling)
> [test_browserElement_oop_OpenWindowEmpty.html]
>diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_GetContentDimensions.html b/dom/browser-element/mochitest/test_browserElement_inproc_GetContentDimensions.html
>deleted file mode 100644
>--- a/dom/browser-element/mochitest/test_browserElement_inproc_GetContentDimensions.html
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-<!DOCTYPE HTML>
>-<html>
>-<head>
>-  <title>Test of browser element.</title>
>-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
>-  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
>-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
>-</head>
>-<body>
>-<script type="application/javascript" src="browserElement_GetContentDimensions.js">
>-</script>
>-</body>
>-</html>
>diff --git a/dom/browser-element/mochitest/test_browserElement_oop_GetContentDimensions.html b/dom/browser-element/mochitest/test_browserElement_oop_GetContentDimensions.html
>deleted file mode 100644
>--- a/dom/browser-element/mochitest/test_browserElement_oop_GetContentDimensions.html
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-<!DOCTYPE HTML>
>-<html>
>-<head>
>-  <title>Test of browser element.</title>
>-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
>-  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
>-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
>-</head>
>-<body>
>-<script type="application/javascript" src="browserElement_GetContentDimensions.js">
>-</script>
>-</body>
>-</html>
>diff --git a/dom/browser-element/nsIBrowserElementAPI.idl b/dom/browser-element/nsIBrowserElementAPI.idl
>--- a/dom/browser-element/nsIBrowserElementAPI.idl
>+++ b/dom/browser-element/nsIBrowserElementAPI.idl
>@@ -58,7 +58,6 @@ interface nsIBrowserElementAPI : nsISupp
>   void stop();
>   DOMRequest getCanGoBack();
>   DOMRequest getCanGoForward();
>-  DOMRequest getContentDimensions();
> 
>   void findAll(in AString searchString, in long caseSensitivity);
>   void findNext(in long direction);
>diff --git a/dom/html/nsBrowserElement.cpp b/dom/html/nsBrowserElement.cpp
>--- a/dom/html/nsBrowserElement.cpp
>+++ b/dom/html/nsBrowserElement.cpp
>@@ -208,22 +208,6 @@ nsBrowserElement::GetCanGoForward(ErrorR
>   return req.forget();
> }
> 
>-already_AddRefed<DOMRequest>
>-nsBrowserElement::GetContentDimensions(ErrorResult& aRv)
>-{
>-  NS_ENSURE_TRUE(IsBrowserElementOrThrow(aRv), nullptr);
>-
>-  RefPtr<DOMRequest> req;
>-  nsresult rv = mBrowserElementAPI->GetContentDimensions(getter_AddRefs(req));
>-
>-  if (NS_WARN_IF(NS_FAILED(rv))) {
>-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
>-    return nullptr;
>-  }
>-
>-  return req.forget();
>-}
>-
> void
> nsBrowserElement::FindAll(const nsAString& aSearchString,
>                           BrowserFindCaseSensitivity aCaseSensitivity,
>diff --git a/dom/html/nsBrowserElement.h b/dom/html/nsBrowserElement.h
>--- a/dom/html/nsBrowserElement.h
>+++ b/dom/html/nsBrowserElement.h
>@@ -59,7 +59,6 @@ public:
> 
>   already_AddRefed<dom::DOMRequest> GetCanGoBack(ErrorResult& aRv);
>   already_AddRefed<dom::DOMRequest> GetCanGoForward(ErrorResult& aRv);
>-  already_AddRefed<dom::DOMRequest> GetContentDimensions(ErrorResult& aRv);
> 
>   void FindAll(const nsAString& aSearchString, dom::BrowserFindCaseSensitivity aCaseSensitivity,
>                ErrorResult& aRv);
>diff --git a/dom/webidl/BrowserElement.webidl b/dom/webidl/BrowserElement.webidl
>--- a/dom/webidl/BrowserElement.webidl
>+++ b/dom/webidl/BrowserElement.webidl
>@@ -78,11 +78,6 @@ interface BrowserElementPrivileged {
>   [Throws,
>    Pref="dom.mozBrowserFramesEnabled",
>    ChromeOnly]
>-  DOMRequest getContentDimensions();
>-
>-  [Throws,
>-   Pref="dom.mozBrowserFramesEnabled",
>-   ChromeOnly]
>   void findAll(DOMString searchString, BrowserFindCaseSensitivity caseSensitivity);
> 
>   [Throws,

Flags:

ehsan.akhgari: review+

Actions: View | Diff | Review

Attachments on bug 1503070: 9021389 | 9021390 | 9021391 | 9021392 | 9021393 | 9021394 | 9021395 | 9021396 | 9021397 | 9021398 | 9021399 | 9021400