mWebBrowserChrome;
+};
+
+#endif /* nsDocShellTreeOwner_h__ */
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/docshell/base/nsIContextMenuListener2.idl firefox-trunk-53.0~a1~hg20170115r329516/docshell/base/nsIContextMenuListener2.idl
--- firefox-trunk-53.0~a1~hg20170113r329171/docshell/base/nsIContextMenuListener2.idl 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/docshell/base/nsIContextMenuListener2.idl 2017-01-16 01:26:01.000000000 +0000
@@ -0,0 +1,121 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface nsIDOMEvent;
+interface nsIDOMNode;
+interface imgIContainer;
+interface nsIURI;
+interface nsIContextMenuInfo;
+
+/* THIS IS A PUBLIC EMBEDDING API */
+
+/**
+ * nsIContextMenuListener2
+ *
+ * This is an extended version of nsIContextMenuListener
+ * It provides a helper class, nsIContextMenuInfo, to allow access to
+ * background images as well as various utilities.
+ *
+ * @see nsIContextMenuListener
+ * @see nsIContextMenuInfo
+ */
+
+[scriptable, uuid(7fb719b3-d804-4964-9596-77cf924ee314)]
+interface nsIContextMenuListener2 : nsISupports
+{
+ /** Flag. No context. */
+ const unsigned long CONTEXT_NONE = 0;
+ /** Flag. Context is a link element. */
+ const unsigned long CONTEXT_LINK = 1;
+ /** Flag. Context is an image element. */
+ const unsigned long CONTEXT_IMAGE = 2;
+ /** Flag. Context is the whole document. */
+ const unsigned long CONTEXT_DOCUMENT = 4;
+ /** Flag. Context is a text area element. */
+ const unsigned long CONTEXT_TEXT = 8;
+ /** Flag. Context is an input element. */
+ const unsigned long CONTEXT_INPUT = 16;
+ /** Flag. Context is a background image. */
+ const unsigned long CONTEXT_BACKGROUND_IMAGE = 32;
+
+ /**
+ * Called when the browser receives a context menu event (e.g. user is right-mouse
+ * clicking somewhere on the document). The combination of flags, along with the
+ * attributes of aUtils, indicate where and what was clicked on.
+ *
+ * The following table describes what context flags and node combinations are
+ * possible.
+ *
+ * aContextFlags aUtils.targetNode
+ *
+ * CONTEXT_LINK
+ * CONTEXT_IMAGE ![]()
+ * CONTEXT_IMAGE | CONTEXT_LINK ![]()
with as an ancestor
+ * CONTEXT_INPUT
+ * CONTEXT_INPUT | CONTEXT_IMAGE with type=image
+ * CONTEXT_TEXT
- prefilled:
- Should be saved checked
- Initiallly checked
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/bug449141_page.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/bug449141_page.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/bug449141_page.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/bug449141_page.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-
-
-
-
- Nested iframe for bug 449141
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/chrome.ini firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/chrome.ini
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/chrome.ini 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/chrome.ini 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[DEFAULT]
-support-files =
- 320x240.ogv
- bug449141_page.html
- bug1170334_iframe.xml
- bug1170334_style.css
-
-[test_bug449141.html]
-skip-if = toolkit == 'android'
-[test_bug1170334_wbp_xmlstyle.html]
-[test_bug1192654.html]
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/mochitest.ini firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/mochitest.ini
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/mochitest.ini 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/mochitest.ini 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-[DEFAULT]
-support-files =
- bug293834_form.html
-
-[test_bug293834.html]
-skip-if = (toolkit == "cocoa" && e10s) # bug 1252223
-[test_bug499115.html]
-[test_nsFind.html]
-[test_private_window_from_content.html]
-# Next two tests are disabled in e10s because of bug 989501.
-[test_window_open_position_constraint.html]
-skip-if = toolkit == 'android'
-[test_window_open_units.html]
-skip-if = toolkit == 'android'
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/moz.build firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/moz.build
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/moz.build 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/moz.build 1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug1170334_wbp_xmlstyle.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug1170334_wbp_xmlstyle.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug1170334_wbp_xmlstyle.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug1170334_wbp_xmlstyle.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-
-
-
-
- Test for Bug 1170334 (nsWebBrowserPersist vs. XML stylesheets)
-
-
-
-
-Mozilla Bug 1170334
-
-
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug1192654.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug1192654.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug1192654.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug1192654.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-
-
-
-
- Test for Bug 1192654 (nsWebBrowser vs. nonpersistable subdocuments)
-
-
-
-
-Mozilla Bug 1192654
-
-
-
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug293834.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug293834.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug293834.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug293834.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-
-
-
-
- Test for Bug 293834
-
-
-
-
-Mozilla Bug 293834
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug449141.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug449141.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug449141.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug449141.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-
-
-
-
- Test for Bug 449141
-
-
-
-
-Mozilla Bug 449141
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug499115.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug499115.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_bug499115.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_bug499115.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-
-
-
-
-
-
- Test for Bug 499115
-
-
-
-
- Mozilla Bug 499115
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_nsFind.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_nsFind.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_nsFind.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_nsFind.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-
-
-
-
-
- Test for nsFind::Find()
-
-
-
-
-Mozilla Bug 450048
-This is the text to search into
-"straight" and “curly” and ‘didn't’ and 'doesn’t'
-
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_private_window_from_content.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_private_window_from_content.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_private_window_from_content.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_private_window_from_content.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_window_open_position_constraint.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_window_open_position_constraint.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_window_open_position_constraint.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_window_open_position_constraint.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-
-
-
- Test for Bug 978847
-
-
-
-
-Mozilla Bug 978847
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_window_open_units.html firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_window_open_units.html
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/test/test_window_open_units.html 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/test/test_window_open_units.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-
-
-
- Test for Bug 594140
-
-
-
-
-
-Mozilla Bug 594140
-
-
-
-
-
-
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/test_wwauthpromptfactory.js firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/test_wwauthpromptfactory.js
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/test_wwauthpromptfactory.js 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/test_wwauthpromptfactory.js 1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-
-var authPromptRequestReceived;
-
-const tPFCID = Components.ID("{749e62f4-60ae-4569-a8a2-de78b649660f}");
-const tPFContract = "@mozilla.org/passwordmanager/authpromptfactory;1";
-
-/*
- * TestPromptFactory
- *
- * Implements nsIPromptFactory
- */
-var TestPromptFactory = {
- QueryInterface: function tPF_qi(iid) {
- if (iid.equals(Ci.nsISupports) ||
- iid.equals(Ci.nsIFactory) ||
- iid.equals(Ci.nsIPromptFactory))
- return this;
- throw Components.results.NS_ERROR_NO_INTERFACE;
- },
-
- createInstance: function tPF_ci(outer, iid) {
- if (outer)
- throw Components.results.NS_ERROR_NO_AGGREGATION;
- return this.QueryInterface(iid);
- },
-
- lockFactory: function tPF_lockf(lock) {
- throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
- },
-
- getPrompt : function tPF_getPrompt(aWindow, aIID) {
- if (aIID.equals(Ci.nsIAuthPrompt) ||
- aIID.equals(Ci.nsIAuthPrompt2)) {
- authPromptRequestReceived = true;
- return {};
- }
-
- throw Components.results.NS_ERROR_NO_INTERFACE;
- }
-}; // end of TestPromptFactory implementation
-
-/*
- * The tests
- */
-function run_test() {
- Components.manager.nsIComponentRegistrar.registerFactory(tPFCID,
- "TestPromptFactory", tPFContract, TestPromptFactory);
-
- // Make sure that getting both nsIAuthPrompt and nsIAuthPrompt2 works
- // (these should work independently of whether the application has
- // nsIPromptService2)
- var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService();
-
- authPromptRequestReceived = false;
-
- do_check_neq(ww.nsIPromptFactory.getPrompt(null, Ci.nsIAuthPrompt), null);
-
- do_check_true(authPromptRequestReceived);
-
- authPromptRequestReceived = false;
-
- do_check_neq(ww.nsIPromptFactory.getPrompt(null, Ci.nsIAuthPrompt2), null);
-
- do_check_true(authPromptRequestReceived);
-}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/test_wwpromptfactory.js firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/test_wwpromptfactory.js
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/test_wwpromptfactory.js 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/test_wwpromptfactory.js 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-function run_test() {
- // Make sure that getting both nsIAuthPrompt and nsIAuthPrompt2 works
- // (these should work independently of whether the application has
- // nsIPromptService2)
- var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
- .getService();
-
- var prompt;
-
- prompt = ww.nsIWindowWatcher.getNewPrompter(null);
- do_check_neq(prompt, null);
- prompt = ww.nsIWindowWatcher.getNewAuthPrompter(null);
- do_check_neq(prompt, null);
-
- prompt = ww.nsIPromptFactory.getPrompt(null,
- Components.interfaces.nsIPrompt);
- do_check_neq(prompt, null);
- prompt = ww.nsIPromptFactory.getPrompt(null,
- Components.interfaces.nsIAuthPrompt);
- do_check_neq(prompt, null);
- prompt = ww.nsIPromptFactory.getPrompt(null,
- Components.interfaces.nsIAuthPrompt2);
- do_check_neq(prompt, null);
-}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/xpcshell.ini firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/xpcshell.ini
--- firefox-trunk-53.0~a1~hg20170113r329171/embedding/tests/unit/xpcshell.ini 2017-01-13 01:55:33.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/embedding/tests/unit/xpcshell.ini 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[DEFAULT]
-head =
-tail =
-
-[test_wwauthpromptfactory.js]
-[test_wwpromptfactory.js]
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/.eslintignore firefox-trunk-53.0~a1~hg20170115r329516/.eslintignore
--- firefox-trunk-53.0~a1~hg20170113r329171/.eslintignore 2017-01-13 00:55:51.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/.eslintignore 2017-01-16 00:52:15.000000000 +0000
@@ -184,6 +184,12 @@
# Uses `#filter substitution`
services/sync/modules/constants.js
+# Third party services
+services/sync/tps/extensions/mozmill/resource/stdlib/json2.js
+services/common/kinto-http-client.js
+services/common/kinto-offline-client.js
+services/sync/tps/extensions/mozmill
+
# toolkit/ exclusions
# Not part of the default build
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/extensions/spellcheck/hunspell/src/README.mozilla firefox-trunk-53.0~a1~hg20170115r329516/extensions/spellcheck/hunspell/src/README.mozilla
--- firefox-trunk-53.0~a1~hg20170113r329171/extensions/spellcheck/hunspell/src/README.mozilla 2017-01-13 01:55:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/extensions/spellcheck/hunspell/src/README.mozilla 2017-01-16 01:58:34.000000000 +0000
@@ -1,2 +1,2 @@
-Hunspell Version: 1.5.4
+Hunspell Version: 1.6.0
Additional Patches: See patches directory.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/CompositorOptions.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/CompositorOptions.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/CompositorOptions.h 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/CompositorOptions.h 2017-01-16 00:56:48.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef _include_mozilla_gfx_ipc_CompositorOptions_h_
+#define _include_mozilla_gfx_ipc_CompositorOptions_h_
+
+namespace IPC {
+template struct ParamTraits;
+} // namespace IPC
+
+namespace mozilla {
+namespace layers {
+
+/**
+ * This class holds options that are "per compositor" - that is, these options
+ * affect a particular CompositorBridgeParent and all the content that it
+ * renders.
+ *
+ * This class is intended to be created by a platform widget (but NOT
+ * PuppetWidget) and passed to the graphics code during initialization of the
+ * top level compositor associated with that widget. The options are immutable
+ * after creation. The CompositorBridgeParent holds the canonical version of
+ * the options, but they may be accessed by other parts of the code as needed,
+ * and are accessible to content processes over PCompositorBridge as well.
+ */
+class CompositorOptions
+{
+public:
+ // This constructor needed for IPDL purposes, don't use it anywhere else.
+ CompositorOptions()
+ : mUseAPZ(false)
+ {
+ }
+
+ explicit CompositorOptions(bool aUseAPZ)
+ : mUseAPZ(aUseAPZ)
+ {
+ }
+
+ bool UseAPZ() const { return mUseAPZ; }
+
+ friend struct IPC::ParamTraits;
+
+private:
+ bool mUseAPZ;
+
+ // Make sure to add new fields to the ParamTraits implementation
+};
+
+} // namespace layers
+} // namespace mozilla
+
+#endif // _include_mozilla_gfx_ipc_CompositorOptions_h_
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GfxMessageUtils.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GfxMessageUtils.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GfxMessageUtils.h 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GfxMessageUtils.h 2017-01-16 00:56:49.000000000 +0000
@@ -20,6 +20,7 @@
#include "ipc/IPCMessageUtils.h"
#include "mozilla/gfx/Matrix.h"
#include "mozilla/layers/AsyncDragMetrics.h"
+#include "mozilla/layers/CompositorOptions.h"
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/GeckoContentController.h"
#include "mozilla/layers/LayersTypes.h"
@@ -1318,6 +1319,20 @@
}
};
+template <>
+struct ParamTraits
+{
+ typedef mozilla::layers::CompositorOptions paramType;
+
+ static void Write(Message* aMsg, const paramType& aParam) {
+ WriteParam(aMsg, aParam.mUseAPZ);
+ }
+
+ static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult) {
+ return ReadParam(aMsg, aIter, &aResult->mUseAPZ);
+ }
+};
+
} /* namespace IPC */
#endif /* __GFXMESSAGEUTILS_H__ */
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUParent.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUParent.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUParent.cpp 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUParent.cpp 2017-01-16 00:56:49.000000000 +0000
@@ -288,11 +288,12 @@
GPUParent::RecvNewWidgetCompositor(Endpoint&& aEndpoint,
const CSSToLayoutDeviceScale& aScale,
const TimeDuration& aVsyncRate,
+ const CompositorOptions& aOptions,
const bool& aUseExternalSurfaceSize,
const IntSize& aSurfaceSize)
{
RefPtr cbp =
- new CompositorBridgeParent(aScale, aVsyncRate, aUseExternalSurfaceSize, aSurfaceSize);
+ new CompositorBridgeParent(aScale, aVsyncRate, aOptions, aUseExternalSurfaceSize, aSurfaceSize);
MessageLoop* loop = CompositorThreadHolder::Loop();
loop->PostTask(NewRunnableFunction(OpenParent, cbp, Move(aEndpoint)));
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUParent.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUParent.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUParent.h 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUParent.h 2017-01-16 00:56:49.000000000 +0000
@@ -42,6 +42,7 @@
Endpoint&& aEndpoint,
const CSSToLayoutDeviceScale& aScale,
const TimeDuration& aVsyncRate,
+ const CompositorOptions& aOptions,
const bool& aUseExternalSurface,
const IntSize& aSurfaceSize) override;
mozilla::ipc::IPCResult RecvNewContentCompositorBridge(Endpoint&& aEndpoint) override;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUProcessManager.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUProcessManager.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUProcessManager.cpp 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUProcessManager.cpp 2017-01-16 00:56:49.000000000 +0000
@@ -12,6 +12,7 @@
#include "mozilla/layers/APZCTreeManager.h"
#include "mozilla/layers/APZCTreeManagerChild.h"
#include "mozilla/layers/CompositorBridgeParent.h"
+#include "mozilla/layers/CompositorOptions.h"
#include "mozilla/layers/ImageBridgeChild.h"
#include "mozilla/layers/ImageBridgeParent.h"
#include "mozilla/layers/InProcessCompositorSession.h"
@@ -487,7 +488,7 @@
GPUProcessManager::CreateTopLevelCompositor(nsBaseWidget* aWidget,
LayerManager* aLayerManager,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize)
{
@@ -503,7 +504,7 @@
aLayerManager,
layerTreeId,
aScale,
- aUseAPZ,
+ aOptions,
aUseExternalSurfaceSize,
aSurfaceSize);
if (session) {
@@ -519,7 +520,7 @@
aLayerManager,
layerTreeId,
aScale,
- aUseAPZ,
+ aOptions,
aUseExternalSurfaceSize,
aSurfaceSize);
}
@@ -529,7 +530,7 @@
LayerManager* aLayerManager,
const uint64_t& aRootLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize)
{
@@ -566,6 +567,7 @@
Move(parentPipe),
aScale,
vsyncRate,
+ aOptions,
aUseExternalSurfaceSize,
aSurfaceSize);
if (!ok) {
@@ -585,7 +587,7 @@
}
RefPtr apz = nullptr;
- if (aUseAPZ) {
+ if (aOptions.UseAPZ()) {
PAPZCTreeManagerChild* papz = child->SendPAPZCTreeManagerConstructor(0);
if (!papz) {
return nullptr;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUProcessManager.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUProcessManager.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/GPUProcessManager.h 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/GPUProcessManager.h 2017-01-16 00:56:49.000000000 +0000
@@ -24,6 +24,7 @@
namespace mozilla {
namespace layers {
class IAPZCTreeManager;
+class CompositorOptions;
class CompositorSession;
class CompositorUpdateObserver;
class PCompositorBridgeChild;
@@ -56,6 +57,7 @@
{
friend class layers::RemoteCompositorSession;
+ typedef layers::CompositorOptions CompositorOptions;
typedef layers::CompositorSession CompositorSession;
typedef layers::CompositorUpdateObserver CompositorUpdateObserver;
typedef layers::IAPZCTreeManager IAPZCTreeManager;
@@ -83,7 +85,7 @@
nsBaseWidget* aWidget,
LayerManager* aLayerManager,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize);
@@ -197,7 +199,7 @@
LayerManager* aLayerManager,
const uint64_t& aRootLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/InProcessCompositorSession.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/InProcessCompositorSession.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/InProcessCompositorSession.cpp 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/InProcessCompositorSession.cpp 2017-01-16 00:56:49.000000000 +0000
@@ -27,17 +27,17 @@
LayerManager* aLayerManager,
const uint64_t& aRootLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize)
{
CompositorWidgetInitData initData;
aWidget->GetCompositorWidgetInitData(&initData);
- RefPtr widget = CompositorWidget::CreateLocal(initData, aWidget);
+ RefPtr widget = CompositorWidget::CreateLocal(initData, aOptions, aWidget);
RefPtr child = new CompositorBridgeChild(aLayerManager);
RefPtr parent =
- child->InitSameProcess(widget, aRootLayerTreeId, aScale, aUseAPZ, aUseExternalSurfaceSize, aSurfaceSize);
+ child->InitSameProcess(widget, aRootLayerTreeId, aScale, aOptions, aUseExternalSurfaceSize, aSurfaceSize);
return new InProcessCompositorSession(widget, child, parent);
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/InProcessCompositorSession.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/InProcessCompositorSession.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/InProcessCompositorSession.h 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/InProcessCompositorSession.h 2017-01-16 00:56:49.000000000 +0000
@@ -13,6 +13,8 @@
namespace mozilla {
namespace layers {
+class CompositorOptions;
+
// A CompositorSession where both the child and parent CompositorBridge reside
// in the same process.
class InProcessCompositorSession final : public CompositorSession
@@ -23,7 +25,7 @@
LayerManager* aLayerManager,
const uint64_t& aRootLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/moz.build firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/moz.build
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/moz.build 2017-01-13 00:58:11.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/moz.build 2017-01-16 00:56:54.000000000 +0000
@@ -23,6 +23,7 @@
]
EXPORTS.mozilla.layers += [
+ 'CompositorOptions.h',
'CompositorSession.h',
'InProcessCompositorSession.h',
'RemoteCompositorSession.h',
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/PGPU.ipdl firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/PGPU.ipdl
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/ipc/PGPU.ipdl 2017-01-13 00:58:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/ipc/PGPU.ipdl 2017-01-16 00:56:49.000000000 +0000
@@ -14,6 +14,7 @@
using mozilla::TimeDuration from "mozilla/TimeStamp.h";
using mozilla::CSSToLayoutDeviceScale from "Units.h";
using mozilla::gfx::IntSize from "mozilla/gfx/2D.h";
+using mozilla::layers::CompositorOptions from "mozilla/layers/CompositorOptions.h";
using mozilla::Telemetry::Accumulation from "mozilla/TelemetryComms.h";
using mozilla::Telemetry::KeyedAccumulation from "mozilla/TelemetryComms.h";
@@ -58,6 +59,7 @@
async NewWidgetCompositor(Endpoint endpoint,
CSSToLayoutDeviceScale scale,
TimeDuration vsyncRate,
+ CompositorOptions options,
bool useExternalSurface,
IntSize surfaceSize);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/composite/ContainerLayerComposite.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/composite/ContainerLayerComposite.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/composite/ContainerLayerComposite.h 2017-01-13 00:59:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/composite/ContainerLayerComposite.h 2017-01-16 00:58:09.000000000 +0000
@@ -70,11 +70,6 @@
LayerComposite::SetLayerManager(aManager);
mManager = aManager;
mLastIntermediateSurface = nullptr;
-
- for (Layer* l = GetFirstChild(); l; l = l->GetNextSibling()) {
- HostLayer* child = l->AsHostLayer();
- child->SetLayerManager(aManager);
- }
}
virtual void Destroy() override;
@@ -167,6 +162,13 @@
/** LayerOGL implementation */
Layer* GetLayer() override { return this; }
+ virtual void SetLayerManager(HostLayerManager* aManager) override
+ {
+ LayerComposite::SetLayerManager(aManager);
+ mManager = aManager;
+ mLastIntermediateSurface = nullptr;
+ }
+
void Destroy() override;
LayerComposite* GetFirstChildComposite() override;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/composite/LayerManagerComposite.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/composite/LayerManagerComposite.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/composite/LayerManagerComposite.cpp 2017-01-13 00:59:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/composite/LayerManagerComposite.cpp 2017-01-16 00:58:09.000000000 +0000
@@ -1409,7 +1409,7 @@
LayerManagerComposite::AsyncPanZoomEnabled() const
{
if (CompositorBridgeParent* bridge = mCompositor->GetCompositorBridgeParent()) {
- return bridge->AsyncPanZoomEnabled();
+ return bridge->GetOptions().UseAPZ();
}
return false;
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ImageContainer.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ImageContainer.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ImageContainer.cpp 2017-01-13 00:58:11.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ImageContainer.cpp 2017-01-16 00:56:55.000000000 +0000
@@ -97,6 +97,32 @@
mRecycledBufferSize = 0;
}
+ImageContainerListener::ImageContainerListener(ImageContainer* aImageContainer)
+ : mLock("mozilla.layers.ImageContainerListener.mLock")
+ , mImageContainer(aImageContainer)
+{
+}
+
+ImageContainerListener::~ImageContainerListener()
+{
+}
+
+void
+ImageContainerListener::NotifyComposite(const ImageCompositeNotification& aNotification)
+{
+ MutexAutoLock lock(mLock);
+ if (mImageContainer) {
+ mImageContainer->NotifyComposite(aNotification);
+ }
+}
+
+void
+ImageContainerListener::ClearImageContainer()
+{
+ MutexAutoLock lock(mLock);
+ mImageContainer = nullptr;
+}
+
void
ImageContainer::EnsureImageClient(bool aCreate)
{
@@ -111,6 +137,7 @@
mImageClient = imageBridge->CreateImageClient(CompositableType::IMAGE, this);
if (mImageClient) {
mAsyncContainerID = mImageClient->GetAsyncID();
+ mNotifyCompositeListener = new ImageContainerListener(this);
}
}
}
@@ -146,6 +173,9 @@
ImageContainer::~ImageContainer()
{
+ if (mNotifyCompositeListener) {
+ mNotifyCompositeListener->ClearImageContainer();
+ }
if (mAsyncContainerID) {
if (RefPtr imageBridge = ImageBridgeChild::GetSingleton()) {
imageBridge->ForgetImageContainer(mAsyncContainerID);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ImageContainer.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ImageContainer.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ImageContainer.h 2017-01-13 00:58:11.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ImageContainer.h 2017-01-16 00:56:55.000000000 +0000
@@ -145,6 +145,7 @@
class ImageClient;
class ImageCompositeNotification;
+class ImageContainer;
class ImageContainerChild;
class PImageContainerChild;
class SharedPlanarYCbCrImage;
@@ -323,6 +324,24 @@
const gfx::IntSize& aScaleHint,
BufferRecycleBin *aRecycleBin);
};
+
+// Used to notify ImageContainer::NotifyComposite()
+class ImageContainerListener final {
+ NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ImageContainerListener)
+
+public:
+ explicit ImageContainerListener(ImageContainer* aImageContainer);
+
+ void NotifyComposite(const ImageCompositeNotification& aNotification);
+ void ClearImageContainer();
+private:
+ typedef mozilla::Mutex Mutex;
+
+ ~ImageContainerListener();
+
+ Mutex mLock;
+ ImageContainer* mImageContainer;
+};
/**
* A class that manages Images for an ImageLayer. The only reason
@@ -566,6 +585,11 @@
PImageContainerChild* GetPImageContainerChild();
+ ImageContainerListener* GetImageContainerListener()
+ {
+ return mNotifyCompositeListener;
+ }
+
/**
* Main thread only.
*/
@@ -632,6 +656,8 @@
// mFrameIDsNotYetComposited
ProducerID mCurrentProducerID;
+ RefPtr mNotifyCompositeListener;
+
static mozilla::Atomic sGenerationCounter;
};
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeChild.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeChild.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeChild.cpp 2017-01-13 01:00:08.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeChild.cpp 2017-01-16 00:58:26.000000000 +0000
@@ -234,7 +234,7 @@
CompositorBridgeChild::InitSameProcess(widget::CompositorWidget* aWidget,
const uint64_t& aLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurface,
const gfx::IntSize& aSurfaceSize)
{
@@ -242,7 +242,7 @@
gfxPlatform::GetPlatform()->GetHardwareVsync()->GetGlobalDisplay().GetVsyncRate();
mCompositorBridgeParent =
- new CompositorBridgeParent(aScale, vsyncRate, aUseExternalSurface, aSurfaceSize);
+ new CompositorBridgeParent(aScale, vsyncRate, aOptions, aUseExternalSurface, aSurfaceSize);
bool ok = Open(mCompositorBridgeParent->GetIPCChannel(),
CompositorThreadHolder::Loop(),
@@ -250,7 +250,7 @@
MOZ_RELEASE_ASSERT(ok);
InitIPDL();
- mCompositorBridgeParent->InitSameProcess(aWidget, aLayerTreeId, aUseAPZ);
+ mCompositorBridgeParent->InitSameProcess(aWidget, aLayerTreeId);
return mCompositorBridgeParent;
}
@@ -1088,14 +1088,6 @@
#endif
}
-bool
-CompositorBridgeChild::GetAPZEnabled(uint64_t aLayerTreeId)
-{
- bool result = false;
- Unused << SendAsyncPanZoomEnabled(aLayerTreeId, &result);
- return result;
-}
-
PAPZCTreeManagerChild*
CompositorBridgeChild::AllocPAPZCTreeManagerChild(const uint64_t& aLayersId)
{
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeChild.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeChild.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeChild.h 2017-01-13 01:00:08.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeChild.h 2017-01-16 00:58:26.000000000 +0000
@@ -38,6 +38,7 @@
class APZCTreeManagerChild;
class ClientLayerManager;
class CompositorBridgeParent;
+class CompositorOptions;
class TextureClient;
class TextureClientPool;
struct FrameMetrics;
@@ -80,7 +81,7 @@
widget::CompositorWidget* aWidget,
const uint64_t& aLayerTreeId,
CSSToLayoutDeviceScale aScale,
- bool aUseAPZ,
+ const CompositorOptions& aOptions,
bool aUseExternalSurface,
const gfx::IntSize& aSurfaceSize);
@@ -220,8 +221,6 @@
PCompositorWidgetChild* AllocPCompositorWidgetChild(const CompositorWidgetInitData& aInitData) override;
bool DeallocPCompositorWidgetChild(PCompositorWidgetChild* aActor) override;
- bool GetAPZEnabled(uint64_t aLayerTreeId);
-
PAPZCTreeManagerChild* AllocPAPZCTreeManagerChild(const uint64_t& aLayersId) override;
bool DeallocPAPZCTreeManagerChild(PAPZCTreeManagerChild* aActor) override;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeParent.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeParent.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeParent.cpp 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeParent.cpp 2017-01-16 00:58:26.000000000 +0000
@@ -289,6 +289,7 @@
CompositorBridgeParent::CompositorBridgeParent(CSSToLayoutDeviceScale aScale,
const TimeDuration& aVsyncRate,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize)
: mWidget(nullptr)
@@ -299,6 +300,7 @@
, mPaused(false)
, mUseExternalSurfaceSize(aUseExternalSurfaceSize)
, mEGLSurfaceSize(aSurfaceSize)
+ , mOptions(aOptions)
, mPauseCompositionMonitor("PauseCompositionMonitor")
, mResumeCompositionMonitor("ResumeCompositionMonitor")
, mResetCompositorMonitor("ResetCompositorMonitor")
@@ -320,12 +322,11 @@
void
CompositorBridgeParent::InitSameProcess(widget::CompositorWidget* aWidget,
- const uint64_t& aLayerTreeId,
- bool aUseAPZ)
+ const uint64_t& aLayerTreeId)
{
mWidget = aWidget;
mRootLayerTreeID = aLayerTreeId;
- if (aUseAPZ) {
+ if (mOptions.UseAPZ()) {
mApzcTreeManager = new APZCTreeManager();
}
@@ -1046,6 +1047,9 @@
PAPZCTreeManagerParent*
CompositorBridgeParent::AllocPAPZCTreeManagerParent(const uint64_t& aLayersId)
{
+ // We should only ever get this if APZ is enabled in this compositor.
+ MOZ_ASSERT(mOptions.UseAPZ());
+
// The main process should pass in 0 because we assume mRootLayerTreeID
MOZ_ASSERT(aLayersId == 0);
@@ -1098,11 +1102,12 @@
}
mozilla::ipc::IPCResult
-CompositorBridgeParent::RecvAsyncPanZoomEnabled(const uint64_t& aLayersId, bool* aHasAPZ)
+CompositorBridgeParent::RecvGetCompositorOptions(const uint64_t& aLayersId,
+ CompositorOptions* aOptions)
{
// The main process should pass in 0 because we assume mRootLayerTreeID
MOZ_ASSERT(aLayersId == 0);
- *aHasAPZ = AsyncPanZoomEnabled();
+ *aOptions = mOptions;
return IPC_OK();
}
@@ -1521,10 +1526,7 @@
MonitorAutoLock lock(*sIndirectLayerTreesLock);
NotifyChildCreated(child);
if (sIndirectLayerTrees[child].mLayerTree) {
- sIndirectLayerTrees[child].mLayerTree->mLayerManager = mLayerManager;
- }
- if (sIndirectLayerTrees[child].mRoot) {
- sIndirectLayerTrees[child].mRoot->AsHostLayer()->SetLayerManager(static_cast(mLayerManager.get()));
+ sIndirectLayerTrees[child].mLayerTree->SetLayerManager(mLayerManager);
}
parent = sIndirectLayerTrees[child].mApzcTreeManagerParent;
}
@@ -1651,7 +1653,7 @@
}
widget::CompositorWidgetParent* widget =
- new widget::CompositorWidgetParent(aInitData);
+ new widget::CompositorWidgetParent(aInitData, mOptions);
widget->AddRef();
// Sending the constructor acts as initialization as well.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeParent.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeParent.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CompositorBridgeParent.h 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CompositorBridgeParent.h 2017-01-16 00:58:26.000000000 +0000
@@ -28,6 +28,7 @@
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/ipc/SharedMemory.h"
#include "mozilla/layers/CompositorController.h"
+#include "mozilla/layers/CompositorOptions.h"
#include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
#include "mozilla/layers/GeckoContentController.h"
#include "mozilla/layers/ISurfaceAllocator.h" // for ShmemAllocator
@@ -155,6 +156,7 @@
explicit CompositorBridgeParent(CSSToLayoutDeviceScale aScale,
const TimeDuration& aVsyncRate,
+ const CompositorOptions& aOptions,
bool aUseExternalSurfaceSize,
const gfx::IntSize& aSurfaceSize);
@@ -162,8 +164,7 @@
// IPC channel is active and RecvWillStop/ActorDestroy must be called to
// free the compositor.
void InitSameProcess(widget::CompositorWidget* aWidget,
- const uint64_t& aLayerTreeId,
- bool aUseAPZ);
+ const uint64_t& aLayerTreeId);
// Must only be called by GPUParent. After invoking this, the IPC channel
// is active and RecvWillStop/ActorDestroy must be called to free the
@@ -431,12 +432,13 @@
PAPZParent* AllocPAPZParent(const uint64_t& aLayersId) override;
bool DeallocPAPZParent(PAPZParent* aActor) override;
- mozilla::ipc::IPCResult RecvAsyncPanZoomEnabled(const uint64_t& aLayersId, bool* aHasAPZ) override;
+ mozilla::ipc::IPCResult RecvGetCompositorOptions(const uint64_t& aLayersId,
+ CompositorOptions* aOptions) override;
RefPtr GetAPZCTreeManager();
- bool AsyncPanZoomEnabled() const {
- return !!mApzcTreeManager;
+ CompositorOptions GetOptions() const {
+ return mOptions;
}
private:
@@ -549,6 +551,8 @@
bool mUseExternalSurfaceSize;
gfx::IntSize mEGLSurfaceSize;
+ CompositorOptions mOptions;
+
mozilla::Monitor mPauseCompositionMonitor;
mozilla::Monitor mResumeCompositionMonitor;
mozilla::Monitor mResetCompositorMonitor;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp 2017-01-16 00:58:26.000000000 +0000
@@ -15,6 +15,7 @@
#include "mozilla/layers/APZCTreeManagerParent.h" // for APZCTreeManagerParent
#include "mozilla/layers/APZThreadUtils.h" // for APZCTreeManager
#include "mozilla/layers/AsyncCompositionManager.h"
+#include "mozilla/layers/CompositorOptions.h"
#include "mozilla/layers/CompositorThread.h"
#include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/layers/LayerTreeOwnerTracker.h"
@@ -109,18 +110,21 @@
}
mozilla::ipc::IPCResult
-CrossProcessCompositorBridgeParent::RecvAsyncPanZoomEnabled(const uint64_t& aLayersId, bool* aHasAPZ)
+CrossProcessCompositorBridgeParent::RecvGetCompositorOptions(const uint64_t& aLayersId,
+ CompositorOptions* aOptions)
{
// Check to see if this child process has access to this layer tree.
if (!LayerTreeOwnerTracker::Get()->IsMapped(aLayersId, OtherPid())) {
- NS_ERROR("Unexpected layers id in RecvAsyncPanZoomEnabled; dropping message...");
+ NS_ERROR("Unexpected layers id in RecvGetCompositorOptions; dropping message...");
return IPC_FAIL_NO_REASON(this);
}
MonitorAutoLock lock(*sIndirectLayerTreesLock);
CompositorBridgeParent::LayerTreeState& state = sIndirectLayerTrees[aLayersId];
- *aHasAPZ = state.mParent ? state.mParent->AsyncPanZoomEnabled() : false;
+ if (state.mParent) {
+ *aOptions = state.mParent->GetOptions();
+ }
return IPC_OK();
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h 2017-01-16 00:58:26.000000000 +0000
@@ -13,6 +13,8 @@
namespace mozilla {
namespace layers {
+class CompositorOptions;
+
/**
* This class handles layer updates pushed directly from child processes to
* the compositor thread. It's associated with a CompositorBridgeParent on the
@@ -137,7 +139,7 @@
return false;
}
- virtual mozilla::ipc::IPCResult RecvAsyncPanZoomEnabled(const uint64_t& aLayersId, bool* aHasAPZ) override;
+ virtual mozilla::ipc::IPCResult RecvGetCompositorOptions(const uint64_t& aLayersId, CompositorOptions* aOptions) override;
virtual PAPZCTreeManagerParent* AllocPAPZCTreeManagerParent(const uint64_t& aLayersId) override;
virtual bool DeallocPAPZCTreeManagerParent(PAPZCTreeManagerParent* aActor) override;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/ImageBridgeChild.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/ImageBridgeChild.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/ImageBridgeChild.cpp 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/ImageBridgeChild.cpp 2017-01-16 00:58:26.000000000 +0000
@@ -1105,13 +1105,17 @@
ImageBridgeChild::RecvDidComposite(InfallibleTArray&& aNotifications)
{
for (auto& n : aNotifications) {
- RefPtr imageContainer;
+ RefPtr listener;
{
MutexAutoLock lock(mContainerMapLock);
+ ImageContainer* imageContainer;
imageContainer = mImageContainers.Get(n.asyncCompositableID());
+ if (imageContainer) {
+ listener = imageContainer->GetImageContainerListener();
+ }
}
- if (imageContainer) {
- imageContainer->NotifyComposite(n);
+ if (listener) {
+ listener->NotifyComposite(n);
}
}
return IPC_OK();
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/LayerTransactionParent.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/LayerTransactionParent.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/LayerTransactionParent.cpp 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/LayerTransactionParent.cpp 2017-01-16 00:58:27.000000000 +0000
@@ -70,6 +70,16 @@
{
}
+void
+LayerTransactionParent::SetLayerManager(HostLayerManager* aLayerManager)
+{
+ mLayerManager = aLayerManager;
+ for (auto iter = mLayerMap.Iter(); !iter.Done(); iter.Next()) {
+ auto layer = iter.Data();
+ layer->AsHostLayer()->SetLayerManager(aLayerManager);
+ }
+}
+
mozilla::ipc::IPCResult
LayerTransactionParent::RecvShutdown()
{
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/LayerTransactionParent.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/LayerTransactionParent.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/LayerTransactionParent.h 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/LayerTransactionParent.h 2017-01-16 00:58:27.000000000 +0000
@@ -58,6 +58,8 @@
HostLayerManager* layer_manager() const { return mLayerManager; }
+ void SetLayerManager(HostLayerManager* aLayerManager);
+
uint64_t GetId() const { return mId; }
Layer* GetRoot() const { return mRoot; }
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/PCompositorBridge.ipdl firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/PCompositorBridge.ipdl
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/PCompositorBridge.ipdl 2017-01-13 01:00:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/PCompositorBridge.ipdl 2017-01-16 00:58:27.000000000 +0000
@@ -33,6 +33,7 @@
using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
using class mozilla::layers::FrameUniformityData from "mozilla/layers/FrameUniformityData.h";
using mozilla::layers::TextureFlags from "mozilla/layers/CompositorTypes.h";
+using mozilla::layers::CompositorOptions from "mozilla/layers/CompositorOptions.h";
namespace mozilla {
namespace layers {
@@ -128,8 +129,8 @@
sync Reset(LayersBackend[] aBackendHints, uint64_t aSeqNo)
returns (bool aResult, TextureFactoryIdentifier aOutIdentifier);
- // Returns whether this Compositor has APZ enabled or not.
- sync AsyncPanZoomEnabled(uint64_t layersId) returns (bool aHasAPZ);
+ // Returns the CompositorOptions for this compositor.
+ sync GetCompositorOptions(uint64_t layersId) returns (CompositorOptions aOptions);
// Must be called after Initialize(), and only succeeds if AsyncPanZoomEnabled() is true.
async PAPZ(uint64_t layersId);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/ShadowLayers.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/ShadowLayers.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/layers/ipc/ShadowLayers.cpp 2017-01-13 01:00:10.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/layers/ipc/ShadowLayers.cpp 2017-01-16 00:58:27.000000000 +0000
@@ -51,7 +51,7 @@
class ClientTiledLayerBuffer;
typedef nsTArray BufferArray;
-typedef std::vector EditVector;
+typedef nsTArray EditVector;
typedef nsTHashtable> ShadowableLayerSet;
typedef nsTArray OpDestroyVector;
@@ -87,7 +87,7 @@
void AddEdit(const Edit& aEdit)
{
MOZ_ASSERT(!Finished(), "forgot BeginTransaction?");
- mCset.push_back(aEdit);
+ mCset.AppendElement(aEdit);
}
void AddEdit(const CompositableOperation& aEdit)
{
@@ -107,12 +107,12 @@
void AddNoSwapPaint(const Edit& aPaint)
{
MOZ_ASSERT(!Finished(), "forgot BeginTransaction?");
- mPaints.push_back(aPaint);
+ mPaints.AppendElement(aPaint);
}
void AddNoSwapPaint(const CompositableOperation& aPaint)
{
MOZ_ASSERT(!Finished(), "forgot BeginTransaction?");
- mPaints.push_back(Edit(aPaint));
+ mPaints.AppendElement(Edit(aPaint));
}
void AddMutant(ShadowableLayer* aLayer)
{
@@ -121,8 +121,8 @@
}
void End()
{
- mCset.clear();
- mPaints.clear();
+ mCset.Clear();
+ mPaints.Clear();
mMutants.Clear();
mDestroyedActors.Clear();
mOpen = false;
@@ -131,7 +131,7 @@
}
bool Empty() const {
- return mCset.empty() && mPaints.empty() && mMutants.IsEmpty()
+ return mCset.IsEmpty() && mPaints.IsEmpty() && mMutants.IsEmpty()
&& mDestroyedActors.IsEmpty();
}
bool RotationChanged() const {
@@ -603,7 +603,7 @@
return true;
}
- if (!mTxn->mPaints.empty()) {
+ if (!mTxn->mPaints.IsEmpty()) {
// With some platforms, telling the drawing backend that there will be no more
// drawing for this frame helps with preventing command queues from spanning
// across multiple frames.
@@ -694,24 +694,22 @@
mTxn->AddEdit(OpSetLayerAttributes(Shadow(shadow), attrs));
}
- size_t nCsets = mTxn->mCset.size() + mTxn->mPaints.size();
- if (nCsets == 0 && !mTxn->RotationChanged()) {
+ if (mTxn->mCset.IsEmpty() &&
+ mTxn->mPaints.IsEmpty() &&
+ !mTxn->RotationChanged())
+ {
return true;
}
- auto& cset = info.cset();
- cset.SetCapacity(nCsets);
- if (!mTxn->mCset.empty()) {
- cset.AppendElements(&mTxn->mCset.front(), mTxn->mCset.size());
- }
// Paints after non-paint ops, including attribute changes. See
// above.
- if (!mTxn->mPaints.empty()) {
- cset.AppendElements(&mTxn->mPaints.front(), mTxn->mPaints.size());
+ if (!mTxn->mPaints.IsEmpty()) {
+ mTxn->mCset.AppendElements(mTxn->mPaints);
}
mWindowOverlayChanged = false;
+ info.cset() = Move(mTxn->mCset);
info.toDestroy() = mTxn->mDestroyedActors;
info.fwdTransactionId() = GetFwdTransactionId();
info.id() = aId;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/skia/skia/src/core/SkScan_Path.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/skia/skia/src/core/SkScan_Path.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/skia/skia/src/core/SkScan_Path.cpp 2017-01-13 01:02:12.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/skia/skia/src/core/SkScan_Path.cpp 2017-01-16 01:00:11.000000000 +0000
@@ -603,6 +603,19 @@
return (int)floorXX - (xx == floorXX);
}
+#ifdef SK_RASTERIZE_EVEN_ROUNDING
+/**
+ * Variant of SkDScalarRoundToInt that allows offseting the input by a small fraction
+ * while trying to preserve intermediate double-precision (rather than directly adding
+ * the bias to the input at lower single-precision).
+ */
+static inline int round_biased_to_int(SkScalar x, SkScalar bias) {
+ double xx = x;
+ xx += 0.5 + bias;
+ return (int)floor(xx);
+}
+#endif
+
/**
* Variant of SkRect::round() that explicitly performs the rounding step (i.e. floor(x + 0.5))
* using double instead of SkScalar (float). It does this by calling SkDScalarRoundToInt(),
@@ -620,11 +633,28 @@
* SkASSERT(0 == iright); // <--- fails
* iright = SkDScalarRoundToInt(right);
* SkASSERT(0 == iright); // <--- succeeds
+ *
+ *
+ * If using SK_RASTERIZE_EVEN_ROUNDING, we need to ensure that bottom and right account for
+ * edges bounded by this rect being rounded to FDot6 format before being later rounded to an
+ * integer. For example, a value like 0.499 can be below 0.5, but round to 0.5 as FDot6, which
+ * would finally round to the integer 1, instead of just rounding to 0.
+ *
+ * To handle this, a small bias of half an FDot6 increment is added before actually rounding to
+ * an integer value. This simulates the rounding of SkScalarRoundToFDot6 without incurring the
+ * range loss of converting to FDot6 format first, preserving the integer range for the SkIRect.
+ * Thus, bottom and right are rounded in this manner (biased up), ensuring the rect is large enough.
+ * Top and left can round as normal since they will round (biased down) to values less or equal
+ * to the desired rect origin.
*/
static void round_asymmetric_to_int(const SkRect& src, SkIRect* dst) {
SkASSERT(dst);
dst->set(round_down_to_int(src.fLeft), round_down_to_int(src.fTop),
+#ifdef SK_RASTERIZE_EVEN_ROUNDING
+ round_biased_to_int(src.fRight, 0.5f / SK_FDot6One), round_biased_to_int(src.fBottom, 0.5f / SK_FDot6One));
+#else
SkDScalarRoundToInt(src.fRight), SkDScalarRoundToInt(src.fBottom));
+#endif
}
void SkScan::FillPath(const SkPath& path, const SkRegion& origClip,
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/tests/crashtests/crashtests.list firefox-trunk-53.0~a1~hg20170115r329516/gfx/tests/crashtests/crashtests.list
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/tests/crashtests/crashtests.list 2017-01-13 01:04:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/tests/crashtests/crashtests.list 2017-01-16 01:02:56.000000000 +0000
@@ -90,7 +90,7 @@
load 593526.xul
load 594654-1.xhtml
load 595042-1.html
-skip-if(stylo) load 595727-1.html # bug 1323671
+load 595727-1.html
load 624198.xhtml
load 633322-1.html
load 633453-1.html
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/tests/gtest/TestCompositor.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/tests/gtest/TestCompositor.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/tests/gtest/TestCompositor.cpp 2017-01-13 01:04:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/tests/gtest/TestCompositor.cpp 2017-01-16 01:02:56.000000000 +0000
@@ -153,7 +153,8 @@
auto backend = aBackends[i];
RefPtr widget = new MockWidget();
- RefPtr proxy = new widget::InProcessCompositorWidget(widget);
+ CompositorOptions options;
+ RefPtr proxy = new widget::InProcessCompositorWidget(options, widget);
RefPtr compositor = CreateTestCompositor(backend, proxy);
RefPtr layerManager = new LayerManagerComposite(compositor);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/thebes/gfxFcPlatformFontList.cpp firefox-trunk-53.0~a1~hg20170115r329516/gfx/thebes/gfxFcPlatformFontList.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/thebes/gfxFcPlatformFontList.cpp 2017-01-13 01:04:38.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/thebes/gfxFcPlatformFontList.cpp 2017-01-16 01:03:39.000000000 +0000
@@ -644,6 +644,7 @@
cairo_scaled_font_t*
gfxFontconfigFontEntry::CreateScaledFont(FcPattern* aRenderPattern,
+ gfxFloat aAdjustedSize,
const gfxFontStyle *aStyle,
bool aNeedsBold)
{
@@ -681,11 +682,7 @@
cairo_matrix_t sizeMatrix;
cairo_matrix_t identityMatrix;
- double adjustedSize = aStyle->size;
- if (aStyle->sizeAdjust >= 0.0) {
- adjustedSize = aStyle->GetAdjustedSize(GetAspect());
- }
- cairo_matrix_init_scale(&sizeMatrix, adjustedSize, adjustedSize);
+ cairo_matrix_init_scale(&sizeMatrix, aAdjustedSize, aAdjustedSize);
cairo_matrix_init_identity(&identityMatrix);
if (needsOblique) {
@@ -809,10 +806,16 @@
return nullptr;
}
+ double adjustedSize = aFontStyle->size;
+ if (aFontStyle->sizeAdjust >= 0.0) {
+ adjustedSize = aFontStyle->GetAdjustedSize(GetAspect());
+ }
+
cairo_scaled_font_t* scaledFont =
- CreateScaledFont(renderPattern, aFontStyle, aNeedsBold);
+ CreateScaledFont(renderPattern, adjustedSize, aFontStyle, aNeedsBold);
gfxFont* newFont =
- new gfxFontconfigFont(scaledFont, renderPattern, this, aFontStyle, aNeedsBold);
+ new gfxFontconfigFont(scaledFont, renderPattern, adjustedSize,
+ this, aFontStyle, aNeedsBold);
cairo_scaled_font_destroy(scaledFont);
return newFont;
@@ -925,11 +928,13 @@
gfxFontconfigFont::gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
FcPattern *aPattern,
+ gfxFloat aAdjustedSize,
gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle,
bool aNeedsBold) :
gfxFontconfigFontBase(aScaledFont, aPattern, aFontEntry, aFontStyle)
{
+ mAdjustedSize = aAdjustedSize;
}
gfxFontconfigFont::~gfxFontconfigFont()
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/thebes/gfxFcPlatformFontList.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/thebes/gfxFcPlatformFontList.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/thebes/gfxFcPlatformFontList.h 2017-01-13 01:04:38.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/thebes/gfxFcPlatformFontList.h 2017-01-16 01:03:39.000000000 +0000
@@ -133,6 +133,7 @@
// helper method for creating cairo font from pattern
cairo_scaled_font_t*
CreateScaledFont(FcPattern* aRenderPattern,
+ gfxFloat aAdjustedSize,
const gfxFontStyle *aStyle,
bool aNeedsBold);
@@ -199,6 +200,7 @@
public:
gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
FcPattern *aPattern,
+ gfxFloat aAdjustedSize,
gfxFontEntry *aFontEntry,
const gfxFontStyle *aFontStyle,
bool aNeedsBold);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/gfx/vr/gfxVR.h firefox-trunk-53.0~a1~hg20170115r329516/gfx/vr/gfxVR.h
--- firefox-trunk-53.0~a1~hg20170113r329171/gfx/vr/gfxVR.h 2017-01-13 01:05:13.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/gfx/vr/gfxVR.h 2017-01-16 01:04:33.000000000 +0000
@@ -21,8 +21,8 @@
class PTextureParent;
}
namespace dom {
-enum class GamepadMappingType : uint32_t;
-enum class GamepadHand : uint32_t;
+enum class GamepadMappingType : uint8_t;
+enum class GamepadHand : uint8_t;
struct GamepadPoseState;
}
namespace gfx {
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/ipc/chromium/src/base/message_pump_default.cc firefox-trunk-53.0~a1~hg20170115r329516/ipc/chromium/src/base/message_pump_default.cc
--- firefox-trunk-53.0~a1~hg20170113r329171/ipc/chromium/src/base/message_pump_default.cc 2017-01-13 01:14:31.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/ipc/chromium/src/base/message_pump_default.cc 2017-01-16 01:14:18.000000000 +0000
@@ -58,7 +58,7 @@
PROFILER_LABEL("MessagePump", "Wait",
js::ProfileEntry::Category::OTHER);
{
- GeckoProfilerSleepRAII profiler_sleep;
+ mozilla::GeckoProfilerSleepRAII profiler_sleep;
event_.Wait();
}
} else {
@@ -68,7 +68,7 @@
PROFILER_LABEL("MessagePump", "Wait",
js::ProfileEntry::Category::OTHER);
{
- GeckoProfilerSleepRAII profiler_sleep;
+ mozilla::GeckoProfilerSleepRAII profiler_sleep;
event_.TimedWait(delay);
}
} else {
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/ipc/chromium/src/base/process_util_win.cc firefox-trunk-53.0~a1~hg20170115r329516/ipc/chromium/src/base/process_util_win.cc
--- firefox-trunk-53.0~a1~hg20170113r329171/ipc/chromium/src/base/process_util_win.cc 2017-01-13 01:14:32.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/ipc/chromium/src/base/process_util_win.cc 2017-01-16 01:14:18.000000000 +0000
@@ -19,9 +19,6 @@
#include "base/win_util.h"
#include
-#include "prenv.h"
-
-#include "mozilla/WindowsVersion.h"
namespace {
@@ -280,13 +277,11 @@
// We want to inherit the std handles so dump() statements and assertion
// messages in the child process can be seen - but we *do not* want to
// blindly have all handles inherited. Vista and later has a technique
- // where only specified handles are inherited - so we use this technique if
- // we can. If that technique isn't available (or it fails), we just don't
- // inherit anything. This can cause us a problem for Windows XP testing,
- // because we sometimes need the handles to get inherited for test logging to
- // work. So we also inherit when a specific environment variable is set.
+ // where only specified handles are inherited - so we use this technique.
+ // If that fails we just don't inherit anything.
DWORD dwCreationFlags = 0;
BOOL bInheritHandles = FALSE;
+
// We use a STARTUPINFOEX, but if we can't do the thread attribute thing, we
// just pass the size of a STARTUPINFO.
STARTUPINFOEX startup_info_ex;
@@ -302,40 +297,29 @@
HANDLE handlesToInherit[2];
int handleCount = 0;
- // Don't even bother trying pre-Vista...
- if (mozilla::IsVistaOrLater()) {
- // setup our handle array first - if we end up with no handles that can
- // be inherited we can avoid trying to do the ThreadAttributeList dance...
- HANDLE stdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
- HANDLE stdErr = ::GetStdHandle(STD_ERROR_HANDLE);
-
- if (IsInheritableHandle(stdOut))
- handlesToInherit[handleCount++] = stdOut;
- if (stdErr != stdOut && IsInheritableHandle(stdErr))
- handlesToInherit[handleCount++] = stdErr;
-
- if (handleCount) {
- lpAttributeList = CreateThreadAttributeList(handlesToInherit, handleCount);
- if (lpAttributeList) {
- // it's safe to inherit handles, so arrange for that...
- startup_info.cb = sizeof(startup_info_ex);
- startup_info.dwFlags |= STARTF_USESTDHANDLES;
- startup_info.hStdOutput = stdOut;
- startup_info.hStdError = stdErr;
- startup_info.hStdInput = INVALID_HANDLE_VALUE;
- startup_info_ex.lpAttributeList = lpAttributeList;
- dwCreationFlags |= EXTENDED_STARTUPINFO_PRESENT;
- bInheritHandles = TRUE;
- }
+ // setup our handle array first - if we end up with no handles that can
+ // be inherited we can avoid trying to do the ThreadAttributeList dance...
+ HANDLE stdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
+ HANDLE stdErr = ::GetStdHandle(STD_ERROR_HANDLE);
+
+ if (IsInheritableHandle(stdOut))
+ handlesToInherit[handleCount++] = stdOut;
+ if (stdErr != stdOut && IsInheritableHandle(stdErr))
+ handlesToInherit[handleCount++] = stdErr;
+
+ if (handleCount) {
+ lpAttributeList = CreateThreadAttributeList(handlesToInherit, handleCount);
+ if (lpAttributeList) {
+ // it's safe to inherit handles, so arrange for that...
+ startup_info.cb = sizeof(startup_info_ex);
+ startup_info.dwFlags |= STARTF_USESTDHANDLES;
+ startup_info.hStdOutput = stdOut;
+ startup_info.hStdError = stdErr;
+ startup_info.hStdInput = INVALID_HANDLE_VALUE;
+ startup_info_ex.lpAttributeList = lpAttributeList;
+ dwCreationFlags |= EXTENDED_STARTUPINFO_PRESENT;
+ bInheritHandles = TRUE;
}
- } else if (PR_GetEnv("MOZ_WIN_INHERIT_STD_HANDLES_PRE_VISTA")) {
- // Even if we can't limit what gets inherited, we sometimes want to inherit
- // stdout/err for testing purposes.
- startup_info.dwFlags |= STARTF_USESTDHANDLES;
- startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
- startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE);
- startup_info.hStdInput = INVALID_HANDLE_VALUE;
- bInheritHandles = TRUE;
}
PROCESS_INFORMATION process_info;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/ipc/glue/WindowsMessageLoop.cpp firefox-trunk-53.0~a1~hg20170115r329516/ipc/glue/WindowsMessageLoop.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/ipc/glue/WindowsMessageLoop.cpp 2017-01-13 01:15:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/ipc/glue/WindowsMessageLoop.cpp 2017-01-16 01:15:10.000000000 +0000
@@ -19,7 +19,6 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/PaintTracker.h"
-#include "mozilla/WindowsVersion.h"
using namespace mozilla;
using namespace mozilla::ipc;
@@ -1022,7 +1021,7 @@
MOZ_ASSERT(gUIThreadId, "InitUIThread was not called!");
#if defined(ACCESSIBILITY)
- if (IsVistaOrLater() && (mFlags & REQUIRE_A11Y_REENTRY)) {
+ if ((mFlags & REQUIRE_A11Y_REENTRY)) {
MOZ_ASSERT(!(mFlags & REQUIRE_DEFERRED_MESSAGE_PROTECTION));
return WaitForSyncNotifyWithA11yReentry();
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/ipc/mscom/MainThreadRuntime.cpp firefox-trunk-53.0~a1~hg20170115r329516/ipc/mscom/MainThreadRuntime.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/ipc/mscom/MainThreadRuntime.cpp 2017-01-13 01:16:04.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/ipc/mscom/MainThreadRuntime.cpp 2017-01-16 01:15:36.000000000 +0000
@@ -10,7 +10,6 @@
#include "mozilla/Assertions.h"
#include "mozilla/RefPtr.h"
#include "mozilla/UniquePtr.h"
-#include "mozilla/WindowsVersion.h"
#include "nsDebug.h"
#include "nsWindowsHelpers.h"
@@ -44,13 +43,6 @@
return;
}
- // Windows XP doesn't support setting of the COM exception policy, so we'll
- // just stop here in that case.
- if (!IsVistaOrLater()) {
- mInitResult = S_OK;
- return;
- }
-
// We are required to initialize security in order to configure global options.
mInitResult = InitializeSecurity();
MOZ_ASSERT(SUCCEEDED(mInitResult));
@@ -67,12 +59,8 @@
return;
}
- // Windows 7 has a policy that is even more strict. We should use that one
- // whenever possible.
- ULONG_PTR exceptionSetting = IsWin7OrLater() ?
- COMGLB_EXCEPTION_DONOT_HANDLE_ANY :
- COMGLB_EXCEPTION_DONOT_HANDLE;
- mInitResult = globalOpts->Set(COMGLB_EXCEPTION_HANDLING, exceptionSetting);
+ mInitResult = globalOpts->Set(COMGLB_EXCEPTION_HANDLING,
+ COMGLB_EXCEPTION_DONOT_HANDLE_ANY);
MOZ_ASSERT(SUCCEEDED(mInitResult));
}
@@ -177,4 +165,3 @@
} // namespace mscom
} // namespace mozilla
-
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/ipc/JavaScriptParent.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/ipc/JavaScriptParent.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/ipc/JavaScriptParent.cpp 2017-01-13 01:16:05.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/ipc/JavaScriptParent.cpp 2017-01-16 01:16:08.000000000 +0000
@@ -165,7 +165,7 @@
JSObject*
JavaScriptParent::scopeForTargetObjects()
{
- // CPWOWs from the child need to point into the parent's unprivileged junk
+ // CPOWs from the child need to point into the parent's unprivileged junk
// scope so that a compromised child cannot compromise the parent. In
// practice, this means that a child process can only (a) hold parent
// objects alive and (b) invoke them if they are callable.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/ipc/JavaScriptShared.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/ipc/JavaScriptShared.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/ipc/JavaScriptShared.cpp 2017-01-13 01:16:05.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/ipc/JavaScriptShared.cpp 2017-01-16 01:16:08.000000000 +0000
@@ -33,10 +33,10 @@
}
void
-IdToObjectMap::trace(JSTracer* trc, uint64_t minimimId)
+IdToObjectMap::trace(JSTracer* trc, uint64_t minimumId)
{
for (Table::Range r(table_.all()); !r.empty(); r.popFront()) {
- if (r.front().key().serialNumber() >= minimimId)
+ if (r.front().key().serialNumber() >= minimumId)
JS::TraceEdge(trc, &r.front().value(), "ipc-object");
}
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Array.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Array.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Array.js 2017-01-13 01:16:28.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Array.js 2017-01-16 01:16:19.000000000 +0000
@@ -809,54 +809,32 @@
// Steps 5.a-c.
var A = IsConstructor(C) ? new C() : [];
- // Step 5.c.
- var iterator = GetIterator(items, usingIterator);
-
// Step 5.d.
var k = 0;
- // Step 5.e.
- // These steps cannot be implemented using a for-of loop.
- // See .
- while (true) {
+ // Step 5.c, 5.e.
+ var iteratorWrapper = { [std_iterator]() { return GetIterator(items, usingIterator); } };
+ for (var nextValue of allowContentIter(iteratorWrapper)) {
// Step 5.e.i.
// Disabled for performance reason. We won't hit this case on
// normal array, since _DefineDataProperty will throw before it.
// We could hit this when |A| is a proxy and it ignores
// |_DefineDataProperty|, but it happens only after too long loop.
/*
- if (k >= 0x1fffffffffffff) {
- IteratorCloseThrow(iterator);
+ if (k >= 0x1fffffffffffff)
ThrowTypeError(JSMSG_TOO_LONG_ARRAY);
- }
*/
- // Step 5.e.iii.
- var next = callContentFunction(iterator.next, iterator);
- if (!IsObject(next))
- ThrowTypeError(JSMSG_NEXT_RETURNED_PRIMITIVE);
-
- // Step 5.e.iv.
- if (next.done) {
- A.length = k;
- return A;
- }
-
- // Steps 5.e.v.
- var nextValue = next.value;
-
// Steps 5.e.vi-vii.
- try {
- var mappedValue = mapping ? callContentFunction(mapfn, thisArg, nextValue, k) : nextValue;
+ var mappedValue = mapping ? callContentFunction(mapfn, thisArg, nextValue, k) : nextValue;
- // Steps 5.e.ii (reordered), 5.e.viii.
- _DefineDataProperty(A, k++, mappedValue);
- } catch (e) {
- // Steps 5.e.vi.2, 5.e.ix.
- IteratorCloseThrow(iterator);
- throw e;
- }
+ // Steps 5.e.ii (reordered), 5.e.viii.
+ _DefineDataProperty(A, k++, mappedValue);
}
+
+ // Step 5.e.iv.
+ A.length = k;
+ return A;
}
// Step 7.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Classes.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Classes.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Classes.js 2017-01-13 01:16:28.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Classes.js 2017-01-16 01:16:19.000000000 +0000
@@ -5,7 +5,7 @@
var DefaultDerivedClassConstructor =
class extends null {
constructor(...args) {
- super(...allowContentSpread(args));
+ super(...allowContentIter(args));
}
};
MakeDefaultConstructor(DefaultDerivedClassConstructor);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Map.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Map.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Map.js 2017-01-13 01:16:29.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Map.js 2017-01-16 01:16:20.000000000 +0000
@@ -14,44 +14,14 @@
if (!IsCallable(adder))
ThrowTypeError(JSMSG_NOT_FUNCTION, typeof adder);
- // Step 6.c.
- var iterFn = iterable[std_iterator];
- if (!IsCallable(iterFn))
- ThrowTypeError(JSMSG_NOT_ITERABLE, DecompileArg(0, iterable));
-
- var iter = callContentFunction(iterFn, iterable);
- if (!IsObject(iter))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof iter);
-
- // Step 7 (not applicable).
-
- // Step 8.
- while (true) {
- // Step 8.a.
- var next = callContentFunction(iter.next, iter);
- if (!IsObject(next))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof next);
-
- // Step 8.b.
- if (next.done)
- return;
-
- // Step 8.c.
- var nextItem = next.value;
-
+ // Steps 6.c-8.
+ for (var nextItem of allowContentIter(iterable)) {
// Step 8.d.
- if (!IsObject(nextItem)) {
- IteratorCloseThrow(iter);
+ if (!IsObject(nextItem))
ThrowTypeError(JSMSG_INVALID_MAP_ITERABLE, "Map");
- }
// Steps 8.e-j.
- try {
- callContentFunction(adder, map, nextItem[0], nextItem[1]);
- } catch (e) {
- IteratorCloseThrow(iter);
- throw e;
- }
+ callContentFunction(adder, map, nextItem[0], nextItem[1]);
}
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Set.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Set.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Set.js 2017-01-13 01:16:52.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Set.js 2017-01-16 01:16:25.000000000 +0000
@@ -14,39 +14,9 @@
if (!IsCallable(adder))
ThrowTypeError(JSMSG_NOT_FUNCTION, typeof adder);
- // Step 6.c.
- var iterFn = iterable[std_iterator];
- if (!IsCallable(iterFn))
- ThrowTypeError(JSMSG_NOT_ITERABLE, DecompileArg(0, iterable));
-
- var iter = callContentFunction(iterFn, iterable);
- if (!IsObject(iter))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof iter);
-
- // Step 7 (not applicable).
-
- // Step 8.
- while (true) {
- // Step 8.a.
- var next = callContentFunction(iter.next, iter);
- if (!IsObject(next))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof next);
-
- // Step 8.b.
- if (next.done)
- return;
-
- // Step 8.c.
- var nextValue = next.value;
-
- // Steps 8.d-e.
- try {
- callContentFunction(adder, set, nextValue);
- } catch (e) {
- IteratorCloseThrow(iter);
- throw e;
- }
- }
+ // Steps 6.c-8.
+ for (var nextValue of allowContentIter(iterable))
+ callContentFunction(adder, set, nextValue);
}
/* ES6 20121122 draft 15.16.4.6. */
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/TypedArray.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/TypedArray.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/TypedArray.js 2017-01-13 01:16:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/TypedArray.js 2017-01-16 01:16:29.000000000 +0000
@@ -1437,7 +1437,7 @@
// 22.2.2.1.1 IterableToList, step 4.a.
var next = callContentFunction(iterator.next, iterator);
if (!IsObject(next))
- ThrowTypeError(JSMSG_NEXT_RETURNED_PRIMITIVE);
+ ThrowTypeError(JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, "next");
// 22.2.2.1.1 IterableToList, step 4.b.
if (next.done)
@@ -1564,7 +1564,7 @@
// Step 4.a.
var next = callContentFunction(iterator.next, iterator);
if (!IsObject(next))
- ThrowTypeError(JSMSG_NEXT_RETURNED_PRIMITIVE);
+ ThrowTypeError(JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, "next");
// Step 4.b.
if (next.done)
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Utilities.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Utilities.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/Utilities.js 2017-01-13 01:16:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/Utilities.js 2017-01-16 01:16:29.000000000 +0000
@@ -154,29 +154,6 @@
return iterator;
}
-// ES2017 draft rev 7.4.6.
-// When completion.[[Type]] is throw.
-function IteratorCloseThrow(iter) {
- // Steps 1-2 (implicit)
-
- // Step 3.
- var returnMethod = GetMethod(iter, "return");
-
- // Step 4 (done in caller).
- if (returnMethod === undefined)
- return;
-
- try {
- // Step 5.
- callContentFunction(returnMethod, iter);
- } catch (e) {
- }
-
- // Step 6 (done in caller).
-
- // Steps 7-9 (skipped).
-}
-
var _builtinCtorsCache = {__proto__: null};
function GetBuiltinConstructor(builtinName) {
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/WeakMap.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/WeakMap.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/WeakMap.js 2017-01-13 01:16:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/WeakMap.js 2017-01-16 01:16:29.000000000 +0000
@@ -14,43 +14,13 @@
if (!IsCallable(adder))
ThrowTypeError(JSMSG_NOT_FUNCTION, typeof adder);
- // Step 6.c.
- var iterFn = iterable[std_iterator];
- if (!IsCallable(iterFn))
- ThrowTypeError(JSMSG_NOT_ITERABLE, DecompileArg(0, iterable));
-
- var iter = callContentFunction(iterFn, iterable);
- if (!IsObject(iter))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof iter);
-
- // Step 7 (not applicable).
-
- // Step 8.
- while (true) {
- // Step 8.a.
- var next = callContentFunction(iter.next, iter);
- if (!IsObject(next))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof next);
-
- // Step 8.b.
- if (next.done)
- return;
-
- // Step 8.c.
- var nextItem = next.value;
-
+ // Steps 6.c-8.
+ for (var nextItem of allowContentIter(iterable)) {
// Step 8.d.
- if (!IsObject(nextItem)) {
- IteratorCloseThrow(iter);
+ if (!IsObject(nextItem))
ThrowTypeError(JSMSG_INVALID_MAP_ITERABLE, "WeakMap");
- }
// Steps 8.e-j.
- try {
- callContentFunction(adder, map, nextItem[0], nextItem[1]);
- } catch (e) {
- IteratorCloseThrow(iter);
- throw e;
- }
+ callContentFunction(adder, map, nextItem[0], nextItem[1]);
}
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/WeakSet.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/WeakSet.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/builtin/WeakSet.js 2017-01-13 01:16:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/builtin/WeakSet.js 2017-01-16 01:16:30.000000000 +0000
@@ -14,39 +14,9 @@
if (!IsCallable(adder))
ThrowTypeError(JSMSG_NOT_FUNCTION, typeof adder);
- // Step 6.c.
- var iterFn = iterable[std_iterator];
- if (!IsCallable(iterFn))
- ThrowTypeError(JSMSG_NOT_ITERABLE, DecompileArg(0, iterable));
-
- var iter = callContentFunction(iterFn, iterable);
- if (!IsObject(iter))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof iter);
-
- // Step 7 (not applicable).
-
- // Step 8.
- while (true) {
- // Step 8.a.
- var next = callContentFunction(iter.next, iter);
- if (!IsObject(next))
- ThrowTypeError(JSMSG_NOT_NONNULL_OBJECT, typeof next);
-
- // Step 8.b.
- if (next.done)
- return;
-
- // Step 8.c.
- var nextValue = next.value;
-
- // Steps 8.d-e.
- try {
- callContentFunction(adder, set, nextValue);
- } catch (e) {
- IteratorCloseThrow(iter);
- throw e;
- }
- }
+ // Steps 6.c-8.
+ for (var nextValue of allowContentIter(iterable))
+ callContentFunction(adder, set, nextValue);
}
// 23.4.3.1
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/frontend/BytecodeEmitter.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/frontend/BytecodeEmitter.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/frontend/BytecodeEmitter.cpp 2017-01-13 01:17:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/frontend/BytecodeEmitter.cpp 2017-01-16 01:17:18.000000000 +0000
@@ -58,6 +58,7 @@
class BreakableControl;
class LabelControl;
class LoopControl;
+class ForOfLoopControl;
class TryFinallyControl;
static bool
@@ -152,6 +153,13 @@
template <>
bool
+BytecodeEmitter::NestableControl::is() const
+{
+ return kind_ == StatementKind::ForOfLoop;
+}
+
+template <>
+bool
BytecodeEmitter::NestableControl::is() const
{
return kind_ == StatementKind::Try || kind_ == StatementKind::Finally;
@@ -270,6 +278,64 @@
}
};
+class ForOfLoopControl : public LoopControl
+{
+ // The stack depth of the iterator.
+ int32_t iterDepth_;
+
+ // for-of loops, when throwing from non-iterator code (i.e. from the body
+ // or from evaluating the LHS of the loop condition), need to call
+ // IteratorClose. If IteratorClose itself throws, we must not re-call
+ // IteratorClose. Since non-local jumps like break and return call
+ // IteratorClose, whenever a non-local jump is emitted, we must terminate
+ // the current JSTRY_ITERCLOSE note to skip the non-local jump code, then
+ // start a new one.
+ //
+ // Visually,
+ //
+ // for (x of y) {
+ // ... instantiate ForOfLoopControl
+ // ... + <-- iterCloseTryStart_ points to right before
+ // ... assignment to loop variable
+ // ... ^
+ // ... |
+ // if (...) v
+ // + call finishIterCloseTryNote before |break|
+ // above range is noted with JSTRY_ITERCLOSE
+ //
+ // break; <-- break and IteratorClose are not inside
+ // JSTRY_ITERCLOSE note
+ //
+ // call startNewIterCloseTryNote after |break|
+ // + <-- next iterCloseTryStart_ points here
+ // ... |
+ // ... ~
+ // }
+ ptrdiff_t iterCloseTryStart_;
+
+ public:
+ ForOfLoopControl(BytecodeEmitter* bce, int32_t iterDepth)
+ : LoopControl(bce, StatementKind::ForOfLoop),
+ iterDepth_(iterDepth),
+ iterCloseTryStart_(-1)
+ {
+ MOZ_ASSERT(bce->stackDepth >= iterDepth);
+ }
+
+ MOZ_MUST_USE bool finishIterCloseTryNote(BytecodeEmitter* bce) {
+ ptrdiff_t end = bce->offset();
+ MOZ_ASSERT(end >= iterCloseTryStart_);
+ if (end != iterCloseTryStart_)
+ return bce->tryNoteList.append(JSTRY_ITERCLOSE, iterDepth_, iterCloseTryStart_, end);
+ return true;
+ }
+
+ void startNewIterCloseTryNote(BytecodeEmitter* bce) {
+ MOZ_ASSERT(bce->offset() > iterCloseTryStart_);
+ iterCloseTryStart_ = bce->offset();
+ }
+};
+
class TryFinallyControl : public BytecodeEmitter::NestableControl
{
bool emittingSubroutine_;
@@ -1503,6 +1569,156 @@
return true;
}
+class MOZ_STACK_CLASS IfThenElseEmitter
+{
+ BytecodeEmitter* bce_;
+ JumpList jumpAroundThen_;
+ JumpList jumpsAroundElse_;
+ unsigned noteIndex_;
+ int32_t thenDepth_;
+#ifdef DEBUG
+ int32_t pushed_;
+ bool calculatedPushed_;
+#endif
+ enum State {
+ Start,
+ If,
+ Cond,
+ IfElse,
+ Else,
+ End
+ };
+ State state_;
+
+ public:
+ explicit IfThenElseEmitter(BytecodeEmitter* bce)
+ : bce_(bce),
+ noteIndex_(-1),
+ thenDepth_(0),
+#ifdef DEBUG
+ pushed_(0),
+ calculatedPushed_(false),
+#endif
+ state_(Start)
+ {}
+
+ ~IfThenElseEmitter()
+ {}
+
+ private:
+ bool emitIf(State nextState) {
+ MOZ_ASSERT(state_ == Start || state_ == Else);
+ MOZ_ASSERT(nextState == If || nextState == IfElse || nextState == Cond);
+
+ // Clear jumpAroundThen_ offset that points previous JSOP_IFEQ.
+ if (state_ == Else)
+ jumpAroundThen_ = JumpList();
+
+ // Emit an annotated branch-if-false around the then part.
+ SrcNoteType type = nextState == If ? SRC_IF : nextState == IfElse ? SRC_IF_ELSE : SRC_COND;
+ if (!bce_->newSrcNote(type, ¬eIndex_))
+ return false;
+ if (!bce_->emitJump(JSOP_IFEQ, &jumpAroundThen_))
+ return false;
+
+ // To restore stack depth in else part, save depth of the then part.
+#ifdef DEBUG
+ // If DEBUG, this is also necessary to calculate |pushed_|.
+ thenDepth_ = bce_->stackDepth;
+#else
+ if (nextState == IfElse || nextState == Cond)
+ thenDepth_ = bce_->stackDepth;
+#endif
+ state_ = nextState;
+ return true;
+ }
+
+ public:
+ bool emitIf() {
+ return emitIf(If);
+ }
+
+ bool emitCond() {
+ return emitIf(Cond);
+ }
+
+ bool emitIfElse() {
+ return emitIf(IfElse);
+ }
+
+ bool emitElse() {
+ MOZ_ASSERT(state_ == IfElse || state_ == Cond);
+
+ calculateOrCheckPushed();
+
+ // Emit a jump from the end of our then part around the else part. The
+ // patchJumpsToTarget call at the bottom of this function will fix up
+ // the offset with jumpsAroundElse value.
+ if (!bce_->emitJump(JSOP_GOTO, &jumpsAroundElse_))
+ return false;
+
+ // Ensure the branch-if-false comes here, then emit the else.
+ if (!bce_->emitJumpTargetAndPatch(jumpAroundThen_))
+ return false;
+
+ // Annotate SRC_IF_ELSE or SRC_COND with the offset from branch to
+ // jump, for IonMonkey's benefit. We can't just "back up" from the pc
+ // of the else clause, because we don't know whether an extended
+ // jump was required to leap from the end of the then clause over
+ // the else clause.
+ if (!bce_->setSrcNoteOffset(noteIndex_, 0,
+ jumpsAroundElse_.offset - jumpAroundThen_.offset))
+ {
+ return false;
+ }
+
+ // Restore stack depth of the then part.
+ bce_->stackDepth = thenDepth_;
+ state_ = Else;
+ return true;
+ }
+
+ bool emitEnd() {
+ MOZ_ASSERT(state_ == If || state_ == Else);
+
+ calculateOrCheckPushed();
+
+ if (state_ == If) {
+ // No else part, fixup the branch-if-false to come here.
+ if (!bce_->emitJumpTargetAndPatch(jumpAroundThen_))
+ return false;
+ }
+
+ // Patch all the jumps around else parts.
+ if (!bce_->emitJumpTargetAndPatch(jumpsAroundElse_))
+ return false;
+
+ state_ = End;
+ return true;
+ }
+
+ void calculateOrCheckPushed() {
+#ifdef DEBUG
+ if (!calculatedPushed_) {
+ pushed_ = bce_->stackDepth - thenDepth_;
+ calculatedPushed_ = true;
+ } else {
+ MOZ_ASSERT(pushed_ == bce_->stackDepth - thenDepth_);
+ }
+#endif
+ }
+
+#ifdef DEBUG
+ int32_t pushed() const {
+ return pushed_;
+ }
+
+ int32_t popped() const {
+ return -pushed_;
+ }
+#endif
+};
+
BytecodeEmitter::BytecodeEmitter(BytecodeEmitter* parent,
Parser* parser, SharedContext* sc,
HandleScript script, Handle lazyScript,
@@ -2019,22 +2235,43 @@
namespace {
-class NonLocalExitControl {
+class NonLocalExitControl
+{
+ public:
+ enum Kind
+ {
+ // IteratorClose is handled especially inside the exception unwinder.
+ Throw,
+
+ // A 'continue' statement does not call IteratorClose for the loop it
+ // is continuing, i.e. excluding the target loop.
+ Continue,
+
+ // A 'break' or 'return' statement does call IteratorClose for the
+ // loop it is breaking out of or returning from, i.e. including the
+ // target loop.
+ Break,
+ Return
+ };
+
+ private:
BytecodeEmitter* bce_;
const uint32_t savedScopeNoteIndex_;
const int savedDepth_;
uint32_t openScopeNoteIndex_;
+ Kind kind_;
NonLocalExitControl(const NonLocalExitControl&) = delete;
MOZ_MUST_USE bool leaveScope(BytecodeEmitter::EmitterScope* scope);
public:
- explicit NonLocalExitControl(BytecodeEmitter* bce)
+ NonLocalExitControl(BytecodeEmitter* bce, Kind kind)
: bce_(bce),
savedScopeNoteIndex_(bce->scopeNoteList.length()),
savedDepth_(bce->stackDepth),
- openScopeNoteIndex_(bce->innermostEmitterScope->noteIndex())
+ openScopeNoteIndex_(bce->innermostEmitterScope->noteIndex()),
+ kind_(kind)
{ }
~NonLocalExitControl() {
@@ -2081,6 +2318,14 @@
EmitterScope* es = bce_->innermostEmitterScope;
int npops = 0;
+ bool hasForOfLoopsWithIteratorClose = false;
+
+ // IteratorClose is handled specially in the exception unwinder. For
+ // 'continue', 'break', and 'return' statements, emit IteratorClose
+ // bytecode inline. 'continue' statements do not call IteratorClose for
+ // the loop they are continuing.
+ bool emitIteratorClose = kind_ == Continue || kind_ == Break || kind_ == Return;
+ bool emitIteratorCloseAtTarget = emitIteratorClose && kind_ != Continue;
auto flushPops = [&npops](BytecodeEmitter* bce) {
if (npops && !bce->flushPops(&npops))
@@ -2120,15 +2365,29 @@
}
case StatementKind::ForOfLoop:
- npops += 2;
+ // The iterator and the current value are on the stack.
+ //
+ if (emitIteratorClose) {
+ hasForOfLoopsWithIteratorClose = true;
+ if (!control->as().finishIterCloseTryNote(bce_))
+ return false;
+ if (!bce_->emit1(JSOP_POP)) // ... ITER
+ return false;
+ if (!bce_->emitIteratorClose()) // ...
+ return false;
+ } else {
+ if (!bce_->emit1(JSOP_POP)) // ... ITER
+ return false;
+ if (!bce_->emit1(JSOP_POP)) // ...
+ return false;
+ }
break;
case StatementKind::ForInLoop:
- /* The iterator and the current value are on the stack. */
- npops += 1;
- if (!flushPops(bce_))
+ // The iterator and the current value are on the stack.
+ if (!bce_->emit1(JSOP_POP)) // ... ITER
return false;
- if (!bce_->emit1(JSOP_ENDITER))
+ if (!bce_->emit1(JSOP_ENDITER)) // ...
return false;
break;
@@ -2137,13 +2396,45 @@
}
}
+ if (target && target->is() && emitIteratorCloseAtTarget) {
+ hasForOfLoopsWithIteratorClose = true;
+ if (!target->as().finishIterCloseTryNote(bce_))
+ return false;
+
+ // The iterator and the current value are on the stack. At the level
+ // of the target block, there's bytecode after the loop that will pop
+ // the iterator and the value, so duplicate the iterator and call
+ // IteratorClose.
+ if (!bce_->emitDupAt(1)) // ... ITER RESULT ITER
+ return false;
+ if (!bce_->emitIteratorClose()) // ... ITER RESULT
+ return false;
+ }
+
EmitterScope* targetEmitterScope = target ? target->emitterScope() : bce_->varEmitterScope;
for (; es != targetEmitterScope; es = es->enclosingInFrame()) {
if (!leaveScope(es))
return false;
}
- return flushPops(bce_);
+ if (!flushPops(bce_))
+ return false;
+
+ // See comment in ForOfLoopControl.
+ if (hasForOfLoopsWithIteratorClose) {
+ for (NestableControl* control = bce_->innermostNestableControl;
+ control != target;
+ control = control->enclosing())
+ {
+ if (control->is())
+ control->as().startNewIterCloseTryNote(bce_);
+ }
+
+ if (target && target->is() && emitIteratorCloseAtTarget)
+ target->as().startNewIterCloseTryNote(bce_);
+ }
+
+ return true;
}
} // anonymous namespace
@@ -2151,7 +2442,9 @@
bool
BytecodeEmitter::emitGoto(NestableControl* target, JumpList* jumplist, SrcNoteType noteType)
{
- NonLocalExitControl nle(this);
+ NonLocalExitControl nle(this, noteType == SRC_CONTINUE
+ ? NonLocalExitControl::Continue
+ : NonLocalExitControl::Break);
if (!nle.prepareForNonLocalJump(target))
return false;
@@ -4538,56 +4831,202 @@
}
bool
-BytecodeEmitter::emitDefault(ParseNode* defaultExpr, ParseNode* pattern)
+BytecodeEmitter::emitIteratorClose(Maybe yieldStarTryStart, bool allowSelfHosted)
{
- if (!emit1(JSOP_DUP)) // VALUE VALUE
- return false;
- if (!emit1(JSOP_UNDEFINED)) // VALUE VALUE UNDEFINED
- return false;
- if (!emit1(JSOP_STRICTEQ)) // VALUE EQL?
+ MOZ_ASSERT(allowSelfHosted || emitterMode != BytecodeEmitter::SelfHosting,
+ ".close() on iterators is prohibited in self-hosted code because it "
+ "can run user-modifiable iteration code");
+
+ // Generate inline logic corresponding to IteratorClose (ES 7.4.6).
+ //
+ // Callers need to ensure that the iterator object is at the top of the
+ // stack.
+
+ if (!emit1(JSOP_DUP)) // ... ITER ITER
return false;
- // Emit source note to enable ion compilation.
- if (!newSrcNote(SRC_IF))
+
+ // Step 3.
+ //
+ // Get the "return" method.
+ if (!emitAtomOp(cx->names().return_, JSOP_CALLPROP)) // ... ITER RET
return false;
- JumpList jump;
- if (!emitJump(JSOP_IFEQ, &jump)) // VALUE
+
+ // Step 4.
+ //
+ // Do nothing if "return" is null or undefined.
+ IfThenElseEmitter ifReturnMethodIsDefined(this);
+ if (!emit1(JSOP_DUP)) // ... ITER RET RET
return false;
- if (!emit1(JSOP_POP)) // .
+ if (!emit1(JSOP_UNDEFINED)) // ... ITER RET RET UNDEFINED
return false;
- if (!emitInitializerInBranch(defaultExpr, pattern)) // DEFAULTVALUE
+ if (!emit1(JSOP_NE)) // ... ITER RET ?NEQL
return false;
- if (!emitJumpTargetAndPatch(jump))
+ if (!ifReturnMethodIsDefined.emitIfElse())
return false;
- return true;
-}
-
-bool
-BytecodeEmitter::setOrEmitSetFunName(ParseNode* maybeFun, HandleAtom name,
- FunctionPrefixKind prefixKind)
-{
- if (maybeFun->isKind(PNK_FUNCTION)) {
- // Function doesn't have 'name' property at this point.
- // Set function's name at compile time.
- RootedFunction fun(cx, maybeFun->pn_funbox->function());
- // Single node can be emitted multiple times if it appears in
- // array destructuring default. If function already has a name,
- // just return.
- if (fun->hasCompileTimeName()) {
-#ifdef DEBUG
- RootedAtom funName(cx, NameToFunctionName(cx, name, prefixKind));
- if (!funName)
- return false;
- MOZ_ASSERT(funName == maybeFun->pn_funbox->function()->compileTimeName());
-#endif
- return true;
- }
+ // Steps 5, 8.
+ //
+ // Call "return" if it is not undefined or null, and check that it returns
+ // an Object.
+ if (!emit1(JSOP_SWAP)) // ... RET ITER
+ return false;
- RootedAtom funName(cx, NameToFunctionName(cx, name, prefixKind));
- if (!funName)
+ // ES 14.4.13, yield * AssignmentExpression, step 5.c
+ //
+ // When emitting iterator.return() for yield* forced return, we need to
+ // pass the argument passed to Generator.prototype.return to the return
+ // method.
+ if (yieldStarTryStart) {
+ IfThenElseEmitter ifGeneratorClosing(this);
+ if (!emitDupAt(2)) // ... FTYPE FVALUE RET ITER FVALUE
return false;
- fun->setCompileTimeName(name);
- return true;
+ if (!emit1(JSOP_ISGENCLOSING)) // ... FTYPE FVALUE RET ITER FVALUE CLOSING
+ return false;
+ if (!emit1(JSOP_SWAP)) // ... FTYPE FVALUE RET ITER CLOSING FVALUE
+ return false;
+ if (!emit1(JSOP_POP)) // ... FTYPE FVALUE RET ITER CLOSING
+ return false;
+ if (!ifGeneratorClosing.emitIfElse()) // ... FTYPE FVALUE RET ITER
+ return false;
+
+ if (!emit1(JSOP_GETRVAL)) // ... FTYPE FVALUE RET ITER RVAL
+ return false;
+ if (!emitAtomOp(cx->names().value, JSOP_GETPROP)) // ... FTYPE FVALUE RET ITER VALUE
+ return false;
+ if (!emitCall(JSOP_CALL, 1)) // ... FTYPE FVALUE RESULT
+ return false;
+ checkTypeSet(JSOP_CALL);
+ if (!emitCheckIsObj(CheckIsObjectKind::IteratorReturn)) // ... FTYPE FVALUE RESULT
+ return false;
+
+ IfThenElseEmitter ifReturnDone(this);
+ if (!emit1(JSOP_DUP)) // ITER OLDRESULT FTYPE FVALUE RESULT RESULT
+ return false;
+ if (!emitAtomOp(cx->names().done, JSOP_GETPROP)) // ITER OLDRESULT FTYPE FVALUE RESULT DONE
+ return false;
+ if (!ifReturnDone.emitIfElse()) // ITER OLDRESULT FTYPE FVALUE RESULT
+ return false;
+ if (!emitAtomOp(cx->names().value, JSOP_GETPROP)) // ITER OLDRESULT FTYPE FVALUE VALUE
+ return false;
+ if (!emitPrepareIteratorResult()) // ITER OLDRESULT FTYPE FVALUE VALUE RESULT
+ return false;
+ if (!emit1(JSOP_SWAP)) // ITER OLDRESULT FTYPE FVALUE RESULT VALUE
+ return false;
+ if (!emitFinishIteratorResult(true)) // ITER OLDRESULT FTYPE FVALUE RESULT
+ return false;
+ if (!emit1(JSOP_DUP)) // ITER OLDRESULT FTYPE FVALUE RESULT RESULT
+ return false;
+ if (!emit1(JSOP_SETRVAL)) // ITER OLDRESULT FTYPE FVALUE RESULT
+ return false;
+ if (!ifReturnDone.emitElse()) // ITER OLDRESULT FTYPE FVALUE RESULT
+ return false;
+ int32_t savedDepth = this->stackDepth;
+ if (!emit2(JSOP_UNPICK, 3)) // ITER RESULT OLDRESULT FTYPE FVALUE
+ return false;
+ if (!emitUint16Operand(JSOP_POPN, 3)) // ITER RESULT
+ return false;
+ JumpList beq;
+ JumpTarget breakTarget{ -1 };
+ if (!emitBackwardJump(JSOP_GOTO, *yieldStarTryStart, &beq, &breakTarget)) // ITER RESULT
+ return false;
+ this->stackDepth = savedDepth;
+ if (!ifReturnDone.emitEnd())
+ return false;
+
+ if (!ifGeneratorClosing.emitElse()) // ... FTYPE FVALUE RET ITER
+ return false;
+ if (!emitCall(JSOP_CALL, 0)) // ... FTYPE FVALUE RESULT
+ return false;
+ checkTypeSet(JSOP_CALL);
+ if (!emitCheckIsObj(CheckIsObjectKind::IteratorReturn)) // ... FTYPE FVALUE RESULT
+ return false;
+
+ if (!ifGeneratorClosing.emitEnd())
+ return false;
+ } else {
+ if (!emitCall(JSOP_CALL, 0)) // ... RESULT
+ return false;
+ checkTypeSet(JSOP_CALL);
+ if (!emitCheckIsObj(CheckIsObjectKind::IteratorReturn)) // ... RESULT
+ return false;
+ }
+
+ if (!ifReturnMethodIsDefined.emitElse())
+ return false;
+ if (!emit1(JSOP_POP)) // ... ITER
+ return false;
+ if (!ifReturnMethodIsDefined.emitEnd())
+ return false;
+
+ return emit1(JSOP_POP); // ...
+}
+
+template
+bool
+BytecodeEmitter::wrapWithDestructuringIteratorCloseTryNote(int32_t iterDepth, InnerEmitter emitter)
+{
+ MOZ_ASSERT(this->stackDepth >= iterDepth);
+
+ ptrdiff_t start = offset();
+ if (!emitter(this))
+ return false;
+ ptrdiff_t end = offset();
+ if (start != end)
+ return tryNoteList.append(JSTRY_DESTRUCTURING_ITERCLOSE, iterDepth, start, end);
+ return true;
+}
+
+bool
+BytecodeEmitter::emitDefault(ParseNode* defaultExpr, ParseNode* pattern)
+{
+ if (!emit1(JSOP_DUP)) // VALUE VALUE
+ return false;
+ if (!emit1(JSOP_UNDEFINED)) // VALUE VALUE UNDEFINED
+ return false;
+ if (!emit1(JSOP_STRICTEQ)) // VALUE EQL?
+ return false;
+ // Emit source note to enable ion compilation.
+ if (!newSrcNote(SRC_IF))
+ return false;
+ JumpList jump;
+ if (!emitJump(JSOP_IFEQ, &jump)) // VALUE
+ return false;
+ if (!emit1(JSOP_POP)) // .
+ return false;
+ if (!emitInitializerInBranch(defaultExpr, pattern)) // DEFAULTVALUE
+ return false;
+ if (!emitJumpTargetAndPatch(jump))
+ return false;
+ return true;
+}
+
+bool
+BytecodeEmitter::setOrEmitSetFunName(ParseNode* maybeFun, HandleAtom name,
+ FunctionPrefixKind prefixKind)
+{
+ if (maybeFun->isKind(PNK_FUNCTION)) {
+ // Function doesn't have 'name' property at this point.
+ // Set function's name at compile time.
+ RootedFunction fun(cx, maybeFun->pn_funbox->function());
+
+ // Single node can be emitted multiple times if it appears in
+ // array destructuring default. If function already has a name,
+ // just return.
+ if (fun->hasCompileTimeName()) {
+#ifdef DEBUG
+ RootedAtom funName(cx, NameToFunctionName(cx, name, prefixKind));
+ if (!funName)
+ return false;
+ MOZ_ASSERT(funName == maybeFun->pn_funbox->function()->compileTimeName());
+#endif
+ return true;
+ }
+
+ RootedAtom funName(cx, NameToFunctionName(cx, name, prefixKind));
+ if (!funName)
+ return false;
+ fun->setCompileTimeName(name);
+ return true;
}
uint32_t nameIndex;
@@ -4625,156 +5064,6 @@
return emitInitializer(initializer, pattern);
}
-class MOZ_STACK_CLASS IfThenElseEmitter
-{
- BytecodeEmitter* bce_;
- JumpList jumpAroundThen_;
- JumpList jumpsAroundElse_;
- unsigned noteIndex_;
- int32_t thenDepth_;
-#ifdef DEBUG
- int32_t pushed_;
- bool calculatedPushed_;
-#endif
- enum State {
- Start,
- If,
- Cond,
- IfElse,
- Else,
- End
- };
- State state_;
-
- public:
- explicit IfThenElseEmitter(BytecodeEmitter* bce)
- : bce_(bce),
- noteIndex_(-1),
- thenDepth_(0),
-#ifdef DEBUG
- pushed_(0),
- calculatedPushed_(false),
-#endif
- state_(Start)
- {}
-
- ~IfThenElseEmitter()
- {}
-
- private:
- bool emitIf(State nextState) {
- MOZ_ASSERT(state_ == Start || state_ == Else);
- MOZ_ASSERT(nextState == If || nextState == IfElse || nextState == Cond);
-
- // Clear jumpAroundThen_ offset that points previous JSOP_IFEQ.
- if (state_ == Else)
- jumpAroundThen_ = JumpList();
-
- // Emit an annotated branch-if-false around the then part.
- SrcNoteType type = nextState == If ? SRC_IF : nextState == IfElse ? SRC_IF_ELSE : SRC_COND;
- if (!bce_->newSrcNote(type, ¬eIndex_))
- return false;
- if (!bce_->emitJump(JSOP_IFEQ, &jumpAroundThen_))
- return false;
-
- // To restore stack depth in else part, save depth of the then part.
-#ifdef DEBUG
- // If DEBUG, this is also necessary to calculate |pushed_|.
- thenDepth_ = bce_->stackDepth;
-#else
- if (nextState == IfElse || nextState == Cond)
- thenDepth_ = bce_->stackDepth;
-#endif
- state_ = nextState;
- return true;
- }
-
- public:
- bool emitIf() {
- return emitIf(If);
- }
-
- bool emitCond() {
- return emitIf(Cond);
- }
-
- bool emitIfElse() {
- return emitIf(IfElse);
- }
-
- bool emitElse() {
- MOZ_ASSERT(state_ == IfElse || state_ == Cond);
-
- calculateOrCheckPushed();
-
- // Emit a jump from the end of our then part around the else part. The
- // patchJumpsToTarget call at the bottom of this function will fix up
- // the offset with jumpsAroundElse value.
- if (!bce_->emitJump(JSOP_GOTO, &jumpsAroundElse_))
- return false;
-
- // Ensure the branch-if-false comes here, then emit the else.
- if (!bce_->emitJumpTargetAndPatch(jumpAroundThen_))
- return false;
-
- // Annotate SRC_IF_ELSE or SRC_COND with the offset from branch to
- // jump, for IonMonkey's benefit. We can't just "back up" from the pc
- // of the else clause, because we don't know whether an extended
- // jump was required to leap from the end of the then clause over
- // the else clause.
- if (!bce_->setSrcNoteOffset(noteIndex_, 0,
- jumpsAroundElse_.offset - jumpAroundThen_.offset))
- {
- return false;
- }
-
- // Restore stack depth of the then part.
- bce_->stackDepth = thenDepth_;
- state_ = Else;
- return true;
- }
-
- bool emitEnd() {
- MOZ_ASSERT(state_ == If || state_ == Else);
-
- calculateOrCheckPushed();
-
- if (state_ == If) {
- // No else part, fixup the branch-if-false to come here.
- if (!bce_->emitJumpTargetAndPatch(jumpAroundThen_))
- return false;
- }
-
- // Patch all the jumps around else parts.
- if (!bce_->emitJumpTargetAndPatch(jumpsAroundElse_))
- return false;
-
- state_ = End;
- return true;
- }
-
- void calculateOrCheckPushed() {
-#ifdef DEBUG
- if (!calculatedPushed_) {
- pushed_ = bce_->stackDepth - thenDepth_;
- calculatedPushed_ = true;
- } else {
- MOZ_ASSERT(pushed_ == bce_->stackDepth - thenDepth_);
- }
-#endif
- }
-
-#ifdef DEBUG
- int32_t pushed() const {
- return pushed_;
- }
-
- int32_t popped() const {
- return -pushed_;
- }
-#endif
-};
-
bool
BytecodeEmitter::emitDestructuringOpsArray(ParseNode* pattern, DestructuringFlavor flav)
{
@@ -4784,6 +5073,9 @@
// Here's pseudo code for |let [a, b, , c=y, ...d] = x;|
//
+ // Lines that are annotated "covered by trynote" mean that upon throwing
+ // an exception, IteratorClose is called on iter only if done is false.
+ //
// let x, y;
// let a, b, c, d;
// let iter, lref, result, done, value; // stack values
@@ -4791,7 +5083,7 @@
// iter = x[Symbol.iterator]();
//
// // ==== emitted by loop for a ====
- // lref = GetReference(a);
+ // lref = GetReference(a); // covered by trynote
//
// result = iter.next();
// done = result.done;
@@ -4801,10 +5093,10 @@
// else
// value = result.value;
//
- // SetOrInitialize(lref, value);
+ // SetOrInitialize(lref, value); // covered by trynote
//
// // ==== emitted by loop for b ====
- // lref = GetReference(b);
+ // lref = GetReference(b); // covered by trynote
//
// if (done) {
// value = undefined;
@@ -4817,7 +5109,7 @@
// value = result.value;
// }
//
- // SetOrInitialize(lref, value);
+ // SetOrInitialize(lref, value); // covered by trynote
//
// // ==== emitted by loop for elision ====
// if (done) {
@@ -4832,7 +5124,7 @@
// }
//
// // ==== emitted by loop for c ====
- // lref = GetReference(c);
+ // lref = GetReference(c); // covered by trynote
//
// if (done) {
// value = undefined;
@@ -4846,19 +5138,23 @@
// }
//
// if (value === undefined)
- // value = y;
+ // value = y; // covered by trynote
//
- // SetOrInitialize(lref, value);
+ // SetOrInitialize(lref, value); // covered by trynote
//
// // ==== emitted by loop for d ====
- // lref = GetReference(d);
+ // lref = GetReference(d); // covered by trynote
//
// if (done)
// value = [];
// else
// value = [...iter];
//
- // SetOrInitialize(lref, value);
+ // SetOrInitialize(lref, value); // covered by trynote
+ //
+ // // === emitted after loop ===
+ // if (!done)
+ // IteratorClose(iter);
// Use an iterator to destructure the RHS, instead of index lookup. We
// must leave the *original* value on the stack.
@@ -4867,25 +5163,61 @@
if (!emitIterator()) // ... OBJ ITER
return false;
+ // For an empty pattern [], call IteratorClose unconditionally. Nothing
+ // else needs to be done.
+ if (!pattern->pn_head)
+ return emitIteratorClose(); // ... OBJ
+
+ // Push an initial FALSE value for DONE.
+ if (!emit1(JSOP_FALSE)) // ... OBJ ITER FALSE
+ return false;
+
+ // JSTRY_DESTRUCTURING_ITERCLOSE expects the iterator and the done value
+ // to be the second to top and the top of the stack, respectively.
+ // IteratorClose is called upon exception only if done is false.
+ int32_t tryNoteDepth = stackDepth;
+
for (ParseNode* member = pattern->pn_head; member; member = member->pn_next) {
- bool isHead = member == pattern->pn_head;
- bool hasNext = !!member->pn_next;
+ bool isFirst = member == pattern->pn_head;
+ DebugOnly hasNext = !!member->pn_next;
- if (member->isKind(PNK_SPREAD)) {
- size_t emitted = 0;
- if (!emitDestructuringLHSRef(member, &emitted)) // ... OBJ ITER ?DONE *LREF
+ size_t emitted = 0;
+
+ // Spec requires LHS reference to be evaluated first.
+ ParseNode* lhsPattern = member;
+ if (lhsPattern->isKind(PNK_ASSIGN))
+ lhsPattern = lhsPattern->pn_left;
+
+ bool isElision = lhsPattern->isKind(PNK_ELISION);
+ if (!isElision) {
+ auto emitLHSRef = [lhsPattern, &emitted](BytecodeEmitter* bce) {
+ return bce->emitDestructuringLHSRef(lhsPattern, &emitted); // ... OBJ ITER DONE *LREF
+ };
+ if (!wrapWithDestructuringIteratorCloseTryNote(tryNoteDepth, emitLHSRef))
return false;
+ }
+ // Pick the DONE value to the top of the stack.
+ if (emitted) {
+ if (!emit2(JSOP_PICK, emitted)) // ... OBJ ITER *LREF DONE
+ return false;
+ }
+
+ if (isFirst) {
+ // If this element is the first, DONE is always FALSE, so pop it.
+ //
+ // Non-first elements should emit if-else depending on the
+ // member pattern, below.
+ if (!emit1(JSOP_POP)) // ... OBJ ITER *LREF
+ return false;
+ }
+
+ if (member->isKind(PNK_SPREAD)) {
IfThenElseEmitter ifThenElse(this);
- if (!isHead) {
+ if (!isFirst) {
// If spread is not the first element of the pattern,
// iterator can already be completed.
- // ... OBJ ITER DONE *LREF
- if (emitted) {
- if (!emit2(JSOP_PICK, emitted)) // ... OBJ ITER *LREF DONE
- return false;
- }
-
+ // ... OBJ ITER *LREF DONE
if (!ifThenElse.emitIfElse()) // ... OBJ ITER *LREF
return false;
@@ -4908,13 +5240,22 @@
if (!emit1(JSOP_POP)) // ... OBJ ITER *LREF ARRAY
return false;
- if (!isHead) {
+ if (!isFirst) {
if (!ifThenElse.emitEnd())
return false;
MOZ_ASSERT(ifThenElse.pushed() == 1);
}
- if (!emitSetOrInitializeDestructuring(member, flav)) // ... OBJ ITER
+ // At this point the iterator is done. Unpick a TRUE value for DONE above ITER.
+ if (!emit1(JSOP_TRUE)) // ... OBJ ITER *LREF ARRAY TRUE
+ return false;
+ if (!emit2(JSOP_UNPICK, emitted + 1)) // ... OBJ ITER TRUE *LREF ARRAY
+ return false;
+
+ auto emitAssignment = [member, flav](BytecodeEmitter* bce) {
+ return bce->emitSetOrInitializeDestructuring(member, flav); // ... OBJ ITER TRUE
+ };
+ if (!wrapWithDestructuringIteratorCloseTryNote(tryNoteDepth, emitAssignment))
return false;
MOZ_ASSERT(!hasNext);
@@ -4922,63 +5263,30 @@
}
ParseNode* pndefault = nullptr;
- ParseNode* subpattern = member;
- if (subpattern->isKind(PNK_ASSIGN)) {
- pndefault = subpattern->pn_right;
- subpattern = subpattern->pn_left;
- }
+ if (member->isKind(PNK_ASSIGN))
+ pndefault = member->pn_right;
- bool isElision = subpattern->isKind(PNK_ELISION);
-
- MOZ_ASSERT(!subpattern->isKind(PNK_SPREAD));
-
- size_t emitted = 0;
- if (!isElision) {
- if (!emitDestructuringLHSRef(subpattern, &emitted)) // ... OBJ ITER ?DONE *LREF
- return false;
- }
+ MOZ_ASSERT(!member->isKind(PNK_SPREAD));
IfThenElseEmitter ifAlreadyDone(this);
- if (!isHead) {
- // If this element is not the first element of the pattern,
- // iterator can already be completed.
- // ... OBJ ITER DONE *LREF
- if (emitted) {
- if (hasNext) {
- if (!emitDupAt(emitted)) // ... OBJ ITER DONE *LREF DONE
- return false;
- } else {
- if (!emit2(JSOP_PICK, emitted)) // ... OBJ ITER *LREF DONE
- return false;
- }
- } else {
- if (hasNext) {
- // The position of LREF in the following stack comment
- // isn't accurate for the operation, but it's equivalent
- // since LREF is nothing
- if (!emit1(JSOP_DUP)) // ... OBJ ITER DONE *LREF DONE
- return false;
- }
- }
- if (!ifAlreadyDone.emitIfElse()) // ... OBJ ITER ?DONE *LREF
+ if (!isFirst) {
+ // ... OBJ ITER *LREF DONE
+ if (!ifAlreadyDone.emitIfElse()) // ... OBJ ITER *LREF
return false;
- if (!emit1(JSOP_UNDEFINED)) // ... OBJ ITER ?DONE *LREF UNDEF
+ if (!emit1(JSOP_UNDEFINED)) // ... OBJ ITER *LREF UNDEF
return false;
- if (!emit1(JSOP_NOP_DESTRUCTURING)) // ... OBJ ITER ?DONE *LREF UNDEF
+ if (!emit1(JSOP_NOP_DESTRUCTURING)) // ... OBJ ITER *LREF UNDEF
return false;
- if (!ifAlreadyDone.emitElse()) // ... OBJ ITER ?DONE *LREF
+ // The iterator is done. Unpick a TRUE value for DONE above ITER.
+ if (!emit1(JSOP_TRUE)) // ... OBJ ITER *LREF UNDEF TRUE
+ return false;
+ if (!emit2(JSOP_UNPICK, emitted + 1)) // ... OBJ ITER TRUE *LREF UNDEF
return false;
- if (hasNext) {
- if (emitted) {
- if (!emit2(JSOP_PICK, emitted)) // ... OBJ ITER *LREF DONE
- return false;
- }
- if (!emit1(JSOP_POP)) // ... OBJ ITER *LREF
- return false;
- }
+ if (!ifAlreadyDone.emitElse()) // ... OBJ ITER *LREF
+ return false;
}
if (emitted) {
@@ -4995,59 +5303,74 @@
if (!emitAtomOp(cx->names().done, JSOP_GETPROP)) // ... OBJ ITER *LREF RESULT DONE
return false;
- if (hasNext) {
- if (!emit1(JSOP_DUP)) // ... OBJ ITER *LREF RESULT DONE DONE
- return false;
- if (!emit2(JSOP_UNPICK, emitted + 2)) // ... OBJ ITER DONE *LREF RESULT DONE
- return false;
- }
+ if (!emit1(JSOP_DUP)) // ... OBJ ITER *LREF RESULT DONE DONE
+ return false;
+ if (!emit2(JSOP_UNPICK, emitted + 2)) // ... OBJ ITER DONE *LREF RESULT DONE
+ return false;
IfThenElseEmitter ifDone(this);
- if (!ifDone.emitIfElse()) // ... OBJ ITER ?DONE *LREF RESULT
+ if (!ifDone.emitIfElse()) // ... OBJ ITER DONE *LREF RESULT
return false;
- if (!emit1(JSOP_POP)) // ... OBJ ITER ?DONE *LREF
+ if (!emit1(JSOP_POP)) // ... OBJ ITER DONE *LREF
return false;
- if (!emit1(JSOP_UNDEFINED)) // ... OBJ ITER ?DONE *LREF UNDEF
+ if (!emit1(JSOP_UNDEFINED)) // ... OBJ ITER DONE *LREF UNDEF
return false;
- if (!emit1(JSOP_NOP_DESTRUCTURING)) // ... OBJ ITER ?DONE *LREF UNDEF
+ if (!emit1(JSOP_NOP_DESTRUCTURING)) // ... OBJ ITER DONE *LREF UNDEF
return false;
- if (!ifDone.emitElse()) // ... OBJ ITER ?DONE *LREF RESULT
+ if (!ifDone.emitElse()) // ... OBJ ITER DONE *LREF RESULT
return false;
- if (!emitAtomOp(cx->names().value, JSOP_GETPROP)) // ... OBJ ITER ?DONE *LREF VALUE
+ if (!emitAtomOp(cx->names().value, JSOP_GETPROP)) // ... OBJ ITER DONE *LREF VALUE
return false;
if (!ifDone.emitEnd())
return false;
MOZ_ASSERT(ifDone.pushed() == 0);
- if (!isHead) {
+ if (!isFirst) {
if (!ifAlreadyDone.emitEnd())
return false;
- MOZ_ASSERT(ifAlreadyDone.pushed() == 1);
+ MOZ_ASSERT(ifAlreadyDone.pushed() == 2);
}
if (pndefault) {
- if (!emitDefault(pndefault, subpattern)) // ... OBJ ITER ?DONE *LREF VALUE
+ auto emitDefault = [pndefault, lhsPattern](BytecodeEmitter* bce) {
+ return bce->emitDefault(pndefault, lhsPattern); // ... OBJ ITER DONE *LREF VALUE
+ };
+
+ if (!wrapWithDestructuringIteratorCloseTryNote(tryNoteDepth, emitDefault))
return false;
}
if (!isElision) {
- if (!emitSetOrInitializeDestructuring(subpattern,
- flav)) // ... OBJ ITER ?DONE
- {
+ auto emitAssignment = [lhsPattern, flav](BytecodeEmitter* bce) {
+ return bce->emitSetOrInitializeDestructuring(lhsPattern, flav); // ... OBJ ITER DONE
+ };
+
+ if (!wrapWithDestructuringIteratorCloseTryNote(tryNoteDepth, emitAssignment))
return false;
- }
} else {
- if (!emit1(JSOP_POP)) // ... OBJ ITER ?DONE
+ if (!emit1(JSOP_POP)) // ... OBJ ITER DONE
return false;
}
}
+ // The last DONE value is on top of the stack. If not DONE, call
+ // IteratorClose.
+ // ... OBJ ITER DONE
+ IfThenElseEmitter ifDone(this);
+ if (!ifDone.emitIfElse()) // ... OBJ ITER
+ return false;
if (!emit1(JSOP_POP)) // ... OBJ
return false;
+ if (!ifDone.emitElse()) // ... OBJ ITER
+ return false;
+ if (!emitIteratorClose()) // ... OBJ
+ return false;
+ if (!ifDone.emitEnd())
+ return false;
return true;
}
@@ -5718,7 +6041,7 @@
return false;
{
- NonLocalExitControl nle(this);
+ NonLocalExitControl nle(this, NonLocalExitControl::Throw);
// Move exception back to cx->exception to prepare for
// the next catch.
@@ -6311,12 +6634,14 @@
if (!emitIterator()) // ITER
return false;
+ int32_t iterDepth = stackDepth;
+
// For-of loops have both the iterator and the value on the stack. Push
// undefined to balance the stack.
if (!emit1(JSOP_UNDEFINED)) // ITER RESULT
return false;
- LoopControl loopInfo(this, StatementKind::ForOfLoop);
+ ForOfLoopControl loopInfo(this, iterDepth);
// Annotate so IonMonkey can find the loop-closing jump.
unsigned noteIndex;
@@ -6362,18 +6687,23 @@
#endif
// Emit code to assign result.value to the iteration variable.
+ //
+ // Note that ES 13.7.5.13, step 5.c says getting result.value does not
+ // call IteratorClose, so start JSTRY_ITERCLOSE after the GETPROP.
if (!emit1(JSOP_DUP)) // ITER RESULT RESULT
return false;
if (!emitAtomOp(cx->names().value, JSOP_GETPROP)) // ITER RESULT VALUE
return false;
+ loopInfo.startNewIterCloseTryNote(this);
+
if (!emitInitializeForInOrOfTarget(forOfHead)) // ITER RESULT VALUE
return false;
if (!emit1(JSOP_POP)) // ITER RESULT
return false;
- MOZ_ASSERT(this->stackDepth == loopDepth,
+ MOZ_ASSERT(stackDepth == loopDepth,
"the stack must be balanced around the initializing "
"operation");
@@ -6382,6 +6712,9 @@
if (!emitTree(forBody)) // ITER RESULT
return false;
+ if (!loopInfo.finishIterCloseTryNote(this))
+ return false;
+
// Set offset for continues.
loopInfo.continueTarget = { offset() };
@@ -6393,7 +6726,17 @@
if (!emit1(JSOP_DUP)) // ITER ITER
return false;
- if (!emitIteratorNext(forOfHead)) // ITER RESULT
+ // Certain builtins (e.g. Array.from) are implemented in self-hosting
+ // as for-of loops.
+ bool allowSelfHostedIter = false;
+ if (emitterMode == BytecodeEmitter::SelfHosting &&
+ forHeadExpr->isKind(PNK_CALL) &&
+ forHeadExpr->pn_head->name() == cx->names().allowContentIter)
+ {
+ allowSelfHostedIter = true;
+ }
+
+ if (!emitIteratorNext(forOfHead, allowSelfHostedIter)) // ITER RESULT
return false;
if (!emit1(JSOP_DUP)) // ITER RESULT RESULT
return false;
@@ -7617,7 +7960,7 @@
return false;
}
- NonLocalExitControl nle(this);
+ NonLocalExitControl nle(this, NonLocalExitControl::Return);
if (!nle.prepareForNonLocalJumpToOutermost())
return false;
@@ -7732,61 +8075,77 @@
// Catch location.
stackDepth = uint32_t(depth); // ITER RESULT
- if (!emit1(JSOP_POP)) // ITER
+ if (!emit1(JSOP_EXCEPTION)) // ITER RESULT EXCEPTION
return false;
- // THROW? = 'throw' in ITER
- if (!emit1(JSOP_EXCEPTION)) // ITER EXCEPTION
+ if (!emitDupAt(2)) // ITER RESULT EXCEPTION ITER
return false;
- if (!emit1(JSOP_SWAP)) // EXCEPTION ITER
+ if (!emit1(JSOP_DUP)) // ITER RESULT EXCEPTION ITER ITER
return false;
- if (!emit1(JSOP_DUP)) // EXCEPTION ITER ITER
+ if (!emitAtomOp(cx->names().throw_, JSOP_CALLPROP)) // ITER RESULT EXCEPTION ITER THROW
return false;
- if (!emitAtomOp(cx->names().throw_, JSOP_STRING)) // EXCEPTION ITER ITER "throw"
+ if (!emit1(JSOP_DUP)) // ITER RESULT EXCEPTION ITER THROW THROW
return false;
- if (!emit1(JSOP_SWAP)) // EXCEPTION ITER "throw" ITER
+ if (!emit1(JSOP_UNDEFINED)) // ITER RESULT EXCEPTION ITER THROW THROW UNDEFINED
return false;
- if (!emit1(JSOP_IN)) // EXCEPTION ITER THROW?
+ if (!emit1(JSOP_EQ)) // ITER RESULT EXCEPTION ITER THROW ?EQL
return false;
- // if (THROW?) goto delegate
- JumpList checkThrow;
- if (!emitJump(JSOP_IFNE, &checkThrow)) // EXCEPTION ITER
- return false;
- if (!emit1(JSOP_POP)) // EXCEPTION
+
+ IfThenElseEmitter ifThrowMethodIsNotDefined(this);
+ if (!ifThrowMethodIsNotDefined.emitIf()) // ITER RESULT EXCEPTION ITER THROW
return false;
- if (!emit1(JSOP_THROW)) // throw EXCEPTION
+ if (!emitUint16Operand(JSOP_THROWMSG, JSMSG_ITERATOR_NO_THROW)) // throw
return false;
-
- if (!emitJumpTargetAndPatch(checkThrow)) // delegate:
+ if (!ifThrowMethodIsNotDefined.emitEnd()) // ITER OLDRESULT EXCEPTION ITER THROW
return false;
- // RESULT = ITER.throw(EXCEPTION) // EXCEPTION ITER
- stackDepth = uint32_t(depth);
- if (!emit1(JSOP_DUP)) // EXCEPTION ITER ITER
+ // ES 14.4.13, YieldExpression : yield * AssignmentExpression, step 5.b.iii.4.
+ // RESULT = ITER.throw(EXCEPTION) // ITER OLDRESULT EXCEPTION ITER THROW
+ if (!emit1(JSOP_SWAP)) // ITER OLDRESULT EXCEPTION THROW ITER
return false;
- if (!emit1(JSOP_DUP)) // EXCEPTION ITER ITER ITER
+ if (!emit2(JSOP_PICK, 2)) // ITER OLDRESULT THROW ITER EXCEPTION
return false;
- if (!emitAtomOp(cx->names().throw_, JSOP_CALLPROP)) // EXCEPTION ITER ITER THROW
+ if (!emitCall(JSOP_CALL, 1, iter)) // ITER OLDRESULT RESULT
return false;
- if (!emit1(JSOP_SWAP)) // EXCEPTION ITER THROW ITER
+ checkTypeSet(JSOP_CALL);
+ if (!emitCheckIsObj(CheckIsObjectKind::IteratorThrow)) // ITER OLDRESULT RESULT
return false;
- if (!emit2(JSOP_PICK, 3)) // ITER THROW ITER EXCEPTION
+ if (!emit1(JSOP_SWAP)) // ITER RESULT OLDRESULT
return false;
- if (!emitCall(JSOP_CALL, 1, iter)) // ITER RESULT
+ if (!emit1(JSOP_POP)) // ITER RESULT
return false;
- checkTypeSet(JSOP_CALL);
MOZ_ASSERT(this->stackDepth == depth);
JumpList checkResult;
+ // Note that there is no GOSUB to the finally block here. If the iterator has a
+ // "throw" method, it does not perform IteratorClose per
+ // ES 14.4.13, YieldExpression : yield * AssignmentExpression, step 5.b.ii.
if (!emitJump(JSOP_GOTO, &checkResult)) // goto checkResult
return false;
- // Catch epilogue.
+ // The finally block, IteratorClose logic.
+
+ JumpTarget finallyStart{ 0 };
+ if (!emitJumpTarget(&finallyStart))
+ return false;
+ if (!emit1(JSOP_FINALLY)) // ITER RESULT FTYPE FVALUE
+ return false;
+ if (!emitDupAt(3)) // ITER RESULT FTYPE FVALUE ITER
+ return false;
+ if (!emitIteratorClose(Some(tryStart))) // ITER RESULT FTYPE FVALUE
+ return false;
+ if (!emit1(JSOP_RETSUB)) // ITER RESULT
+ return false;
+
+ // Catch and finally epilogue.
// This is a peace offering to ReconstructPCStack. See the note in EmitTry.
if (!emit1(JSOP_NOP))
return false;
- if (!tryNoteList.append(JSTRY_CATCH, depth, tryStart.offset + JSOP_TRY_LENGTH, tryEnd.offset))
+ size_t tryStartOffset = tryStart.offset + JSOP_TRY_LENGTH;
+ if (!tryNoteList.append(JSTRY_CATCH, depth, tryStartOffset, tryEnd.offset))
+ return false;
+ if (!tryNoteList.append(JSTRY_FINALLY, depth, tryStartOffset, finallyStart.offset))
return false;
- // After the try/catch block: send the received value to the iterator.
+ // After the try-catch-finally block: send the received value to the iterator.
if (!emitJumpTargetAndPatch(send)) // send:
return false;
@@ -8155,10 +8514,10 @@
}
bool
-BytecodeEmitter::emitSelfHostedAllowContentSpread(ParseNode* pn)
+BytecodeEmitter::emitSelfHostedAllowContentIter(ParseNode* pn)
{
if (pn->pn_count != 2) {
- reportError(pn, JSMSG_MORE_ARGS_NEEDED, "allowContentSpread", "1", "");
+ reportError(pn, JSMSG_MORE_ARGS_NEEDED, "allowContentIter", "1", "");
return false;
}
@@ -8184,7 +8543,7 @@
if (!pn->isKind(PNK_NAME)) {
if (emitterMode == BytecodeEmitter::SelfHosting && pn->isKind(PNK_CALL)) {
ParseNode* pn2 = pn->pn_head;
- if (pn2->getKind() == PNK_NAME && pn2->name() == cx->names().allowContentSpread)
+ if (pn2->getKind() == PNK_NAME && pn2->name() == cx->names().allowContentIter)
return isRestParameter(pn2->pn_next, result);
}
*result = false;
@@ -8292,8 +8651,8 @@
return emitSelfHostedResumeGenerator(pn);
if (pn2->name() == cx->names().forceInterpreter)
return emitSelfHostedForceInterpreter(pn);
- if (pn2->name() == cx->names().allowContentSpread)
- return emitSelfHostedAllowContentSpread(pn);
+ if (pn2->name() == cx->names().allowContentIter)
+ return emitSelfHostedAllowContentIter(pn);
// Fall through.
}
if (!emitGetName(pn2, callop))
@@ -8948,7 +9307,7 @@
if (!updateSourceCoordNotes(pn2->pn_pos.begin))
return false;
- bool allowSelfHostedSpread = false;
+ bool allowSelfHostedIter = false;
if (pn2->isKind(PNK_ELISION)) {
if (!emit1(JSOP_HOLE))
return false;
@@ -8959,9 +9318,9 @@
if (emitterMode == BytecodeEmitter::SelfHosting &&
expr->isKind(PNK_CALL) &&
- expr->pn_head->name() == cx->names().allowContentSpread)
+ expr->pn_head->name() == cx->names().allowContentIter)
{
- allowSelfHostedSpread = true;
+ allowSelfHostedIter = true;
}
} else {
expr = pn2;
@@ -8976,7 +9335,7 @@
return false;
if (!emit2(JSOP_PICK, 2)) // ITER ARRAY INDEX
return false;
- if (!emitSpread(allowSelfHostedSpread)) // ARRAY INDEX
+ if (!emitSpread(allowSelfHostedIter)) // ARRAY INDEX
return false;
} else if (afterSpread) {
if (!emit1(JSOP_INITELEM_INC))
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/frontend/BytecodeEmitter.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/frontend/BytecodeEmitter.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/frontend/BytecodeEmitter.h 2017-01-13 01:17:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/frontend/BytecodeEmitter.h 2017-01-16 01:17:18.000000000 +0000
@@ -679,6 +679,13 @@
// Pops iterator from the top of the stack. Pushes the result of |.next()|
// onto the stack.
MOZ_MUST_USE bool emitIteratorNext(ParseNode* pn, bool allowSelfHosted = false);
+ MOZ_MUST_USE bool emitIteratorClose(
+ mozilla::Maybe yieldStarTryStart = mozilla::Nothing(),
+ bool allowSelfHosted = false);
+
+ template
+ MOZ_MUST_USE bool wrapWithDestructuringIteratorCloseTryNote(int32_t iterDepth,
+ InnerEmitter emitter);
// Check if the value on top of the stack is "undefined". If so, replace
// that value on the stack with the value defined by |defaultExpr|.
@@ -726,7 +733,7 @@
MOZ_MUST_USE bool emitSelfHostedCallFunction(ParseNode* pn);
MOZ_MUST_USE bool emitSelfHostedResumeGenerator(ParseNode* pn);
MOZ_MUST_USE bool emitSelfHostedForceInterpreter(ParseNode* pn);
- MOZ_MUST_USE bool emitSelfHostedAllowContentSpread(ParseNode* pn);
+ MOZ_MUST_USE bool emitSelfHostedAllowContentIter(ParseNode* pn);
MOZ_MUST_USE bool emitComprehensionFor(ParseNode* compFor);
MOZ_MUST_USE bool emitComprehensionForIn(ParseNode* pn);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/AtomicOperations.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/AtomicOperations.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/AtomicOperations.h 2017-01-13 01:25:23.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/AtomicOperations.h 2017-01-16 01:26:25.000000000 +0000
@@ -341,6 +341,8 @@
# include "jit/none/AtomicOperations-ppc.h"
# elif defined(__aarch64__)
# include "jit/arm64/AtomicOperations-arm64.h"
+# elif defined(__alpha__)
+# include "jit/none/AtomicOperations-ppc.h"
# elif defined(__hppa__)
# include "jit/none/AtomicOperations-ppc.h"
# else
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/BaselineCompiler.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/BaselineCompiler.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/BaselineCompiler.cpp 2017-01-13 01:25:29.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/BaselineCompiler.cpp 2017-01-16 01:26:25.000000000 +0000
@@ -3978,7 +3978,7 @@
}
bool
-BaselineCompiler::emit_JSOP_ISNOITER()
+BaselineCompiler::emitIsMagicValue()
{
frame.syncStack(0);
@@ -3997,6 +3997,12 @@
}
bool
+BaselineCompiler::emit_JSOP_ISNOITER()
+{
+ return emitIsMagicValue();
+}
+
+bool
BaselineCompiler::emit_JSOP_ENDITER()
{
if (!emit_JSOP_JUMPTARGET())
@@ -4008,6 +4014,12 @@
}
bool
+BaselineCompiler::emit_JSOP_ISGENCLOSING()
+{
+ return emitIsMagicValue();
+}
+
+bool
BaselineCompiler::emit_JSOP_GETRVAL()
{
frame.syncStack(0);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/BaselineCompiler.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/BaselineCompiler.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/BaselineCompiler.h 2017-01-13 01:25:30.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/BaselineCompiler.h 2017-01-16 01:26:25.000000000 +0000
@@ -203,6 +203,7 @@
_(JSOP_MOREITER) \
_(JSOP_ISNOITER) \
_(JSOP_ENDITER) \
+ _(JSOP_ISGENCLOSING) \
_(JSOP_GENERATOR) \
_(JSOP_INITIALYIELD) \
_(JSOP_YIELD) \
@@ -342,6 +343,8 @@
MOZ_MUST_USE bool emitThrowConstAssignment();
MOZ_MUST_USE bool emitUninitializedLexicalCheck(const ValueOperand& val);
+ MOZ_MUST_USE bool emitIsMagicValue();
+
MOZ_MUST_USE bool addPCMappingEntry(bool addIndexEntry);
MOZ_MUST_USE bool addYieldOffset();
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/IonBuilder.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/IonBuilder.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/IonBuilder.cpp 2017-01-13 01:26:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/IonBuilder.cpp 2017-01-16 01:27:04.000000000 +0000
@@ -1141,9 +1141,11 @@
current->add(env);
// This reproduce what is done in CallObject::createForFunction. Skip
- // this for analyses, as the script might not have a baseline script
- // with template objects yet.
- if (fun->needsSomeEnvironmentObject() && !info().isAnalysis()) {
+ // this for the arguments analysis, as the script might not have a
+ // baseline script with template objects yet.
+ if (fun->needsSomeEnvironmentObject() &&
+ info().analysisMode() != Analysis_ArgumentsUsage)
+ {
if (fun->needsNamedLambdaEnvironment())
env = createNamedLambdaObject(callee, env);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/JitFrames.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/JitFrames.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit/JitFrames.cpp 2017-01-13 01:26:26.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit/JitFrames.cpp 2017-01-16 01:27:06.000000000 +0000
@@ -328,23 +328,47 @@
}
static void
-CloseLiveIteratorIon(JSContext* cx, const InlineFrameIterator& frame, uint32_t stackSlot)
+CloseLiveIteratorIon(JSContext* cx, const InlineFrameIterator& frame, JSTryNote* tn)
{
+ MOZ_ASSERT(tn->kind == JSTRY_FOR_IN ||
+ tn->kind == JSTRY_ITERCLOSE ||
+ tn->kind == JSTRY_DESTRUCTURING_ITERCLOSE);
+
+ bool isDestructuring = tn->kind == JSTRY_DESTRUCTURING_ITERCLOSE;
+ MOZ_ASSERT_IF(!isDestructuring, tn->stackDepth > 0);
+ MOZ_ASSERT_IF(isDestructuring, tn->stackDepth > 1);
+
SnapshotIterator si = frame.snapshotIterator();
- // Skip stack slots until we reach the iterator object.
- uint32_t skipSlots = NumArgAndLocalSlots(frame) + stackSlot - 1;
+ // Skip stack slots until we reach the iterator object on the stack. For
+ // the destructuring case, we also need to get the "done" value.
+ uint32_t stackSlot = tn->stackDepth;
+ uint32_t adjust = isDestructuring ? 2 : 1;
+ uint32_t skipSlots = NumArgAndLocalSlots(frame) + stackSlot - adjust;
for (unsigned i = 0; i < skipSlots; i++)
si.skip();
Value v = si.read();
- RootedObject obj(cx, &v.toObject());
+ RootedObject iterObject(cx, &v.toObject());
- if (cx->isExceptionPending())
- UnwindIteratorForException(cx, obj);
- else
- UnwindIteratorForUncatchableException(cx, obj);
+ if (isDestructuring) {
+ Value v = si.read();
+ MOZ_ASSERT(v.isBoolean());
+ // Do not call IteratorClose if the destructuring iterator is already
+ // done.
+ if (v.isTrue())
+ return;
+ }
+
+ if (cx->isExceptionPending()) {
+ if (tn->kind == JSTRY_FOR_IN)
+ UnwindIteratorForException(cx, iterObject);
+ else
+ IteratorCloseForException(cx, iterObject);
+ } else {
+ UnwindIteratorForUncatchableException(cx, iterObject);
+ }
}
class IonFrameStackDepthOp
@@ -417,14 +441,13 @@
JSTryNote* tn = *tni;
switch (tn->kind) {
- case JSTRY_FOR_IN: {
- MOZ_ASSERT(JSOp(*(script->main() + tn->start + tn->length)) == JSOP_ENDITER);
- MOZ_ASSERT(tn->stackDepth > 0);
-
- uint32_t localSlot = tn->stackDepth;
- CloseLiveIteratorIon(cx, frame, localSlot);
+ case JSTRY_FOR_IN:
+ case JSTRY_ITERCLOSE:
+ case JSTRY_DESTRUCTURING_ITERCLOSE:
+ MOZ_ASSERT_IF(tn->kind == JSTRY_FOR_IN,
+ JSOp(*(script->main() + tn->start + tn->length)) == JSOP_ENDITER);
+ CloseLiveIteratorIon(cx, frame, tn);
break;
- }
case JSTRY_FOR_OF:
case JSTRY_LOOP:
@@ -602,7 +625,7 @@
uint8_t* framePointer;
uint8_t* stackPointer;
BaselineFrameAndStackPointersFromTryNote(tn, frame, &framePointer, &stackPointer);
- Value iterValue(*(Value*) stackPointer);
+ Value iterValue(*reinterpret_cast(stackPointer));
RootedObject iterObject(cx, &iterValue.toObject());
if (!UnwindIteratorForException(cx, iterObject)) {
// See comment in the JSTRY_FOR_IN case in Interpreter.cpp's
@@ -613,6 +636,36 @@
}
break;
}
+
+ case JSTRY_ITERCLOSE: {
+ uint8_t* framePointer;
+ uint8_t* stackPointer;
+ BaselineFrameAndStackPointersFromTryNote(tn, frame, &framePointer, &stackPointer);
+ Value iterValue(*reinterpret_cast(stackPointer));
+ RootedObject iterObject(cx, &iterValue.toObject());
+ if (!IteratorCloseForException(cx, iterObject)) {
+ SettleOnTryNote(cx, tn, frame, ei, rfe, pc);
+ return false;
+ }
+ break;
+ }
+
+ case JSTRY_DESTRUCTURING_ITERCLOSE: {
+ uint8_t* framePointer;
+ uint8_t* stackPointer;
+ BaselineFrameAndStackPointersFromTryNote(tn, frame, &framePointer, &stackPointer);
+ Value doneValue(*(reinterpret_cast(stackPointer)));
+ MOZ_ASSERT(doneValue.isBoolean());
+ if (doneValue.isFalse()) {
+ Value iterValue(*(reinterpret_cast(stackPointer) + 1));
+ RootedObject iterObject(cx, &iterValue.toObject());
+ if (!IteratorCloseForException(cx, iterObject)) {
+ SettleOnTryNote(cx, tn, frame, ei, rfe, pc);
+ return false;
+ }
+ }
+ break;
+ }
case JSTRY_FOR_OF:
case JSTRY_LOOP:
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/debug/bug1330339.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/debug/bug1330339.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/debug/bug1330339.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/debug/bug1330339.js 2017-01-16 01:23:03.000000000 +0000
@@ -0,0 +1,36 @@
+// |jit-test| test-also-wasm-baseline; error: TestComplete
+
+if (!wasmIsSupported())
+ throw "TestComplete";
+
+let module = new WebAssembly.Module(wasmTextToBinary(`
+ (module
+ (import "global" "func")
+ (func (export "test")
+ call 0 ;; calls the import, which is func #0
+ )
+ )
+`));
+
+let imports = {
+ global: {
+ func: function () {
+ let g = newGlobal();
+ let dbg = new Debugger(g);
+ dbg.onExceptionUnwind = function (frame) {
+ frame.older;
+ };
+ g.eval("throw new Error();");
+ }
+ }
+};
+let instance = new WebAssembly.Instance(module, imports);
+
+try {
+ instance.exports.test();
+ assertEq(false, true);
+} catch (e) {
+ assertEq(e.constructor.name, 'Error');
+}
+
+throw "TestComplete";
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/debug/bug1330491.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/debug/bug1330491.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/debug/bug1330491.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/debug/bug1330491.js 2017-01-16 01:23:03.000000000 +0000
@@ -0,0 +1,21 @@
+// |jit-test| test-also-wasm-baseline; error: TestComplete
+
+if (!wasmIsSupported())
+ throw "TestComplete";
+
+(function createShortLivedDebugger() {
+ var g = newGlobal();
+ g.debuggeeGlobal = this;
+ g.eval("(" + function () {
+ dbg = new Debugger(debuggeeGlobal);
+ } + ")();");
+})();
+
+let module = new WebAssembly.Module(wasmTextToBinary('(module (func))'));
+new WebAssembly.Instance(module);
+
+gcslice(1000000);
+
+new WebAssembly.Instance(module);
+
+throw "TestComplete";
\ No newline at end of file
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/binary.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/binary.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/binary.js 2017-01-13 01:25:20.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/binary.js 2017-01-16 01:26:22.000000000 +0000
@@ -203,6 +203,21 @@
return { name: memoryId, body };
}
+function dataSection(segmentArrays) {
+ var body = [];
+ body.push(...varU32(segmentArrays.length));
+ for (let array of segmentArrays) {
+ body.push(...varU32(0)); // table index
+ body.push(...varU32(I32ConstCode));
+ body.push(...varS32(array.offset));
+ body.push(...varU32(EndCode));
+ body.push(...varU32(array.elems.length));
+ for (let elem of array.elems)
+ body.push(...varU32(elem));
+ }
+ return { name: dataId, body };
+}
+
function elemSection(elemArrays) {
var body = [];
body.push(...varU32(elemArrays.length));
@@ -278,7 +293,7 @@
bodySection([v2vBody])
]), {a:{"":()=>{}}});
-assertErrorMessage(() => wasmEval(moduleWithSections([ {name: dataId, body: [], } ])), CompileError, /data section requires a memory section/);
+assertErrorMessage(() => wasmEval(moduleWithSections([ dataSection([{offset:1, elems:[]}]) ])), CompileError, /data segment requires a memory section/);
wasmEval(moduleWithSections([tableSection(0)]));
wasmEval(moduleWithSections([elemSection([])]));
@@ -291,23 +306,47 @@
wasmEval(moduleWithSections([sigSection([v2vSig]), declSection([0,0,0]), tableSection(4), elemSection([{offset:0, elems:[0,1,0,2]}]), bodySection([v2vBody, v2vBody, v2vBody])]));
wasmEval(moduleWithSections([sigSection([v2vSig,i2vSig]), declSection([0,0,1]), tableSection(3), elemSection([{offset:0,elems:[0,1,2]}]), bodySection([v2vBody, v2vBody, v2vBody])]));
-function invalidTableSection0() {
+function tableSection0() {
var body = [];
body.push(...varU32(0)); // number of tables
return { name: tableId, body };
}
-assertErrorMessage(() => wasmEval(moduleWithSections([invalidTableSection0()])), CompileError, /number of tables must be exactly one/);
+function invalidTableSection2() {
+ var body = [];
+ body.push(...varU32(2)); // number of tables
+ body.push(...varU32(AnyFuncCode));
+ body.push(...varU32(0x0));
+ body.push(...varU32(0));
+ body.push(...varU32(AnyFuncCode));
+ body.push(...varU32(0x0));
+ body.push(...varU32(0));
+ return { name: tableId, body };
+}
+
+wasmEval(moduleWithSections([tableSection0()]));
+assertErrorMessage(() => wasmEval(moduleWithSections([invalidTableSection2()])), CompileError, /number of tables must be at most one/);
wasmEval(moduleWithSections([memorySection(0)]));
-function invalidMemorySection0() {
+function memorySection0() {
var body = [];
body.push(...varU32(0)); // number of memories
return { name: memoryId, body };
}
-assertErrorMessage(() => wasmEval(moduleWithSections([invalidMemorySection0()])), CompileError, /number of memories must be exactly one/);
+function invalidMemorySection2() {
+ var body = [];
+ body.push(...varU32(2)); // number of memories
+ body.push(...varU32(0x0));
+ body.push(...varU32(0));
+ body.push(...varU32(0x0));
+ body.push(...varU32(0));
+ return { name: memoryId, body };
+}
+
+wasmEval(moduleWithSections([memorySection0()]));
+assertErrorMessage(() => wasmEval(moduleWithSections([invalidMemorySection2()])), CompileError, /number of memories must be at most one/);
// Test early 'end'
const bodyMismatch = /function body length mismatch/;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/call_indirect.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/call_indirect.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/call_indirect.wast 2017-01-13 01:25:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/call_indirect.wast 2017-01-16 01:26:23.000000000 +0000
@@ -360,3 +360,9 @@
)
"unknown type"
)
+
+;; invalid table
+(assert_invalid
+ (module (table anyfunc (elem 0 0)))
+ "unknown function 0"
+)
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/custom_section.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/custom_section.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/custom_section.wast 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/custom_section.wast 2017-01-16 01:26:23.000000000 +0000
@@ -0,0 +1,92 @@
+(module
+ "\00asm" "\0d\00\00\00"
+ "\00\24\10" "a custom section" "this is the payload"
+ "\00\20\10" "a custom section" "this is payload"
+ "\00\11\10" "a custom section" ""
+ "\00\10\00" "" "this is payload"
+ "\00\01\00" "" ""
+ "\00\24\10" "\00\00custom sectio\00" "this is the payload"
+)
+
+(module
+ "\00asm" "\0d\00\00\00"
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\01\01\00" ;; type section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\02\01\00" ;; import section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\03\01\00" ;; function section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\04\01\00" ;; table section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\05\01\00" ;; memory section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\06\01\00" ;; global section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\07\01\00" ;; export section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\09\01\00" ;; element section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\0a\01\00" ;; code section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+ "\0b\01\00" ;; data section
+ "\00\0e\06" "custom" "payload"
+ "\00\0e\06" "custom" "payload"
+)
+
+(module
+ "\00asm" "\0d\00\00\00"
+ "\01\07\01\60\02\7f\7f\01\7f" ;; type section
+ "\00\1a\06" "custom" "this is the payload" ;; custom section
+ "\03\02\01\00" ;; function section
+ "\07\0a\01\06\61\64\64\54\77\6f\00\00" ;; export section
+ "\0a\09\01\07\00\20\00\20\01\6a\0b" ;; code section
+ "\00\1b\07" "custom2" "this is the payload" ;; custom section
+)
+
+(assert_malformed
+ (module
+ "\00asm" "\0d\00\00\00"
+ "\00\00"
+ )
+ "unexpected end"
+)
+
+(assert_malformed
+ (module
+ "\00asm" "\0d\00\00\00"
+ "\00\26\10" "a custom section" "this is the payload"
+ )
+ "unexpected end"
+)
+
+(assert_malformed
+ (module
+ "\00asm" "\0d\00\00\00"
+ "\00\25\10" "a custom section" "this is the payload"
+ "\00\24\10" "a custom section" "this is the payload"
+ )
+ "invalid section id"
+)
+
+(assert_malformed
+ (module
+ "\00asm" "\0d\00\00\00"
+ "\01\07\01\60\02\7f\7f\01\7f" ;; type section
+ "\00\25\10" "a custom section" "this is the payload" ;; invalid length!
+ "\03\02\01\00" ;; function section
+ "\0a\09\01\07\00\20\00\20\01\6a\0b" ;; code section
+ "\00\1b\07" "custom2" "this is the payload" ;; custom section
+ )
+ "function and code section have inconsistent lengths"
+)
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/custom_section.wast.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/custom_section.wast.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/custom_section.wast.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/custom_section.wast.js 2017-01-16 01:26:23.000000000 +0000
@@ -0,0 +1 @@
+var importedArgs = ['custom_section.wast']; load(scriptdir + '../wast.js');
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/float_misc.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/float_misc.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/float_misc.wast 2017-01-13 01:25:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/float_misc.wast 2017-01-16 01:26:23.000000000 +0000
@@ -631,13 +631,3 @@
(assert_return (invoke "f32.nearest" (f32.const 0x1.fffffep+22)) (f32.const 0x1p+23))
(assert_return (invoke "f64.nearest" (f64.const -0x1.fffffffffffffp+51)) (f64.const -0x1p+52))
(assert_return (invoke "f64.nearest" (f64.const 0x1.fffffffffffffp+51)) (f64.const 0x1p+52))
-
-;; Test that min and max behave properly with signaling NaNs.
-(assert_return (invoke "f32.min" (f32.const 0.0) (f32.const nan:0x200000)) (f32.const nan:0x600000))
-(assert_return (invoke "f32.min" (f32.const nan:0x200000) (f32.const 0.0)) (f32.const nan:0x600000))
-(assert_return (invoke "f32.max" (f32.const 0.0) (f32.const nan:0x200000)) (f32.const nan:0x600000))
-(assert_return (invoke "f32.max" (f32.const nan:0x200000) (f32.const 0.0)) (f32.const nan:0x600000))
-(assert_return (invoke "f64.min" (f64.const 0.0) (f64.const nan:0x4000000000000)) (f64.const nan:0xc000000000000))
-(assert_return (invoke "f64.min" (f64.const nan:0x4000000000000) (f64.const 0.0)) (f64.const nan:0xc000000000000))
-(assert_return (invoke "f64.max" (f64.const 0.0) (f64.const nan:0x4000000000000)) (f64.const nan:0xc000000000000))
-(assert_return (invoke "f64.max" (f64.const nan:0x4000000000000) (f64.const 0.0)) (f64.const nan:0xc000000000000))
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/globals.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/globals.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/globals.wast 2017-01-13 01:25:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/globals.wast 2017-01-16 01:26:24.000000000 +0000
@@ -95,3 +95,15 @@
(module (global i32 (get_global 1)) (global i32 (i32.const 0)))
"unknown global"
)
+
+(module
+ (import "spectest" "global" (global i32))
+)
+(assert_malformed (module "\00asm\0d\00\00\00\02\94\80\80\80\00\01\08\73\70\65\63\74\65\73\74\06\67\6c\6f\62\61\6c\03\7f\02") "invalid mutability")
+
+(module
+ (global i32 (i32.const 0))
+)
+(assert_malformed (module "\00asm\0d\00\00\00\06\86\80\80\80\00\01\7f\ff\41\00\0b") "invalid mutability")
+(assert_malformed (module "\00asm\0d\00\00\00\06\86\80\80\80\00\01\7f\d4\41\00\0b") "invalid mutability")
+(assert_malformed (module "\00asm\0d\00\00\00\06\86\80\80\80\00\01\7f\02\41\00\0b") "invalid mutability")
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/memory.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/memory.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/memory.wast 2017-01-13 01:25:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/memory.wast 2017-01-16 01:26:24.000000000 +0000
@@ -17,6 +17,9 @@
;; (module (memory 1) (data (get_global 0) "a") (global i32 (i32.const 0)))
;; (module (memory 1) (data (get_global $g) "a") (global $g i32 (i32.const 0)))
+(assert_invalid (module (memory 0) (memory 0)) "multiple memories")
+(assert_invalid (module (memory (import "spectest" "memory") 0) (memory 0)) "multiple memories")
+
(module (memory (data)) (func (export "memsize") (result i32) (current_memory)))
(assert_return (invoke "memsize") (i32.const 0))
(module (memory (data "")) (func (export "memsize") (result i32) (current_memory)))
@@ -29,6 +32,31 @@
(assert_invalid (module (data (i32.const 0) "x")) "unknown memory")
(assert_invalid
+ (module (func (drop (f32.load (i32.const 0)))))
+ "unknown memory"
+)
+(assert_invalid
+ (module (func (f32.store (f32.const 0) (i32.const 0))))
+ "unknown memory"
+)
+(assert_invalid
+ (module (func (drop (i32.load8_s (i32.const 0)))))
+ "unknown memory"
+)
+(assert_invalid
+ (module (func (i32.store8 (i32.const 0) (i32.const 0))))
+ "unknown memory"
+)
+(assert_invalid
+ (module (func (drop (current_memory))))
+ "unknown memory"
+)
+(assert_invalid
+ (module (func (drop (grow_memory (i32.const 0)))))
+ "unknown memory"
+)
+
+(assert_invalid
(module (memory 1) (data (i64.const 0)))
"type mismatch"
)
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/start.wast firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/start.wast
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jit-test/tests/wasm/spec/start.wast 2017-01-13 01:25:23.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jit-test/tests/wasm/spec/start.wast 2017-01-16 01:26:24.000000000 +0000
@@ -2,6 +2,7 @@
(module (func) (start 1))
"unknown function"
)
+
(assert_invalid
(module
(func $main (result i32) (return (i32.const 0)))
@@ -16,6 +17,7 @@
)
"start function"
)
+
(module
(memory (data "A"))
(func $inc
@@ -87,6 +89,11 @@
(start $main)
)
+(module
+ (func $print (import "spectest" "print"))
+ (start $print)
+)
+
(assert_trap
(module (func $main (unreachable)) (start $main))
"unreachable"
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsiter.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsiter.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsiter.cpp 2017-01-13 01:27:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsiter.cpp 2017-01-16 01:29:07.000000000 +0000
@@ -12,6 +12,7 @@
#include "mozilla/Maybe.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/PodOperations.h"
+#include "mozilla/Unused.h"
#include "jsarray.h"
#include "jsatom.h"
@@ -1217,6 +1218,7 @@
}
return LegacyGeneratorObject::close(cx, obj);
}
+
return true;
}
@@ -1234,6 +1236,56 @@
return true;
}
+bool
+js::IteratorCloseForException(JSContext* cx, HandleObject obj)
+{
+ MOZ_ASSERT(cx->isExceptionPending());
+
+ bool isClosingGenerator = cx->isClosingGenerator();
+ JS::AutoSaveExceptionState savedExc(cx);
+
+ // Implements IteratorClose (ES 7.4.6) for exception unwinding. See
+ // also the bytecode generated by BytecodeEmitter::emitIteratorClose.
+
+ // Step 3.
+ //
+ // Get the "return" method.
+ RootedValue returnMethod(cx);
+ if (!GetProperty(cx, obj, obj, cx->names().return_, &returnMethod))
+ return false;
+
+ // Step 4.
+ //
+ // Do nothing if "return" is null or undefined. Throw a TypeError if the
+ // method is not IsCallable.
+ if (returnMethod.isNullOrUndefined())
+ return true;
+ if (!IsCallable(returnMethod))
+ return ReportIsNotFunction(cx, returnMethod);
+
+ // Step 5, 6, 8.
+ //
+ // Call "return" if it is not null or undefined.
+ RootedValue rval(cx);
+ bool ok = Call(cx, returnMethod, obj, &rval);
+ if (isClosingGenerator) {
+ // Closing an iterator is implemented as an exception, but in spec
+ // terms it is a Completion value with [[Type]] return. In this case
+ // we *do* care if the call threw and if it returned an object.
+ if (!ok)
+ return false;
+ if (!rval.isObject())
+ return ThrowCheckIsObject(cx, CheckIsObjectKind::IteratorReturn);
+ } else {
+ // We don't care if the call threw or that it returned an Object, as
+ // Step 6 says if IteratorClose is being called during a throw, the
+ // original throw has primacy.
+ savedExc.restore();
+ }
+
+ return true;
+}
+
void
js::UnwindIteratorForUncatchableException(JSContext* cx, JSObject* obj)
{
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsiter.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsiter.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsiter.h 2017-01-13 01:27:53.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsiter.h 2017-01-16 01:29:07.000000000 +0000
@@ -183,6 +183,9 @@
bool
UnwindIteratorForException(JSContext* cx, HandleObject obj);
+bool
+IteratorCloseForException(JSContext* cx, HandleObject obj);
+
void
UnwindIteratorForUncatchableException(JSContext* cx, JSObject* obj);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/js.msg firefox-trunk-53.0~a1~hg20170115r329516/js/src/js.msg
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/js.msg 2017-01-13 01:27:29.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/js.msg 2017-01-16 01:28:13.000000000 +0000
@@ -95,7 +95,7 @@
MSG_DEF(JSMSG_NOT_ITERATOR, 1, JSEXN_TYPEERR, "{0} is not iterator")
MSG_DEF(JSMSG_ALREADY_HAS_PRAGMA, 2, JSEXN_WARN, "{0} is being assigned a {1}, but already has one")
MSG_DEF(JSMSG_GET_ITER_RETURNED_PRIMITIVE, 0, JSEXN_TYPEERR, "[Symbol.iterator]() returned a non-object value")
-MSG_DEF(JSMSG_NEXT_RETURNED_PRIMITIVE, 0, JSEXN_TYPEERR, "iterator.next() returned a non-object value")
+MSG_DEF(JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, 1, JSEXN_TYPEERR, "iterator.{0}() returned a non-object value")
MSG_DEF(JSMSG_CANT_SET_PROTO, 0, JSEXN_TYPEERR, "can't set prototype of this object")
MSG_DEF(JSMSG_CANT_SET_PROTO_OF, 1, JSEXN_TYPEERR, "can't set prototype of {0}")
MSG_DEF(JSMSG_CANT_SET_PROTO_CYCLE, 0, JSEXN_TYPEERR, "can't set prototype: it would cause a prototype chain cycle")
@@ -588,3 +588,4 @@
// Iterator
MSG_DEF(JSMSG_RETURN_NOT_CALLABLE, 0, JSEXN_TYPEERR, "property 'return' of iterator is not callable")
+MSG_DEF(JSMSG_ITERATOR_NO_THROW, 0, JSEXN_TYPEERR, "iterator does not have a 'throw' method")
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcode.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcode.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcode.cpp 2017-01-13 01:27:54.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcode.cpp 2017-01-16 01:29:09.000000000 +0000
@@ -92,7 +92,8 @@
/************************************************************************/
-#define COUNTS_LEN 16
+static bool
+DecompileArgumentFromStack(JSContext* cx, int formalIndex, char** res);
size_t
js::GetVariableBytecodeLength(jsbytecode* pc)
@@ -460,6 +461,34 @@
offsetStack[stackDepth] = tmp;
}
break;
+
+ case JSOP_PICK: {
+ jsbytecode* pc = script_->offsetToPC(offset);
+ unsigned n = GET_UINT8(pc);
+ MOZ_ASSERT(ndefs == n + 1);
+ if (offsetStack) {
+ uint32_t top = stackDepth + n;
+ uint32_t tmp = offsetStack[stackDepth];
+ for (uint32_t i = stackDepth; i < top; i++)
+ offsetStack[i] = offsetStack[i + 1];
+ offsetStack[top] = tmp;
+ }
+ break;
+ }
+
+ case JSOP_UNPICK: {
+ jsbytecode* pc = script_->offsetToPC(offset);
+ unsigned n = GET_UINT8(pc);
+ MOZ_ASSERT(ndefs == n + 1);
+ if (offsetStack) {
+ uint32_t top = stackDepth + n;
+ uint32_t tmp = offsetStack[top];
+ for (uint32_t i = top; i > stackDepth; i--)
+ offsetStack[i] = offsetStack[i - 1];
+ offsetStack[stackDepth] = tmp;
+ }
+ break;
+ }
}
stackDepth += ndefs;
return stackDepth;
@@ -1230,6 +1259,24 @@
return write(loadAtom(pc));
case JSOP_GETARG: {
unsigned slot = GET_ARGNO(pc);
+
+ // For self-hosted scripts that are called from non-self-hosted code,
+ // decompiling the parameter name in the self-hosted script is
+ // unhelpful. Decompile the argument name instead.
+ if (script->selfHosted()) {
+ char* result;
+ if (!DecompileArgumentFromStack(cx, slot, &result))
+ return false;
+
+ // Note that decompiling the argument in the parent frame might
+ // not succeed.
+ if (result) {
+ bool ok = write(result);
+ js_free(result);
+ return ok;
+ }
+ }
+
JSAtom* atom = getArg(slot);
if (!atom)
return false;
@@ -1570,12 +1617,17 @@
MOZ_ASSERT(frameIter.script()->selfHosted());
/*
- * Get the second-to-top frame, the caller of the builtin that called the
- * intrinsic.
+ * Get the second-to-top frame, the non-self-hosted caller of the builtin
+ * that called the intrinsic.
*/
++frameIter;
- if (frameIter.done() || !frameIter.hasScript() || frameIter.compartment() != cx->compartment())
+ if (frameIter.done() ||
+ !frameIter.hasScript() ||
+ frameIter.script()->selfHosted() ||
+ frameIter.compartment() != cx->compartment())
+ {
return true;
+ }
RootedScript script(cx, frameIter.script());
jsbytecode* current = frameIter.pc();
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcode.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcode.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcode.h 2017-01-13 01:27:54.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcode.h 2017-01-16 01:29:09.000000000 +0000
@@ -423,6 +423,7 @@
case JSOP_RETRVAL:
case JSOP_FINALYIELDRVAL:
case JSOP_THROW:
+ case JSOP_THROWMSG:
case JSOP_TABLESWITCH:
return false;
case JSOP_GOSUB:
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcodeinlines.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcodeinlines.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsopcodeinlines.h 2017-01-13 01:27:54.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsopcodeinlines.h 2017-01-16 01:29:09.000000000 +0000
@@ -27,6 +27,7 @@
case JSOP_AND:
return 1;
case JSOP_PICK:
+ case JSOP_UNPICK:
/*
* Pick pops and pushes how deep it looks in the stack + 1
* items. i.e. if the stack were |a b[2] c[1] d[0]|, pick 2
@@ -44,7 +45,7 @@
{
jsbytecode* pc = script->offsetToPC(offset);
- if (JSOp(*pc) == JSOP_PICK)
+ if (JSOp(*pc) == JSOP_PICK || JSOp(*pc) == JSOP_UNPICK)
return pc[1] + 1;
if (CodeSpec[*pc].nuses == -1)
return StackUses(script, pc);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsscript.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsscript.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/jsscript.h 2017-01-13 01:28:11.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/jsscript.h 2017-01-16 01:29:10.000000000 +0000
@@ -84,7 +84,9 @@
JSTRY_FINALLY,
JSTRY_FOR_IN,
JSTRY_FOR_OF,
- JSTRY_LOOP
+ JSTRY_LOOP,
+ JSTRY_ITERCLOSE,
+ JSTRY_DESTRUCTURING_ITERCLOSE
};
/*
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/shell/js.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/shell/js.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/shell/js.cpp 2017-01-13 01:28:15.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/shell/js.cpp 2017-01-16 01:29:55.000000000 +0000
@@ -2589,11 +2589,28 @@
return true;
}
-JS_STATIC_ASSERT(JSTRY_CATCH == 0);
-JS_STATIC_ASSERT(JSTRY_FINALLY == 1);
-JS_STATIC_ASSERT(JSTRY_FOR_IN == 2);
+static const char*
+TryNoteName(JSTryNoteKind kind)
+{
+ switch (kind) {
+ case JSTRY_CATCH:
+ return "catch";
+ case JSTRY_FINALLY:
+ return "finally";
+ case JSTRY_FOR_IN:
+ return "for-in";
+ case JSTRY_FOR_OF:
+ return "for-of";
+ case JSTRY_LOOP:
+ return "loop";
+ case JSTRY_ITERCLOSE:
+ return "iterclose";
+ case JSTRY_DESTRUCTURING_ITERCLOSE:
+ return "dstr-iterclose";
+ }
-static const char* const TryNoteNames[] = { "catch", "finally", "for-in", "for-of", "loop" };
+ MOZ_CRASH("Bad JSTryNoteKind");
+}
static MOZ_MUST_USE bool
TryNotes(JSContext* cx, HandleScript script, Sprinter* sp)
@@ -2601,17 +2618,16 @@
if (!script->hasTrynotes())
return true;
- if (sp->put("\nException table:\nkind stack start end\n") < 0)
+ if (sp->put("\nException table:\nkind stack start end\n") < 0)
return false;
JSTryNote* tn = script->trynotes()->vector;
JSTryNote* tnlimit = tn + script->trynotes()->length;
do {
- MOZ_ASSERT(tn->kind < ArrayLength(TryNoteNames));
- uint8_t startOff = script->pcToOffset(script->main()) + tn->start;
- if (!sp->jsprintf(" %-7s %6u %8u %8u\n",
- TryNoteNames[tn->kind], tn->stackDepth,
- startOff, startOff + tn->length))
+ uint32_t startOff = script->pcToOffset(script->main()) + tn->start;
+ if (!sp->jsprintf(" %-14s %6u %8u %8u\n",
+ TryNoteName(static_cast(tn->kind)),
+ tn->stackDepth, startOff, startOff + tn->length))
{
return false;
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Destructuring/array-iterator-close.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Destructuring/array-iterator-close.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Destructuring/array-iterator-close.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Destructuring/array-iterator-close.js 2017-01-16 01:32:31.000000000 +0000
@@ -0,0 +1,77 @@
+// Tests that IteratorClose is called in array destructuring patterns.
+
+function test() {
+ var returnCalled = 0;
+ var returnCalledExpected = 0;
+ var iterable = {};
+
+ // empty [] calls IteratorClose regardless of "done" on the result.
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ return { done: true };
+ },
+ ret: function() {
+ returnCalled++;
+ return {};
+ }
+ });
+ var [] = iterable;
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ return {};
+ }
+ });
+ var [] = iterable;
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // Non-empty destructuring calls IteratorClose if iterator is not done by
+ // the end of destructuring.
+ var [a,b] = iterable;
+ assertEq(returnCalled, ++returnCalledExpected);
+ var [c,] = iterable;
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in lhs ref calls IteratorClose
+ function throwlhs() {
+ throw "in lhs";
+ }
+ assertThrowsValue(function() {
+ 0, [...{}[throwlhs()]] = iterable;
+ }, "in lhs");
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in iter.next doesn't call IteratorClose
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ throw "in next";
+ },
+ ret: function() {
+ returnCalled++;
+ return {};
+ }
+ });
+ assertThrowsValue(function() {
+ var [d] = iterable;
+ }, "in next");
+ assertEq(returnCalled, returnCalledExpected);
+
+ // "return" must return an Object.
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ return 42;
+ }
+ });
+ assertThrowsInstanceOf(function() {
+ var [] = iterable;
+ }, TypeError);
+ assertEq(returnCalled, ++returnCalledExpected);
+}
+
+test();
+
+if (typeof reportCompare === "function")
+ reportCompare(0, 0);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Generators/delegating-yield-2.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Generators/delegating-yield-2.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Generators/delegating-yield-2.js 2017-01-13 01:30:58.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Generators/delegating-yield-2.js 2017-01-16 01:32:32.000000000 +0000
@@ -25,8 +25,8 @@
inner = g1();
outer = delegate(inner);
assertIteratorNext(outer, 1);
-inner.throw = function(e) { return e*2; };
-assertEq(84, outer.throw(42));
+inner.throw = function(e) { return { value: e*2 }; };
+assertEq(84, outer.throw(42).value);
assertIteratorDone(outer, undefined);
// Monkeypatching inner.next.
@@ -41,7 +41,9 @@
assertIteratorNext(outer, 1);
delete GeneratorObjectPrototype.throw;
var outer_throw_42 = GeneratorObjectPrototype_throw.bind(outer, 42);
-assertThrowsValue(outer_throw_42, 42);
+// yield* protocol violation: no 'throw' method
+assertThrowsInstanceOf(outer_throw_42, TypeError);
+// Now done, so just throws.
assertThrowsValue(outer_throw_42, 42);
// Monkeypunch a different throw handler.
@@ -49,11 +51,11 @@
outer = delegate(inner);
outer_throw_42 = GeneratorObjectPrototype_throw.bind(outer, 42);
assertIteratorNext(outer, 1);
-GeneratorObjectPrototype.throw = function(e) { return e*2; }
-assertEq(84, outer_throw_42());
-assertEq(84, outer_throw_42());
+GeneratorObjectPrototype.throw = function(e) { return { value: e*2 }; }
+assertEq(84, outer_throw_42().value);
+assertEq(84, outer_throw_42().value);
// This continues indefinitely.
-assertEq(84, outer_throw_42());
+assertEq(84, outer_throw_42().value);
assertIteratorDone(outer, undefined);
// The same, but restoring the original pre-monkey throw.
@@ -61,8 +63,8 @@
outer = delegate(inner);
outer_throw_42 = GeneratorObjectPrototype_throw.bind(outer, 42);
assertIteratorNext(outer, 1);
-assertEq(84, outer_throw_42());
-assertEq(84, outer_throw_42());
+assertEq(84, outer_throw_42().value);
+assertEq(84, outer_throw_42().value);
GeneratorObjectPrototype.throw = GeneratorObjectPrototype_throw;
assertIteratorResult(outer_throw_42(), 42, false);
assertIteratorDone(outer, undefined);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Generators/yield-star-iterator-close.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Generators/yield-star-iterator-close.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Generators/yield-star-iterator-close.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Generators/yield-star-iterator-close.js 2017-01-16 01:32:32.000000000 +0000
@@ -0,0 +1,123 @@
+// Tests that the "return" method on iterators is called in yield*
+// expressions.
+
+function test() {
+ var returnCalled = 0;
+ var returnCalledExpected = 0;
+ var nextCalled = 0;
+ var nextCalledExpected = 0;
+ var iterable = {};
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ nextCalled++;
+ return { done: false };
+ },
+ ret: function() {
+ returnCalled++;
+ return { done: true, value: "iter.return" };
+ }
+ });
+
+ function* y() {
+ yield* iterable;
+ }
+
+ // G.p.throw on an iterator without "throw" calls IteratorClose.
+ var g1 = y();
+ g1.next();
+ assertThrowsValue(function() {
+ g1.throw("foo");
+ }, "foo");
+ assertEq(returnCalled, ++returnCalledExpected);
+ assertEq(nextCalled, ++nextCalledExpected);
+ g1.next();
+ assertEq(nextCalled, nextCalledExpected);
+
+ // G.p.return calls "return", and if the result.done is true, return the
+ // result.
+ var g2 = y();
+ g2.next();
+ var v2 = g2.return("test return");
+ assertEq(v2.done, true);
+ assertEq(v2.value, "iter.return");
+ assertEq(returnCalled, ++returnCalledExpected);
+ assertEq(nextCalled, ++nextCalledExpected);
+ g2.next();
+ assertEq(nextCalled, nextCalledExpected);
+
+ // G.p.return calls "return", and if the result.done is false, continue
+ // yielding.
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ nextCalled++;
+ return { done: false };
+ },
+ ret: function() {
+ returnCalled++;
+ return { done: false, value: "iter.return" };
+ }
+ });
+ var g3 = y();
+ g3.next();
+ var v3 = g3.return("test return");
+ assertEq(v3.done, false);
+ assertEq(v3.value, "iter.return");
+ assertEq(returnCalled, ++returnCalledExpected);
+ assertEq(nextCalled, ++nextCalledExpected);
+ g3.next();
+ assertEq(nextCalled, ++nextCalledExpected);
+
+ // G.p.return throwing does not re-call iter.return.
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ throw "in iter.return";
+ }
+ });
+ var g4 = y();
+ g4.next();
+ assertThrowsValue(function() {
+ g4.return("in test");
+ }, "in iter.return");
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // G.p.return expects iter.return to return an Object.
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ return 42;
+ }
+ });
+ var g5 = y();
+ g5.next();
+ assertThrowsInstanceOf(function() {
+ g5.return("foo");
+ }, TypeError);
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // IteratorClose expects iter.return to return an Object.
+ var g6 = y();
+ g6.next();
+ assertThrowsInstanceOf(function() {
+ g6.throw("foo");
+ }, TypeError);
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // G.p.return passes its argument to "return".
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function(x) {
+ assertEq(x, "in test");
+ returnCalled++;
+ return { done: true };
+ }
+ });
+ var g7 = y();
+ g7.next();
+ g7.return("in test");
+ assertEq(returnCalled, ++returnCalledExpected);
+}
+
+test();
+
+if (typeof reportCompare === "function")
+ reportCompare(0, 0);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/shell.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/shell.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/shell.js 2017-01-13 01:32:06.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/shell.js 2017-01-16 01:33:40.000000000 +0000
@@ -3,21 +3,42 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
(function(global) {
- /** Yield every permutation of the elements in some array. */
- global.Permutations = function* Permutations(items) {
- if (items.length == 0) {
- yield [];
- } else {
- items = items.slice(0);
- for (let i = 0; i < items.length; i++) {
- let swap = items[0];
- items[0] = items[i];
- items[i] = swap;
- for (let e of Permutations(items.slice(1, items.length)))
- yield [items[0]].concat(e);
- }
- }
- };
+ /** Yield every permutation of the elements in some array. */
+ global.Permutations = function* Permutations(items) {
+ if (items.length == 0) {
+ yield [];
+ } else {
+ items = items.slice(0);
+ for (let i = 0; i < items.length; i++) {
+ let swap = items[0];
+ items[0] = items[i];
+ items[i] = swap;
+ for (let e of Permutations(items.slice(1, items.length)))
+ yield [items[0]].concat(e);
+ }
+ }
+ };
+
+ /** Make an iterator with a return method. */
+ global.makeIterator = function makeIterator(overrides) {
+ var iterator = {
+ throw: function(e) {
+ throw e;
+ },
+ next: function(x) {
+ if (overrides && overrides.next)
+ return overrides.next(x);
+ return { done: false };
+ },
+ return: function(x) {
+ if (overrides && overrides.ret)
+ return overrides.ret(x);
+ return { done: true };
+ }
+ };
+
+ return function() { return iterator; };
+ };
})(this);
if (typeof assertThrowsInstanceOf === 'undefined') {
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Statements/for-of-iterator-close.js firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Statements/for-of-iterator-close.js
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/tests/ecma_6/Statements/for-of-iterator-close.js 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/tests/ecma_6/Statements/for-of-iterator-close.js 2017-01-16 01:33:26.000000000 +0000
@@ -0,0 +1,102 @@
+// Tests that IteratorReturn is called when a for-of loop has an abrupt
+// completion value during non-iterator code.
+
+function test() {
+ var returnCalled = 0;
+ var returnCalledExpected = 0;
+ var iterable = {};
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ return {};
+ }
+ });
+
+ // break calls iter.return
+ for (var x of iterable)
+ break;
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in body calls iter.return
+ assertThrowsValue(function() {
+ for (var x of iterable)
+ throw "in body";
+ }, "in body");
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in lhs ref calls iter.return
+ function throwlhs() {
+ throw "in lhs";
+ }
+ assertThrowsValue(function() {
+ for ((throwlhs()) of iterable)
+ continue;
+ }, "in lhs");
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in iter.return doesn't re-call iter.return
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ throw "in iter.return";
+ }
+ });
+ assertThrowsValue(function() {
+ for (var x of iterable)
+ break;
+ }, "in iter.return");
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // throw in iter.next doesn't call IteratorClose
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ throw "in next";
+ }
+ });
+ assertThrowsValue(function() {
+ for (var x of iterable)
+ break;
+ }, "in next");
+ assertEq(returnCalled, returnCalledExpected);
+
+ // "return" must return an Object.
+ iterable[Symbol.iterator] = makeIterator({
+ ret: function() {
+ returnCalled++;
+ return 42;
+ }
+ });
+ assertThrowsInstanceOf(function() {
+ for (var x of iterable)
+ break;
+ }, TypeError);
+ assertEq(returnCalled, ++returnCalledExpected);
+
+ // continue doesn't call iter.return for the loop it's continuing
+ var i = 0;
+ iterable[Symbol.iterator] = makeIterator({
+ next: function() {
+ return { done: i++ > 5 };
+ },
+ ret: function() {
+ returnCalled++;
+ return {};
+ }
+ });
+ for (var x of iterable)
+ continue;
+ assertEq(returnCalled, returnCalledExpected);
+
+ // continue does call iter.return for loops it skips
+ i = 0;
+ L: do {
+ for (var x of iterable)
+ continue L;
+ } while (false);
+ assertEq(returnCalled, ++returnCalledExpected);
+}
+
+test();
+
+if (typeof reportCompare === "function")
+ reportCompare(0, 0);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/CommonPropertyNames.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/CommonPropertyNames.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/CommonPropertyNames.h 2017-01-13 01:39:19.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/CommonPropertyNames.h 2017-01-16 01:42:31.000000000 +0000
@@ -13,7 +13,7 @@
#define FOR_EACH_COMMON_PROPERTYNAME(macro) \
macro(add, add, "add") \
- macro(allowContentSpread, allowContentSpread, "allowContentSpread") \
+ macro(allowContentIter, allowContentIter, "allowContentIter") \
macro(anonymous, anonymous, "anonymous") \
macro(Any, Any, "Any") \
macro(apply, apply, "apply") \
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Debugger.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Debugger.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Debugger.cpp 2017-01-13 01:39:20.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Debugger.cpp 2017-01-16 01:42:31.000000000 +0000
@@ -6297,8 +6297,12 @@
if (thisVal.isMagic() && thisVal.whyMagic() == JS_IS_CONSTRUCTING)
return false;
}
- if (iter.isWasm())
+ if (iter.isWasm()) {
+ // Skip frame of wasm instances we cannot observe.
+ if (!iter.wasmDebugEnabled())
+ return false;
return observesWasm(iter.wasmInstance());
+ }
return observesScript(iter.script());
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/HelperThreads.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/HelperThreads.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/HelperThreads.cpp 2017-01-13 01:39:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/HelperThreads.cpp 2017-01-16 01:42:33.000000000 +0000
@@ -87,10 +87,6 @@
{
AutoLockHelperThreadState lock;
- // Don't append this task if another failed.
- if (HelperThreadState().wasmFailed(lock))
- return false;
-
if (!HelperThreadState().wasmWorklist(lock).append(task))
return false;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/HelperThreads.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/HelperThreads.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/HelperThreads.h 2017-01-13 01:39:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/HelperThreads.h 2017-01-16 01:42:33.000000000 +0000
@@ -229,7 +229,7 @@
}
void setWasmError(const AutoLockHelperThreadState&, UniqueChars error) {
if (!firstWasmError)
- firstWasmError = Move(error);
+ firstWasmError = Move(error);
}
bool wasmFailed(const AutoLockHelperThreadState&) {
return bool(numWasmFailedJobs);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Interpreter.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Interpreter.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Interpreter.cpp 2017-01-13 01:39:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Interpreter.cpp 2017-01-16 01:42:33.000000000 +0000
@@ -1192,6 +1192,33 @@
break;
}
+ case JSTRY_ITERCLOSE: {
+ // The iterator object is at the top of the stack.
+ Value* sp = regs.spForStackDepth(tn->stackDepth);
+ RootedObject iterObject(cx, &sp[-1].toObject());
+ if (!IteratorCloseForException(cx, iterObject)) {
+ SettleOnTryNote(cx, tn, ei, regs);
+ return ErrorReturnContinuation;
+ }
+ break;
+ }
+
+ case JSTRY_DESTRUCTURING_ITERCLOSE: {
+ // Whether the destructuring iterator is done is at the top of the
+ // stack. The iterator object is second from the top.
+ MOZ_ASSERT(tn->stackDepth > 1);
+ Value* sp = regs.spForStackDepth(tn->stackDepth);
+ MOZ_ASSERT(sp[-1].isBoolean());
+ if (sp[-1].isFalse()) {
+ RootedObject iterObject(cx, &sp[-2].toObject());
+ if (!IteratorCloseForException(cx, iterObject)) {
+ SettleOnTryNote(cx, tn, ei, regs);
+ return ErrorReturnContinuation;
+ }
+ }
+ break;
+ }
+
case JSTRY_FOR_OF:
case JSTRY_LOOP:
break;
@@ -1859,7 +1886,6 @@
/* Various 1-byte no-ops. */
CASE(JSOP_NOP)
CASE(JSOP_NOP_DESTRUCTURING)
-CASE(JSOP_UNUSED187)
CASE(JSOP_UNUSED192)
CASE(JSOP_UNUSED209)
CASE(JSOP_UNUSED210)
@@ -2154,6 +2180,13 @@
}
END_CASE(JSOP_ENDITER)
+CASE(JSOP_ISGENCLOSING)
+{
+ bool b = REGS.sp[-1].isMagic(JS_GENERATOR_CLOSING);
+ PUSH_BOOLEAN(b);
+}
+END_CASE(JSOP_ISGENCLOSING)
+
CASE(JSOP_DUP)
{
MOZ_ASSERT(REGS.stackDepth() >= 1);
@@ -5042,7 +5075,16 @@
{
switch (kind) {
case CheckIsObjectKind::IteratorNext:
- JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_NEXT_RETURNED_PRIMITIVE);
+ JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+ JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, "next");
+ break;
+ case CheckIsObjectKind::IteratorReturn:
+ JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+ JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, "return");
+ break;
+ case CheckIsObjectKind::IteratorThrow:
+ JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+ JSMSG_ITER_METHOD_RETURNED_PRIMITIVE, "throw");
break;
case CheckIsObjectKind::GetIterator:
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_GET_ITER_RETURNED_PRIMITIVE);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Interpreter.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Interpreter.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Interpreter.h 2017-01-13 01:39:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Interpreter.h 2017-01-16 01:42:33.000000000 +0000
@@ -562,6 +562,8 @@
enum class CheckIsObjectKind : uint8_t {
IteratorNext,
+ IteratorReturn,
+ IteratorThrow,
GetIterator
};
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Opcodes.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Opcodes.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Opcodes.h 2017-01-13 01:39:32.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Opcodes.h 2017-01-16 01:42:34.000000000 +0000
@@ -1916,8 +1916,16 @@
* Stack: => this
*/ \
macro(JSOP_GLOBALTHIS, 186,"globalthis", NULL, 1, 0, 1, JOF_BYTE) \
- macro(JSOP_UNUSED187, 187,"unused187", NULL, 1, 0, 0, JOF_BYTE) \
- \
+ /*
+ * Pushes a boolean indicating whether the top of the stack is
+ * MagicValue(JS_GENERATOR_CLOSING).
+ *
+ * Category: Statements
+ * Type: For-In Statement
+ * Operands:
+ * Stack: val => val, res
+ */ \
+ macro(JSOP_ISGENCLOSING, 187, "isgenclosing", NULL, 1, 1, 2, JOF_BYTE) \
/*
* Pushes unsigned 24-bit int immediate integer operand onto the stack.
* Category: Literals
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Stack.h firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Stack.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/vm/Stack.h 2017-01-13 01:39:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/vm/Stack.h 2017-01-16 01:42:55.000000000 +0000
@@ -1811,6 +1811,8 @@
// -----------------------------------------------------------
// The following functions can only be called when isWasm()
// -----------------------------------------------------------
+
+ inline bool wasmDebugEnabled() const;
inline wasm::Instance* wasmInstance() const;
// -----------------------------------------------------------
@@ -2056,11 +2058,19 @@
return data_.jitFrames_.script();
}
+inline bool
+FrameIter::wasmDebugEnabled() const
+{
+ MOZ_ASSERT(!done());
+ MOZ_ASSERT(data_.state_ == WASM);
+ return data_.wasmFrames_.debugEnabled();
+}
+
inline wasm::Instance*
FrameIter::wasmInstance() const
{
MOZ_ASSERT(!done());
- MOZ_ASSERT(data_.state_ == WASM);
+ MOZ_ASSERT(data_.state_ == WASM && wasmDebugEnabled());
return data_.wasmFrames_.instance();
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmCode.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmCode.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmCode.cpp 2017-01-13 01:39:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmCode.cpp 2017-01-16 01:43:22.000000000 +0000
@@ -177,7 +177,7 @@
const char* file = metadata.filename.get();
unsigned line = codeRange.funcLineOrBytecode();
unsigned column = 0;
- writePerfSpewerAsmJSFunctionMap(start, size, file, line, column, name.begin());
+ writePerfSpewerWasmFunctionMap(start, size, file, line, column, name.begin());
}
#endif
#ifdef MOZ_VTUNE
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmGenerator.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmGenerator.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmGenerator.cpp 2017-01-13 01:39:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmGenerator.cpp 2017-01-16 01:43:23.000000000 +0000
@@ -247,8 +247,8 @@
if (HelperThreadState().wasmFailed(lock)) {
if (error_) {
- MOZ_ASSERT(!*error_, "Should have stopped earlier");
- *error_ = Move(HelperThreadState().harvestWasmError(lock));
+ MOZ_ASSERT(!*error_, "Should have stopped earlier");
+ *error_ = Move(HelperThreadState().harvestWasmError(lock));
}
return false;
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmIonCompile.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmIonCompile.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmIonCompile.cpp 2017-01-13 01:39:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmIonCompile.cpp 2017-01-16 01:43:28.000000000 +0000
@@ -3667,7 +3667,7 @@
if (!env.isAsmJS()) {
if (!ValidateFunctionBody(task->env(), func.index(), bodySize, d))
- return false;
+ return false;
d.rollbackPosition(d.begin());
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmModule.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmModule.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmModule.cpp 2017-01-13 01:39:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmModule.cpp 2017-01-16 01:43:29.000000000 +0000
@@ -893,12 +893,16 @@
// instance must hold onto a ref of the bytecode (keeping it alive). This
// wastes memory for most users, so we try to only save the source when a
// developer actually cares: when the compartment is debuggable (which is
- // true when the web console is open) or a names section is present (since
- // this going to be stripped for non-developer builds).
+ // true when the web console is open), has code compiled with debug flag
+ // enabled or a names section is present (since this going to be stripped
+ // for non-developer builds).
const ShareableBytes* maybeBytecode = nullptr;
- if (cx->compartment()->isDebuggee() || !metadata_->funcNames.empty())
+ if (cx->compartment()->isDebuggee() || metadata_->debugEnabled ||
+ !metadata_->funcNames.empty())
+ {
maybeBytecode = bytecode_.get();
+ }
auto codeSegment = CodeSegment::create(cx, code_, linkData_, *metadata_, memory);
if (!codeSegment)
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmValidate.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmValidate.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/src/wasm/WasmValidate.cpp 2017-01-13 01:39:44.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/src/wasm/WasmValidate.cpp 2017-01-16 01:43:31.000000000 +0000
@@ -1089,11 +1089,13 @@
if (!d.readVarU32(&numTables))
return d.fail("failed to read number of tables");
- if (numTables != 1)
- return d.fail("the number of tables must be exactly one");
+ if (numTables > 1)
+ return d.fail("the number of tables must be at most one");
- if (!DecodeTableLimits(d, &env->tables))
- return false;
+ for (uint32_t i = 0; i < numTables; ++i) {
+ if (!DecodeTableLimits(d, &env->tables))
+ return false;
+ }
if (!d.finishSection(sectionStart, sectionSize, "table"))
return false;
@@ -1114,11 +1116,13 @@
if (!d.readVarU32(&numMemories))
return d.fail("failed to read number of memories");
- if (numMemories != 1)
- return d.fail("the number of memories must be exactly one");
+ if (numMemories > 1)
+ return d.fail("the number of memories must be at most one");
- if (!DecodeMemoryLimits(d, env))
- return false;
+ for (uint32_t i = 0; i < numMemories; ++i) {
+ if (!DecodeMemoryLimits(d, env))
+ return false;
+ }
if (!d.finishSection(sectionStart, sectionSize, "memory"))
return false;
@@ -1534,9 +1538,6 @@
if (sectionStart == Decoder::NotStarted)
return true;
- if (!env->usesMemory())
- return d.fail("data section requires a memory section");
-
uint32_t numSegments;
if (!d.readVarU32(&numSegments))
return d.fail("failed to read number of data segments");
@@ -1552,6 +1553,9 @@
if (linearMemoryIndex != 0)
return d.fail("linear memory index must currently be 0");
+ if (!env->usesMemory())
+ return d.fail("data segment requires a memory section");
+
DataSegment seg;
if (!DecodeInitializerExpression(d, env->globals, ValType::I32, &seg.offset))
return false;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/idl/nsIXPCScriptable.idl firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/idl/nsIXPCScriptable.idl
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/idl/nsIXPCScriptable.idl 2017-01-13 01:40:12.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/idl/nsIXPCScriptable.idl 2017-01-16 01:43:31.000000000 +0000
@@ -29,6 +29,7 @@
[ref] native JSCallArgsRef(const JS::CallArgs);
[ref] native JSAutoIdVector(JS::AutoIdVector);
[ptr] native jsClassPtr(const js::Class);
+[ptr] native JSClassPtr(const JSClass);
/**
* Note: This is not really an XPCOM interface. For example, callers must
@@ -65,6 +66,7 @@
readonly attribute string className;
[notxpcom,nostdcall] uint32_t getScriptableFlags();
[notxpcom,nostdcall] jsClassPtr getClass();
+ [notxpcom,nostdcall] JSClassPtr getJSClass();
void preCreate(in nsISupports nativeObj, in JSContextPtr cx,
in JSObjectPtr globalObj, out JSObjectPtr parentObj);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/public/xpc_map_end.h firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/public/xpc_map_end.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/public/xpc_map_end.h 2017-01-13 01:40:13.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/public/xpc_map_end.h 2017-01-16 01:43:32.000000000 +0000
@@ -85,6 +85,13 @@
return &klass;
}
+// virtual
+const JSClass*
+XPC_MAP_CLASSNAME::GetJSClass()
+{
+ return Jsvalify(GetClass());
+}
+
/**************************************************************/
#ifndef XPC_MAP_WANT_PRECREATE
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCCallContext.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCCallContext.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCCallContext.cpp 2017-01-13 01:40:13.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCCallContext.cpp 2017-01-16 01:43:33.000000000 +0000
@@ -70,11 +70,8 @@
&js::GetReservedSlot(unwrapped,
XPC_WN_TEAROFF_FLAT_OBJECT_SLOT).toObject());
}
- if (mWrapper) {
- if (mTearOff)
- mScriptableInfo = nullptr;
- else
- mScriptableInfo = mWrapper->GetScriptableInfo();
+ if (mWrapper && !mTearOff) {
+ mScriptable = mWrapper->GetScriptable();
}
if (!JSID_IS_VOID(name))
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCForwards.h firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCForwards.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCForwards.h 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCForwards.h 2017-01-16 01:43:33.000000000 +0000
@@ -28,7 +28,6 @@
class XPCWrappedNative;
class XPCWrappedNativeProto;
class XPCWrappedNativeTearOff;
-class XPCNativeScriptableInfo;
class XPCNativeScriptableCreateInfo;
class XPCTraceableVariant;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCInlines.h firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCInlines.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCInlines.h 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCInlines.h 2017-01-16 01:43:33.000000000 +0000
@@ -99,11 +99,11 @@
return mTearOff;
}
-inline XPCNativeScriptableInfo*
-XPCCallContext::GetScriptableInfo() const
+inline nsIXPCScriptable*
+XPCCallContext::GetScriptable() const
{
CHECK_STATE(HAVE_OBJECT);
- return mScriptableInfo;
+ return mScriptable;
}
inline bool
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCJSContext.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCJSContext.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCJSContext.cpp 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCJSContext.cpp 2017-01-16 01:43:33.000000000 +0000
@@ -3531,7 +3531,6 @@
XPCJSContext::DescribeCustomObjects(JSObject* obj, const js::Class* clasp,
char (&name)[72]) const
{
- XPCNativeScriptableInfo* si = nullptr;
if (!IS_PROTO_CLASS(clasp)) {
return false;
@@ -3539,13 +3538,13 @@
XPCWrappedNativeProto* p =
static_cast(xpc_GetJSPrivate(obj));
- si = p->GetScriptableInfo();
-
- if (!si) {
+ nsCOMPtr scr = p->GetScriptable();
+ if (!scr) {
return false;
}
- SprintfLiteral(name, "JS Object (%s - %s)", clasp->name, si->GetJSClass()->name);
+ SprintfLiteral(name, "JS Object (%s - %s)",
+ clasp->name, scr->GetJSClass()->name);
return true;
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/xpcprivate.h firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/xpcprivate.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/xpcprivate.h 2017-01-13 01:40:16.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/xpcprivate.h 2017-01-16 01:43:47.000000000 +0000
@@ -58,8 +58,7 @@
* nsIXPCScriptable). This allows it to implement a more DOM-like interface,
* besides just exposing XPCOM methods and constants. An nsIXPCScriptable
* instance has hooks that correspond to all the normal JSClass hooks. Each
- * nsIXPCScriptable instance is mirrored by an XPCNativeScriptableInfo in
- * XPConnect. These can have pointers from XPCWrappedNativeProto and
+ * nsIXPCScriptable instance can have pointers from XPCWrappedNativeProto and
* XPCWrappedNative (since C++ objects can have scriptable info without having
* class info).
*/
@@ -703,7 +702,7 @@
inline bool CanGetTearOff() const ;
inline XPCWrappedNativeTearOff* GetTearOff() const ;
- inline XPCNativeScriptableInfo* GetScriptableInfo() const ;
+ inline nsIXPCScriptable* GetScriptable() const ;
inline bool CanGetSet() const ;
inline XPCNativeSet* GetSet() const ;
inline bool CanGetInterface() const ;
@@ -779,7 +778,7 @@
XPCWrappedNative* mWrapper;
XPCWrappedNativeTearOff* mTearOff;
- XPCNativeScriptableInfo* mScriptableInfo;
+ nsCOMPtr mScriptable;
RefPtr mSet;
RefPtr mInterface;
@@ -1384,46 +1383,8 @@
};
/***************************************************************************/
-// XPCNativeScriptableInfo is a trivial wrapper for nsIXPCScriptable which
-// should be removed eventually.
-
-class XPCNativeScriptableInfo final
-{
-public:
- static XPCNativeScriptableInfo*
- Construct(const XPCNativeScriptableCreateInfo* sci);
-
- nsIXPCScriptable*
- GetCallback() const { return mCallback; }
-
- const JSClass*
- GetJSClass() { return Jsvalify(mCallback->GetClass()); }
-
-protected:
- explicit XPCNativeScriptableInfo(nsIXPCScriptable* aCallback)
- : mCallback(aCallback)
- {
- MOZ_COUNT_CTOR(XPCNativeScriptableInfo);
- }
-public:
- ~XPCNativeScriptableInfo()
- {
- MOZ_COUNT_DTOR(XPCNativeScriptableInfo);
- }
-private:
-
- // disable copy ctor and assignment
- XPCNativeScriptableInfo(const XPCNativeScriptableInfo& r) = delete;
- XPCNativeScriptableInfo& operator= (const XPCNativeScriptableInfo& r) = delete;
-
-private:
- nsCOMPtr mCallback;
-};
-
-/***************************************************************************/
// XPCNativeScriptableCreateInfo is used in creating new wrapper and protos.
-// it abstracts out the scriptable interface pointer and the flags. After
-// creation these are factored differently using XPCNativeScriptableInfo.
+// It abstracts out the scriptable interface pointer and the flags.
class MOZ_STACK_CLASS XPCNativeScriptableCreateInfo final
{
@@ -1469,8 +1430,8 @@
XPCNativeSet*
GetSet() const {return mSet;}
- XPCNativeScriptableInfo*
- GetScriptableInfo() {return mScriptableInfo;}
+ nsIXPCScriptable*
+ GetScriptable() const { return mScriptable; }
bool CallPostCreatePrototype();
void JSProtoObjectFinalized(js::FreeOp* fop, JSObject* obj);
@@ -1529,7 +1490,7 @@
JS::ObjectPtr mJSProtoObject;
nsCOMPtr mClassInfo;
RefPtr mSet;
- XPCNativeScriptableInfo* mScriptableInfo;
+ nsCOMPtr mScriptable;
};
/***********************************************/
@@ -1692,11 +1653,8 @@
public:
- XPCNativeScriptableInfo*
- GetScriptableInfo() const {return mScriptableInfo;}
-
- nsIXPCScriptable* // call this wrong and you deserve to crash
- GetScriptableCallback() const {return mScriptableInfo->GetCallback();}
+ nsIXPCScriptable*
+ GetScriptable() const { return mScriptable; }
nsIClassInfo*
GetClassInfo() const {return IsValid() && HasProto() ?
@@ -1844,7 +1802,7 @@
};
RefPtr mSet;
JS::TenuredHeap mFlatJSObject;
- XPCNativeScriptableInfo* mScriptableInfo;
+ nsCOMPtr mScriptable;
XPCWrappedNativeTearOff mFirstTearOff;
};
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNative.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNative.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNative.cpp 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNative.cpp 2017-01-16 01:43:47.000000000 +0000
@@ -50,9 +50,10 @@
if (MOZ_UNLIKELY(cb.WantDebugInfo())) {
char name[72];
- XPCNativeScriptableInfo* si = tmp->GetScriptableInfo();
- if (si)
- SprintfLiteral(name, "XPCWrappedNative (%s)", si->GetJSClass()->name);
+ nsCOMPtr scr = tmp->GetScriptable();
+ if (scr)
+ SprintfLiteral(name, "XPCWrappedNative (%s)",
+ scr->GetJSClass()->name);
else
SprintfLiteral(name, "XPCWrappedNative");
@@ -170,13 +171,13 @@
GatherScriptableCreateInfo(identity, nativeHelper.GetClassInfo(),
sciProto, sciMaybe);
- // ...and then ScriptableInfo. We need all this stuff now because it's going
- // to tell us the JSClass of the object we're going to create.
- XPCNativeScriptableInfo* si = XPCNativeScriptableInfo::Construct(&sciWrapper);
- MOZ_ASSERT(si);
+ // ...and then get the nsIXPCScriptable. This will tell us the JSClass of
+ // the object we're going to create.
+ nsCOMPtr scr = sciWrapper.GetCallback();
+ MOZ_ASSERT(scr);
// Finally, we get to the JSClass.
- const JSClass* clasp = si->GetJSClass();
+ const JSClass* clasp = scr->GetJSClass();
MOZ_ASSERT(clasp->flags & JSCLASS_IS_GLOBAL);
// Create the global.
@@ -221,23 +222,7 @@
// are different for globals. We do our setup inline here, instead.
//
- // Share mScriptableInfo with the proto.
- //
- // This is probably more trouble than it's worth, since we've already
- // created an XPCNativeScriptableInfo for ourselves. Nevertheless, this is
- // what ::Init() does, and we want to be as consistent as possible with
- // that code.
- XPCNativeScriptableInfo* siProto = proto->GetScriptableInfo();
- if (siProto && siProto->GetCallback() == sciWrapper.GetCallback()) {
- wrapper->mScriptableInfo = siProto;
- // XPCNativeScriptableInfo uses manual memory management. If we're
- // switching over to that of the proto, we need to destroy the one
- // we've allocated.
- delete si;
- si = nullptr;
- } else {
- wrapper->mScriptableInfo = si;
- }
+ wrapper->mScriptable = scr;
// Set the JS object to the global we already created.
wrapper->mFlatJSObject = global;
@@ -550,8 +535,7 @@
XPCWrappedNative::XPCWrappedNative(already_AddRefed&& aIdentity,
XPCWrappedNativeProto* aProto)
: mMaybeProto(aProto),
- mSet(aProto->GetSet()),
- mScriptableInfo(nullptr)
+ mSet(aProto->GetSet())
{
MOZ_ASSERT(NS_IsMainThread());
@@ -568,8 +552,7 @@
already_AddRefed&& aSet)
: mMaybeScope(TagScope(aScope)),
- mSet(aSet),
- mScriptableInfo(nullptr)
+ mSet(aSet)
{
MOZ_ASSERT(NS_IsMainThread());
@@ -588,14 +571,7 @@
void
XPCWrappedNative::Destroy()
{
- XPCWrappedNativeProto* proto = GetProto();
-
- if (mScriptableInfo &&
- (!HasProto() ||
- (proto && proto->GetScriptableInfo() != mScriptableInfo))) {
- delete mScriptableInfo;
- mScriptableInfo = nullptr;
- }
+ mScriptable = nullptr;
XPCWrappedNativeScope* scope = GetScope();
if (scope) {
@@ -729,30 +705,20 @@
XPCWrappedNative::Init(const XPCNativeScriptableCreateInfo* sci)
{
AutoJSContext cx;
- // setup our scriptable info...
- if (sci->GetCallback()) {
- if (HasProto()) {
- XPCNativeScriptableInfo* siProto = GetProto()->GetScriptableInfo();
- if (siProto && siProto->GetCallback() == sci->GetCallback())
- mScriptableInfo = siProto;
- }
- if (!mScriptableInfo) {
- mScriptableInfo = XPCNativeScriptableInfo::Construct(sci);
-
- if (!mScriptableInfo)
- return false;
- }
- }
- XPCNativeScriptableInfo* si = mScriptableInfo;
+ // Setup our scriptable...
+ MOZ_ASSERT(!mScriptable);
+ mScriptable = sci->GetCallback();
// create our flatJSObject
- const JSClass* jsclazz = si ? si->GetJSClass() : Jsvalify(&XPC_WN_NoHelper_JSClass);
+ const JSClass* jsclazz = mScriptable
+ ? mScriptable->GetJSClass()
+ : Jsvalify(&XPC_WN_NoHelper_JSClass);
// We should have the global jsclass flag if and only if we're a global.
- MOZ_ASSERT_IF(si, !!si->GetCallback()->IsGlobalObject() ==
- !!(jsclazz->flags & JSCLASS_IS_GLOBAL));
+ MOZ_ASSERT_IF(mScriptable, !!mScriptable->IsGlobalObject() ==
+ !!(jsclazz->flags & JSCLASS_IS_GLOBAL));
MOZ_ASSERT(jsclazz &&
jsclazz->name &&
@@ -959,7 +925,7 @@
if (HasProto())
proto->SystemIsBeingShutDown();
- // We don't destroy mScriptableInfo here. The destructor will do it.
+ // We don't clear mScriptable here. The destructor will do it.
// Cleanup the tearoffs.
for (XPCWrappedNativeTearOff* to = &mFirstTearOff; to; to = to->GetNextTearOff()) {
@@ -1095,8 +1061,8 @@
// If the scriptable helper forbids us from reflecting additional
// interfaces, then don't even try the QI, just fail.
- if (mScriptableInfo &&
- mScriptableInfo->GetCallback()->ClassInfoInterfacesOnly() &&
+ if (mScriptable &&
+ mScriptable->ClassInfoInterfacesOnly() &&
!mSet->HasInterface(aInterface) &&
!mSet->HasInterfaceWithAncestor(aInterface)) {
return NS_ERROR_NO_INTERFACE;
@@ -2152,14 +2118,12 @@
XPC_LOG_ALWAYS(("mFlatJSObject of %x", mFlatJSObject.unbarrieredGetPtr()));
XPC_LOG_ALWAYS(("mIdentity of %x", mIdentity.get()));
- XPC_LOG_ALWAYS(("mScriptableInfo @ %x", mScriptableInfo));
+ XPC_LOG_ALWAYS(("mScriptable @ %x", mScriptable.get()));
- if (depth && mScriptableInfo) {
- nsCOMPtr scr = mScriptableInfo->GetCallback();
+ if (depth && mScriptable) {
XPC_LOG_INDENT();
- XPC_LOG_ALWAYS(("mScriptable @ %x", scr.get()));
- XPC_LOG_ALWAYS(("mFlags of %x", scr->GetScriptableFlags()));
- XPC_LOG_ALWAYS(("mJSClass @ %x", mScriptableInfo->GetJSClass()));
+ XPC_LOG_ALWAYS(("mFlags of %x", mScriptable->GetScriptableFlags()));
+ XPC_LOG_ALWAYS(("mJSClass @ %x", mScriptable->GetJSClass()));
XPC_LOG_OUTDENT();
}
XPC_LOG_OUTDENT();
@@ -2185,9 +2149,9 @@
char* sz = nullptr;
char* name = nullptr;
- XPCNativeScriptableInfo* si = GetScriptableInfo();
- if (si)
- name = JS_smprintf("%s", si->GetJSClass()->name);
+ nsCOMPtr scr = GetScriptable();
+ if (scr)
+ name = JS_smprintf("%s", scr->GetJSClass()->name);
if (to) {
const char* fmt = name ? " (%s)" : "%s";
name = JS_sprintf_append(name, fmt,
@@ -2218,7 +2182,7 @@
}
const char* fmt = "[xpconnect wrapped %s" FMT_ADDR FMT_STR(" (native")
FMT_ADDR FMT_STR(")") "]";
- if (si) {
+ if (scr) {
fmt = "[object %s" FMT_ADDR FMT_STR(" (native") FMT_ADDR FMT_STR(")") "]";
}
sz = JS_smprintf(fmt, name PARAM_ADDR(this) PARAM_ADDR(mIdentity.get()));
@@ -2267,12 +2231,10 @@
info->GetNameShared(&interfaceName);
clsInfo->GetContractID(&contractID);
- if (wrapper->GetScriptableInfo()) {
- wrapper->GetScriptableInfo()->GetCallback()->
- GetClassName(&className);
+ if (wrapper->GetScriptable()) {
+ wrapper->GetScriptable()->GetClassName(&className);
}
-
printf("\n!!! Object's nsIClassInfo lies about its interfaces!!!\n"
" classname: %s \n"
" contractid: %s \n"
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNativeJSOps.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNativeJSOps.cpp 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNativeJSOps.cpp 2017-01-16 01:43:47.000000000 +0000
@@ -229,7 +229,7 @@
bool reflectToStringAndToSource,
XPCWrappedNative* wrapperToReflectInterfaceNames,
XPCWrappedNative* wrapperToReflectDoubleWrap,
- XPCNativeScriptableInfo* scriptableInfo,
+ nsIXPCScriptable* scr,
unsigned propFlags,
bool* resolved)
{
@@ -254,9 +254,8 @@
JSNative call;
uint32_t flags = 0;
- if (scriptableInfo) {
- nsCOMPtr classInfo = do_QueryInterface(
- scriptableInfo->GetCallback());
+ if (scr) {
+ nsCOMPtr classInfo = do_QueryInterface(scr);
if (classInfo) {
nsresult rv = classInfo->GetFlags(&flags);
@@ -415,8 +414,8 @@
if (id == xpccx->GetStringID(XPCJSContext::IDX_TO_STRING) ||
id == xpccx->GetStringID(XPCJSContext::IDX_TO_SOURCE) ||
- (scriptableInfo &&
- scriptableInfo->GetCallback()->DontEnumQueryInterface() &&
+ (scr &&
+ scr->DontEnumQueryInterface() &&
id == xpccx->GetStringID(XPCJSContext::IDX_QUERY_INTERFACE)))
propFlags &= ~JSPROP_ENUMERATE;
@@ -549,7 +548,7 @@
XPCWrappedNative* wrapper = static_cast(p);
if (helperType == WN_HELPER)
- wrapper->GetScriptableCallback()->Finalize(wrapper, js::CastToJSFreeOp(fop), obj);
+ wrapper->GetScriptable()->Finalize(wrapper, js::CastToJSFreeOp(fop), obj);
wrapper->FlatJSObjectFinalized();
}
@@ -704,7 +703,7 @@
XPCWrappedNative* wrapper = XPCWrappedNative::Get(unwrapped); \
THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper); \
bool retval = true; \
- nsresult rv = wrapper->GetScriptableCallback()->
+ nsresult rv = wrapper->GetScriptable()->
#define POST_HELPER_STUB \
if (NS_FAILED(rv)) \
@@ -797,15 +796,15 @@
RootedId old(cx, ccx.SetResolveName(id));
- XPCNativeScriptableInfo* si = wrapper->GetScriptableInfo();
- if (si && si->GetCallback()->WantResolve()) {
+ nsCOMPtr scr = wrapper->GetScriptable();
+ if (scr && scr->WantResolve()) {
XPCWrappedNative* oldResolvingWrapper;
- bool allowPropMods = si->GetCallback()->AllowPropModsDuringResolve();
+ bool allowPropMods = scr->AllowPropModsDuringResolve();
if (allowPropMods)
oldResolvingWrapper = ccx.SetResolvingWrapper(wrapper);
- rv = si->GetCallback()->Resolve(wrapper, cx, obj, id, &resolved, &retval);
+ rv = scr->Resolve(wrapper, cx, obj, id, &resolved, &retval);
if (allowPropMods)
(void)ccx.SetResolvingWrapper(oldResolvingWrapper);
@@ -835,9 +834,7 @@
IsLocal) {
XPCWrappedNative* wrapperForInterfaceNames =
- (si && si->GetCallback()->DontReflectInterfaceNames())
- ? nullptr
- : wrapper;
+ (scr && scr->DontReflectInterfaceNames()) ? nullptr : wrapper;
XPCWrappedNative* oldResolvingWrapper =
ccx.SetResolvingWrapper(wrapper);
@@ -846,7 +843,7 @@
wrapper->GetScope(),
false,
wrapperForInterfaceNames,
- nullptr, si,
+ nullptr, scr,
JSPROP_ENUMERATE, resolvedp);
(void)ccx.SetResolvingWrapper(oldResolvingWrapper);
}
@@ -862,15 +859,15 @@
XPCWrappedNative* wrapper = ccx.GetWrapper();
THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
- XPCNativeScriptableInfo* si = wrapper->GetScriptableInfo();
- if (!si || !si->GetCallback()->WantEnumerate())
+ nsCOMPtr scr = wrapper->GetScriptable();
+ if (!scr || !scr->WantEnumerate())
return Throw(NS_ERROR_XPC_BAD_OP_ON_WN_PROTO, cx);
if (!XPC_WN_Shared_Enumerate(cx, obj))
return false;
bool retval = true;
- nsresult rv = si->GetCallback()->Enumerate(wrapper, cx, obj, &retval);
+ nsresult rv = scr->Enumerate(wrapper, cx, obj, &retval);
if (NS_FAILED(rv))
return Throw(rv, cx);
return retval;
@@ -886,15 +883,15 @@
XPCWrappedNative* wrapper = ccx.GetWrapper();
THROW_AND_RETURN_IF_BAD_WRAPPER(cx, wrapper);
- XPCNativeScriptableInfo* si = wrapper->GetScriptableInfo();
- if (!si || !si->GetCallback()->WantNewEnumerate())
+ nsCOMPtr scr = wrapper->GetScriptable();
+ if (!scr || !scr->WantNewEnumerate())
return Throw(NS_ERROR_XPC_BAD_OP_ON_WN_PROTO, cx);
if (!XPC_WN_Shared_Enumerate(cx, obj))
return false;
bool retval = true;
- nsresult rv = si->GetCallback()->NewEnumerate(wrapper, cx, obj, properties, &retval);
+ nsresult rv = scr->NewEnumerate(wrapper, cx, obj, properties, &retval);
if (NS_FAILED(rv))
return Throw(rv, cx);
return retval;
@@ -902,16 +899,6 @@
/***************************************************************************/
-// static
-XPCNativeScriptableInfo*
-XPCNativeScriptableInfo::Construct(const XPCNativeScriptableCreateInfo* sci)
-{
- MOZ_ASSERT(sci, "bad param");
- nsCOMPtr callback = sci->GetCallback();
- MOZ_ASSERT(callback);
- return new XPCNativeScriptableInfo(callback);
-}
-
const js::ObjectOps XPC_WN_ObjectOpsWithEnumerate = {
nullptr, // lookupProperty
nullptr, // defineProperty
@@ -1113,11 +1100,11 @@
if (!ccx.IsValid())
return false;
- XPCNativeScriptableInfo* si = self->GetScriptableInfo();
+ nsCOMPtr scr = self->GetScriptable();
return DefinePropertyIfFound(ccx, obj, id,
self->GetSet(), nullptr, nullptr,
self->GetScope(),
- true, nullptr, nullptr, si,
+ true, nullptr, nullptr, scr,
JSPROP_ENUMERATE, resolvep);
}
@@ -1190,12 +1177,12 @@
if (!ccx.IsValid())
return false;
- XPCNativeScriptableInfo* si = self->GetScriptableInfo();
+ nsCOMPtr scr = self->GetScriptable();
return DefinePropertyIfFound(ccx, obj, id,
self->GetSet(), nullptr, nullptr,
self->GetScope(),
- true, nullptr, nullptr, si,
+ true, nullptr, nullptr, scr,
JSPROP_READONLY |
JSPROP_PERMANENT |
JSPROP_ENUMERATE, resolvedp);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNativeProto.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNativeProto.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrappedNativeProto.cpp 2017-01-13 01:40:14.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrappedNativeProto.cpp 2017-01-16 01:43:47.000000000 +0000
@@ -21,8 +21,7 @@
: mScope(Scope),
mJSProtoObject(nullptr),
mClassInfo(ClassInfo),
- mSet(Set),
- mScriptableInfo(nullptr)
+ mSet(Set)
{
// This native object lives as long as its associated JSObject - killed
// by finalization of the JSObject (or explicitly if Init fails).
@@ -48,8 +47,6 @@
// Note that our weak ref to mScope is not to be trusted at this point.
XPCNativeSet::ClearCacheEntryForClassInfo(mClassInfo);
-
- delete mScriptableInfo;
}
bool
@@ -57,19 +54,14 @@
bool callPostCreatePrototype)
{
AutoJSContext cx;
- nsIXPCScriptable* callback = scriptableCreateInfo ?
- scriptableCreateInfo->GetCallback() :
- nullptr;
- if (callback) {
- mScriptableInfo =
- XPCNativeScriptableInfo::Construct(scriptableCreateInfo);
- if (!mScriptableInfo)
- return false;
- }
+ nsCOMPtr callback = scriptableCreateInfo
+ ? scriptableCreateInfo->GetCallback()
+ : nullptr;
+ if (callback)
+ mScriptable = callback;
const js::Class* jsclazz =
- (mScriptableInfo &&
- mScriptableInfo->GetCallback()->AllowPropModsToPrototype())
+ (mScriptable && mScriptable->AllowPropModsToPrototype())
? &XPC_WN_ModsAllowed_Proto_JSClass
: &XPC_WN_NoMods_Proto_JSClass;
@@ -94,14 +86,12 @@
AutoJSContext cx;
// Nothing to do if we don't have a scriptable callback.
- nsIXPCScriptable* callback = mScriptableInfo ? mScriptableInfo->GetCallback()
- : nullptr;
- if (!callback)
+ if (!mScriptable)
return true;
// Call the helper. This can handle being called if it's not implemented,
// so we don't have to check any sort of "want" here. See xpc_map_end.h.
- nsresult rv = callback->PostCreatePrototype(cx, mJSProtoObject);
+ nsresult rv = mScriptable->PostCreatePrototype(cx, mJSProtoObject);
if (NS_FAILED(rv)) {
JS_SetPrivate(mJSProtoObject, nullptr);
mJSProtoObject = nullptr;
@@ -193,13 +183,11 @@
XPC_LOG_ALWAYS(("mScope @ %x", mScope));
XPC_LOG_ALWAYS(("mJSProtoObject @ %x", mJSProtoObject.get()));
XPC_LOG_ALWAYS(("mSet @ %x", mSet.get()));
- XPC_LOG_ALWAYS(("mScriptableInfo @ %x", mScriptableInfo));
- if (depth && mScriptableInfo) {
- nsCOMPtr scr = mScriptableInfo->GetCallback();
+ XPC_LOG_ALWAYS(("mScriptable @ %x", mScriptable.get()));
+ if (depth && mScriptable) {
XPC_LOG_INDENT();
- XPC_LOG_ALWAYS(("mScriptable @ %x", scr.get()));
- XPC_LOG_ALWAYS(("mFlags of %x", scr->GetScriptableFlags()));
- XPC_LOG_ALWAYS(("mJSClass @ %x", mScriptableInfo->GetJSClass()));
+ XPC_LOG_ALWAYS(("mFlags of %x", mScriptable->GetScriptableFlags()));
+ XPC_LOG_ALWAYS(("mJSClass @ %x", mScriptable->GetJSClass()));
XPC_LOG_OUTDENT();
}
XPC_LOG_OUTDENT();
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrapper.h firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrapper.h
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/src/XPCWrapper.h 2017-01-13 01:40:15.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/src/XPCWrapper.h 2017-01-16 01:43:47.000000000 +0000
@@ -11,14 +11,6 @@
namespace XPCNativeWrapper {
-// Given an XPCWrappedNative pointer and the name of a function on
-// nsIXPCScriptable corresponding with a flag, returns 'true' if the flag is
-// set.
-// XXX Convert to using GetFlags() and not a macro.
-#define NATIVE_HAS_FLAG(_wn, _flag) \
- ((_wn)->GetScriptableInfo() && \
- (_wn)->GetScriptableInfo()->GetCallback()->_flag())
-
bool
AttachNewConstructorObject(JSContext* aCx, JS::HandleObject aGlobalObject);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/wrappers/WrapperFactory.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/wrappers/WrapperFactory.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/wrappers/WrapperFactory.cpp 2017-01-13 01:40:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/wrappers/WrapperFactory.cpp 2017-01-16 01:44:21.000000000 +0000
@@ -203,7 +203,7 @@
RootedObject wrapScope(cx, scope);
{
- if (NATIVE_HAS_FLAG(&ccx, WantPreCreate)) {
+ if (ccx.GetScriptable() && ccx.GetScriptable()->WantPreCreate()) {
// We have a precreate hook. This object might enforce that we only
// ever create JS object for it.
@@ -211,7 +211,7 @@
// being accessed across compartments. We would really prefer to
// replace the above code with a test that says "do you only have one
// wrapper?"
- nsresult rv = wn->GetScriptableInfo()->GetCallback()->
+ nsresult rv = wn->GetScriptable()->
PreCreate(wn->Native(), cx, scope, wrapScope.address());
if (NS_FAILED(rv)) {
retObj.set(waive ? WaiveXray(cx, obj) : obj);
@@ -250,7 +250,7 @@
// (the old scope). If (2) is the case, PreCreate will return the
// scope of the document (the new scope).
RootedObject probe(cx);
- rv = wn->GetScriptableInfo()->GetCallback()->
+ rv = wn->GetScriptable()->
PreCreate(wn->Native(), cx, currentScope, probe.address());
// Check for case (2).
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/wrappers/XrayWrapper.cpp firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/wrappers/XrayWrapper.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/js/xpconnect/wrappers/XrayWrapper.cpp 2017-01-13 01:40:37.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/js/xpconnect/wrappers/XrayWrapper.cpp 2017-01-16 01:44:21.000000000 +0000
@@ -1573,14 +1573,13 @@
{
// Run the call hook of the wrapped native.
XPCWrappedNative* wn = getWN(wrapper);
- if (NATIVE_HAS_FLAG(wn, WantCall)) {
+ if (wn->GetScriptable() && wn->GetScriptable()->WantCall()) {
XPCCallContext ccx(cx, wrapper, nullptr, JSID_VOIDHANDLE, args.length(),
args.array(), args.rval().address());
if (!ccx.IsValid())
return false;
bool ok = true;
- nsresult rv = wn->GetScriptableInfo()->GetCallback()->Call(
- wn, cx, wrapper, args, &ok);
+ nsresult rv = wn->GetScriptable()->Call(wn, cx, wrapper, args, &ok);
if (NS_FAILED(rv)) {
if (ok)
XPCThrower::Throw(rv, cx);
@@ -1599,14 +1598,14 @@
{
// Run the construct hook of the wrapped native.
XPCWrappedNative* wn = getWN(wrapper);
- if (NATIVE_HAS_FLAG(wn, WantConstruct)) {
+ if (wn->GetScriptable() && wn->GetScriptable()->WantConstruct()) {
XPCCallContext ccx(cx, wrapper, nullptr, JSID_VOIDHANDLE, args.length(),
args.array(), args.rval().address());
if (!ccx.IsValid())
return false;
bool ok = true;
- nsresult rv = wn->GetScriptableInfo()->GetCallback()->Construct(
- wn, cx, wrapper, args, &ok);
+ nsresult rv =
+ wn->GetScriptable()->Construct(wn, cx, wrapper, args, &ok);
if (NS_FAILED(rv)) {
if (ok)
XPCThrower::Throw(rv, cx);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/changesets firefox-trunk-53.0~a1~hg20170115r329516/l10n/changesets
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/changesets 2017-01-13 02:26:08.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/changesets 2017-01-16 02:30:10.000000000 +0000
@@ -24,20 +24,20 @@
eu 734:503bd56cc92f
fa 862:717e308d1b2d
fi 819:b94e70f75e78
-fr 5893:f8e86caa13df
+fr 5895:5c18e5e60d5d
fy-NL 1700:7ecb0b172068
ga-IE 811:74801eb4fa9a
gd 805:089dcd4ed213
gl 1532:79eda21c5b0b
gu-IN 660:ef0d3c1d041a
-he 937:5606717a01a3
+he 938:52b382b51c4e
hi-IN 622:a0cd9c0dc2a0
hr 1183:96241bc72794
hu 1373:3a610eb64ab2
hy-AM 625:11b4926e5a05
id 843:7513196a8654
is 601:ed2f2f9fdc59
-it 5584:f9a0ea62b082
+it 5586:8a4f906c2f09
ja 972:51baad795f56
ja-JP-mac 973:91ffb751eaf1
kk 645:7c191b79eb1a
@@ -60,7 +60,7 @@
pt-PT 3837:5c7949830393
rm 763:b4787f6f2074
ro 1259:ecad3f7b8163
-ru 2716:97f95f757ad4
+ru 2718:6dd152d57fb5
si 580:51f3b8e71db1
sk 2585:dbb5165fc4cd
sl 1588:b9614acbf122
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/browser.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/browser.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/browser.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/browser.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -761,6 +761,9 @@
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/browser.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/browser.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/browser.properties 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/browser.properties 2017-01-16 02:10:43.000000000 +0000
@@ -82,10 +82,6 @@
addonInstallRestartIgnoreButton=Plus tard
addonInstallRestartIgnoreButton.accesskey=P
-# LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
-# See browser/branding/aurora/locales/*/brand.properties
-deveditionTheme.name=Developer Edition
-
# LOCALIZATION NOTE (addonInstallError-1, addonInstallError-2, addonInstallError-3, addonInstallError-4, addonInstallError-5, addonLocalInstallError-1, addonLocalInstallError-2, addonLocalInstallError-3, addonLocalInstallError-4, addonLocalInstallError-5):
# %1$S is the application name, %2$S is the add-on name
addonInstallError-1=Le module complémentaire n’a pas pu être téléchargé à cause d’un échec de connexion.
@@ -110,6 +106,14 @@
unsignedAddonsDisabled.learnMore.label=En savoir plus
unsignedAddonsDisabled.learnMore.accesskey=E
+# LOCALIZATION NOTE (compactLightTheme.name): This is displayed in about:addons -> Appearance
+compactLightTheme.name=Compacte clair
+compactLightTheme.description=Un thème compacte avec des couleurs claires.
+
+# LOCALIZATION NOTE (compactDarkTheme.name): This is displayed in about:addons -> Appearance
+compactDarkTheme.name=Compacte sombre
+compactDarkTheme.description=Un thème compacte avec des couleurs sombres.
+
# LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
# the host name of the site.
lwthemeInstallRequest.message=Ce site (%S) a tenté d’installer un thème.
@@ -600,8 +604,6 @@
emeNotifications.drmContentPlaying.button.label = Configurer…
emeNotifications.drmContentPlaying.button.accesskey = C
-# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S will be the 'learn more' link
-emeNotifications.drmContentDisabled.message = Vous devez activer les DRM pour lire certains éléments audio ou vidéo sur cette page. %S
emeNotifications.drmContentDisabled.button.label = Activer les DRM
emeNotifications.drmContentDisabled.button.accesskey = A
# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
@@ -730,10 +732,8 @@
decoder.noCodecs.button = Me montrer comment
decoder.noCodecs.accesskey = M
decoder.noCodecs.message = Pour lire la vidéo, vous devez peut-être installer le Media Feature Pack de Microsoft.
-decoder.noCodecsVista.message = Pour lire la vidéo, vous devez peut-être installer le Supplément de mise à jour de plate-forme pour Windows Vista de Microsoft.
decoder.noCodecsLinux.message = Pour lire la vidéo, vous devez peut-être installer les codecs vidéo nécessaires.
decoder.noHWAcceleration.message = Afin d’améliorer la qualité de la vidéo, vous devez peut-être installer le Media Feature Pack de Microsoft.
-decoder.noHWAccelerationVista.message = Afin d’améliorer la qualité de la vidéo, vous devez peut-être installer le Supplément de mise à jour de plate-forme pour Windows Vista de Microsoft.
decoder.noPulseAudio.message = Pour activer l’audio, vous devez peut-être installer le logiciel PulseAudio demandé.
decoder.unsupportedLibavcodec.message = libavcodec pourrait être vulnérable ou n’est pas pris en charge, et devrait être mis à jour pour lire des vidéos.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/advanced.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/advanced.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
@@ -25,8 +25,8 @@
-
-
+
+
@@ -88,8 +88,8 @@
in preferences.properties -->
-
-
+
+
@@ -103,10 +103,10 @@
-
-
-
-
+
+
+
+
@@ -115,12 +115,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/colors.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/colors.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/colors.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/colors.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -6,12 +6,12 @@
-
-
+
+
-
-
-
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/fonts.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/fonts.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/fonts.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/fonts.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -61,8 +61,8 @@
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/main.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/main.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/main.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -6,9 +6,9 @@
-
+
-
+
@@ -28,8 +28,8 @@
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/security.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/security.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/fr/browser/chrome/browser/preferences/security.dtd 2017-01-13 02:07:35.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/fr/browser/chrome/browser/preferences/security.dtd 2017-01-16 02:10:43.000000000 +0000
@@ -4,8 +4,8 @@
-
-
+
+
-
-
+
+
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/it/browser/chrome/browser/preferences/tabs.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/it/browser/chrome/browser/preferences/tabs.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/it/browser/chrome/browser/preferences/tabs.dtd 2017-01-13 02:12:24.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/it/browser/chrome/browser/preferences/tabs.dtd 2017-01-16 02:15:35.000000000 +0000
@@ -6,12 +6,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/accounts.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/accounts.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/accounts.properties 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/accounts.properties 2017-01-16 02:23:59.000000000 +0000
@@ -11,6 +11,8 @@
verificationSentBody = Ссылка для подтверждения была отправлена на %S.
verificationNotSentTitle = Не удалось отправить подтверждение
verificationNotSentBody = Мы не можем отправить сейчас письмо для подтверждения, пожалуйста, повторите попытку позже.
+deviceConnectedTitle = Синхронизация Firefox
+deviceConnectedBody = Этот компьютер теперь синхронизируется с %S.
syncStartNotification.title = Синхронизация включена
syncStartNotification.body2 = %S сейчас начнёт синхронизироваться.
deviceDisconnectedNotification.title = Синхронизация отсоединилась
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/browser.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/browser.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/browser.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/browser.dtd 2017-01-16 02:23:59.000000000 +0000
@@ -553,6 +553,8 @@
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/browser.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/browser.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/browser.properties 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/browser.properties 2017-01-16 02:23:59.000000000 +0000
@@ -59,7 +59,10 @@
unsignedAddonsDisabled.message = Одно или несколько установленных дополнений не могут быть проверены, поэтому они были отключены.
unsignedAddonsDisabled.learnMore.label = Подробнее
unsignedAddonsDisabled.learnMore.accesskey = о
-deveditionTheme.name = Developer Edition
+compactLightTheme.name = Компактная светлая
+compactLightTheme.description = Компактная тема со светлой цветовой гаммой.
+compactDarkTheme.name = Компактная тёмная
+compactDarkTheme.description = Компактная тема с тёмной цветовой гаммой.
lwthemeInstallRequest.message = Этот сайт (%S) попытался установить тему.
lwthemeInstallRequest.allowButton = Разрешить
lwthemeInstallRequest.allowButton.accesskey = ш
@@ -187,7 +190,7 @@
puNotifyText = %S был обновлён
puAlertTitle = %S обновлён
puAlertText = Щёлкните здесь для получения подробностей
-geolocation.allowLocation = Разрешаю доступ к местоположению
+geolocation.allowLocation = Разрешаю
geolocation.allowLocation.accesskey = а
geolocation.dontAllowLocation = Не разрешаю
geolocation.dontAllowLocation.accesskey = е
@@ -310,7 +313,6 @@
emeNotifications.drmContentPlaying.message2 = Некоторое аудио или видео на этом сайте использует программу DRM, что может ограничить возможности, предоставляемые вам %S.
emeNotifications.drmContentPlaying.button.label = Настроить…
emeNotifications.drmContentPlaying.button.accesskey = а
-emeNotifications.drmContentDisabled.message = Для воспроизведения некоторого аудио или видео на этой странице вы должны включить DRM. %S
emeNotifications.drmContentDisabled.button.label = Включить DRM
emeNotifications.drmContentDisabled.button.accesskey = ю
emeNotifications.drmContentDisabled.learnMoreLabel = Подробнее
@@ -372,11 +374,8 @@
decoder.noCodecs.button = Подробнее
decoder.noCodecs.accesskey = о
decoder.noCodecs.message = Для воспроизведения видео вам может потребоваться установить Мedia Feature Pack от Microsoft.
-decoder.noCodecsVista.message = Для воспроизведения видео вам может потребоваться установить Platform Update Supplement для Windows Vista от Microsoft.
-decoder.noCodecsXP.message = Для воспроизведения видео вам может потребоваться включить Плагин расшифровки контента Primetime от Adobe.
decoder.noCodecsLinux.message = Для воспроизведения видео вам может потребоваться установить необходимые видеокодеки.
decoder.noHWAcceleration.message = Для улучшения качества видео вам может потребоваться установить Мedia Feature Pack от Microsoft.
-decoder.noHWAccelerationVista.message = Для улучшения качества видео вам может потребоваться установить Platform Update Supplement для Windows Vista от Microsoft.
decoder.noPulseAudio.message = Для воспроизведения аудио вам может потребоваться установить необходимое программное обеспечение PulseAudio.
decoder.unsupportedLibavcodec.message = libavcodec может быть уязвим или не поддерживается, и должен быть обновлён для воспроизведения видео.
captivePortal.infoMessage2 = Эта сеть может потребовать от вас произвести авторизацию для получения доступа в Интернет.
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/advanced.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/advanced.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/advanced.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/advanced.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -6,10 +6,10 @@
-
-
-
-
+
+
+
+
@@ -19,8 +19,8 @@
-
-
+
+
@@ -59,8 +59,8 @@
-
-
+
+
@@ -70,22 +70,22 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/colors.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/colors.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/colors.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/colors.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -5,11 +5,11 @@
-
-
-
-
-
+
+
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/fonts.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/fonts.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/fonts.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/fonts.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -50,8 +50,8 @@
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/main.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/main.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/main.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/main.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -5,9 +5,9 @@
-
+
-
+
@@ -24,8 +24,8 @@
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/security.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/security.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/security.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/security.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -3,14 +3,14 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
+
+
-
-
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/siteDataSettings.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/siteDataSettings.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/siteDataSettings.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/siteDataSettings.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -7,3 +7,5 @@
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/tabs.dtd firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/tabs.dtd
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/browser/chrome/browser/preferences/tabs.dtd 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/browser/chrome/browser/preferences/tabs.dtd 2017-01-16 02:24:00.000000000 +0000
@@ -6,12 +6,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/devtools/client/netmonitor.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/devtools/client/netmonitor.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/devtools/client/netmonitor.properties 2017-01-13 02:20:23.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/devtools/client/netmonitor.properties 2017-01-16 02:24:00.000000000 +0000
@@ -26,6 +26,7 @@
responseHeaders = Заголовки ответа
requestCookies = Куки запроса
responseCookies = Куки ответа
+responsePayload = Полезная нагрузка ответа
jsonFilterText = Свойства фильтра
jsonScopeName = JSON
jsonpScopeName = JSONP → callback %S()
@@ -158,7 +159,7 @@
netmonitor.context.copyResponseHeaders.accesskey = о
netmonitor.context.copyResponse = Копировать ответ
netmonitor.context.copyResponse.accesskey = и
-netmonitor.context.copyImageAsDataUri = Копировать изображение как URL данных
+netmonitor.context.copyImageAsDataUri = Копировать изображение как URI данных
netmonitor.context.copyImageAsDataUri.accesskey = ж
netmonitor.context.copyAllAsHar = Копировать всё как HAR
netmonitor.context.copyAllAsHar.accesskey = п
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/devtools/client/webconsole.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/devtools/client/webconsole.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/devtools/client/webconsole.properties 2017-01-13 02:20:23.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/devtools/client/webconsole.properties 2017-01-16 02:24:00.000000000 +0000
@@ -54,3 +54,15 @@
webconsole.close.key = CmdOrCtrl+W
webconsole.clear.key = Ctrl+Shift+L
webconsole.clear.keyOSX = Ctrl+L
+webconsole.menu.copyURL.label = Копировать ссылку
+webconsole.menu.copyURL.accesskey = о
+webconsole.menu.openURL.label = Открыть URL в новой вкладке
+webconsole.menu.openURL.accesskey = ы
+webconsole.menu.openInVarView.label = Открыть в Виде Переменных
+webconsole.menu.openInVarView.accesskey = к
+webconsole.menu.storeAsGlobalVar.label = Хранить как глобальную переменную
+webconsole.menu.storeAsGlobalVar.accesskey = н
+webconsole.menu.copy.label = Копировать
+webconsole.menu.copy.accesskey = и
+webconsole.menu.selectAll.label = Выделить всё
+webconsole.menu.selectAll.accesskey = л
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-trunk-53.0~a1~hg20170113r329171/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties 2017-01-13 02:20:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties 2017-01-16 02:24:00.000000000 +0000
@@ -2,10 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-seconds = секунда;секунды;секунд
-minutes = минута;минуты;минут
-hours = час;часа;часов
-days = день;дня;дней
+shortSeconds = сек;сек;сек
+shortMinutes = мин;мин;мин
+shortHours = ч;ч;ч
+shortDays = д;д;д
paused = Загрузка приостановлена — #1
downloading = Загрузка
notStarted = Не начато
@@ -44,11 +44,11 @@
transferSameUnits2 = %1$S из %2$S %3$S
transferDiffUnits2 = %1$S %2$S из %3$S %4$S
transferNoTotal2 = %1$S %2$S
-timePair2 = %1$S %2$S
-timeLeftSingle2 = Осталось %1$S
-timeLeftDouble2 = Осталось %1$S %2$S
-timeFewSeconds = Осталось несколько секунд
-timeUnknown = Оставшееся время неизвестно
+timePair3 = %1$S%2$S
+timeLeftSingle3 = Осталось %1$S
+timeLeftDouble3 = Осталось %1$S %2$S
+timeFewSeconds2 = Осталось несколько секунд
+timeUnknown2 = Оставшееся время неизвестно
doneSize = #1 #2
doneScheme2 = ресурс %1$S
doneFileScheme = локальный файл
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/crashtests/crashtests.list firefox-trunk-53.0~a1~hg20170115r329516/layout/base/crashtests/crashtests.list
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/crashtests/crashtests.list 2017-01-13 01:41:04.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/crashtests/crashtests.list 2017-01-16 01:45:01.000000000 +0000
@@ -129,7 +129,7 @@
load 364427-1.html
load 365909-1.xhtml
load 365909-2.xhtml
-skip-if(stylo) load 366128-1.xhtml # bug 1323654
+load 366128-1.xhtml
load 366271-1.html
load 366967-1.html
load 367015-1.html
@@ -211,7 +211,7 @@
load 403569-1.xhtml
load 403569-2.xhtml
load 403569-3.xhtml
-skip-if(stylo) load 404218-1.xhtml # bug 1323671
+load 404218-1.xhtml
load 404491-1.html
load 404721-1.xhtml
load 404721-2.xhtml
@@ -316,7 +316,7 @@
load 492112-1.xhtml
load 492163-1.xhtml
load 495350-1.html
-skip-if(stylo) load 496011-1.xhtml # bug 1323649
+load 496011-1.xhtml
load 497519-1.xhtml
load 497519-2.xhtml
load 497519-3.xhtml
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/moz.build firefox-trunk-53.0~a1~hg20170115r329516/layout/base/moz.build
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/moz.build 2017-01-13 01:41:04.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/moz.build 2017-01-16 01:45:01.000000000 +0000
@@ -80,6 +80,7 @@
'RestyleManagerHandleInlines.h',
'ServoRestyleManager.h',
'ServoRestyleManagerInlines.h',
+ 'ShapeUtils.h',
'StaticPresData.h',
]
@@ -114,6 +115,7 @@
'RestyleTracker.cpp',
'ScrollbarStyles.cpp',
'ServoRestyleManager.cpp',
+ 'ShapeUtils.cpp',
'StackArena.cpp',
'StaticPresData.cpp',
'TouchManager.cpp',
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsCSSFrameConstructor.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsCSSFrameConstructor.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsCSSFrameConstructor.cpp 2017-01-13 01:41:04.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsCSSFrameConstructor.cpp 2017-01-16 01:45:10.000000000 +0000
@@ -7366,30 +7366,37 @@
return rv;
}
+ // The frame constructor uses this codepath both for bonafide newly-added
+ // content and for RestyleManager-driven frame construction (RECONSTRUCT_FRAME
+ // and lazy frame construction). If we're using the Servo style system, we
+ // want to ensure that styles get resolved in the first case, whereas for the
+ // second case they should have already been resolved if needed.
+ bool isNewlyAddedContentForServo = aContainer->IsStyledByServo() &&
+ !RestyleManager()->AsBase()->IsInStyleRefresh();
+
// See comment in ContentRangeInserted for why this is necessary.
if (!GetContentInsertionFrameFor(aContainer) &&
!aContainer->IsActiveChildrenElement()) {
+ // We're punting on frame construction because there's no container frame.
+ // The Servo-backed style system handles this case like the lazy frame
+ // construction case.
+ if (isNewlyAddedContentForServo) {
+ aContainer->AsElement()->NoteDirtyDescendantsForServo();
+ }
return NS_OK;
}
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTAPPEND, aContainer, aFirstNewContent)) {
- if (aContainer->IsStyledByServo()) {
+ if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
}
// We couldn't construct lazily. Make Servo eagerly traverse the subtree.
- if (ServoStyleSet* set = mPresShell->StyleSet()->GetAsServo()) {
- // We use the same codepaths to handle both of the following cases:
- // (a) Newly-appended content for which lazy frame construction is disallowed.
- // (b) Lazy frame construction driven by the restyle manager.
- // We need the styles for (a). In the case of (b), the Servo traversal has
- // already happened, so we don't need to do it again.
- if (!RestyleManager()->AsBase()->IsInStyleRefresh()) {
- set->StyleNewChildren(aContainer->AsElement());
- }
+ if (isNewlyAddedContentForServo) {
+ mPresShell->StyleSet()->AsServo()->StyleNewChildren(aContainer->AsElement());
}
LAYOUT_PHASE_TEMP_EXIT();
@@ -7817,6 +7824,15 @@
return rv;
}
+ // The frame constructor uses this codepath both for bonafide newly-added
+ // content and for RestyleManager-driven frame construction (RECONSTRUCT_FRAME
+ // and lazy frame construction). If we're using the Servo style system, we
+ // want to ensure that styles get resolved in the first case, whereas for the
+ // second case they should have already been resolved if needed.
+ bool isNewlyAddedContentForServo = aContainer->IsStyledByServo() &&
+ !RestyleManager()->AsBase()->IsInStyleRefresh();
+
+
// Put 'parentFrame' inside a scope so we don't confuse it with
// 'insertion.mParentFrame' later.
{
@@ -7825,6 +7841,12 @@
// a parent. While its uncommon to change the structure of the default content itself, a label,
// for example, can be reframed by having its value attribute set or removed.
if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
+ // We're punting on frame construction because there's no container frame.
+ // The Servo-backed style system handles this case like the lazy frame
+ // construction case.
+ if (isNewlyAddedContentForServo) {
+ aContainer->AsElement()->NoteDirtyDescendantsForServo();
+ }
return NS_OK;
}
@@ -7834,7 +7856,7 @@
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTINSERT, aContainer, aStartChild)) {
- if (aContainer->IsStyledByServo()) {
+ if (isNewlyAddedContentForServo) {
aContainer->AsElement()->NoteDirtyDescendantsForServo();
}
return NS_OK;
@@ -7842,15 +7864,8 @@
}
// We couldn't construct lazily. Make Servo eagerly traverse the subtree.
- if (ServoStyleSet* set = mPresShell->StyleSet()->GetAsServo()) {
- // We use the same codepaths to handle both of the following cases:
- // (a) Newly-appended content for which lazy frame construction is disallowed.
- // (b) Lazy frame construction driven by the restyle manager.
- // We need the styles for (a). In the case of (b), the Servo traversal has
- // already happened, so we don't need to do it again.
- if (!RestyleManager()->AsBase()->IsInStyleRefresh()) {
- set->StyleNewChildren(aContainer->AsElement());
- }
+ if (isNewlyAddedContentForServo) {
+ mPresShell->StyleSet()->AsServo()->StyleNewChildren(aContainer->AsElement());
}
InsertionPoint insertion;
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsLayoutUtils.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsLayoutUtils.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsLayoutUtils.cpp 2017-01-13 01:41:05.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsLayoutUtils.cpp 2017-01-16 01:45:20.000000000 +0000
@@ -22,6 +22,7 @@
#include "mozilla/dom/ContentChild.h"
#include "mozilla/Unused.h"
#include "nsCharTraits.h"
+#include "nsDocument.h"
#include "nsFontMetrics.h"
#include "nsPresContext.h"
#include "nsIContent.h"
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsStyleChangeList.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsStyleChangeList.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/nsStyleChangeList.cpp 2017-01-13 01:41:09.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/nsStyleChangeList.cpp 2017-01-16 01:45:22.000000000 +0000
@@ -18,6 +18,10 @@
{
MOZ_ASSERT(aFrame || (aHint & nsChangeHint_ReconstructFrame),
"must have frame");
+ MOZ_ASSERT(aHint, "No hint to process?");
+ MOZ_ASSERT(!(aHint & nsChangeHint_NeutralChange),
+ "Neutral changes do not need extra processing, "
+ "and should be stripped out");
MOZ_ASSERT(aContent || !(aHint & nsChangeHint_ReconstructFrame),
"must have content");
// XXXbz we should make this take Element instead of nsIContent
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/PresShell.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/PresShell.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/PresShell.cpp 2017-01-13 01:40:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/PresShell.cpp 2017-01-16 01:44:21.000000000 +0000
@@ -8044,6 +8044,9 @@
}
}
}
+ if (aEvent->mMessage == eKeyDown) {
+ mIsLastKeyDownCanceled = aEvent->mFlags.mDefaultPrevented;
+ }
break;
}
case eMouseUp:
@@ -8833,6 +8836,9 @@
!doc->EventHandlingSuppressed()) {
nsAutoPtr ev(mDelayedEvents[0].forget());
mDelayedEvents.RemoveElementAt(0);
+ if (ev->IsKeyPressEvent() && mIsLastKeyDownCanceled) {
+ continue;
+ }
ev->Dispatch();
}
if (!doc->EventHandlingSuppressed()) {
@@ -9638,6 +9644,12 @@
mEvent = keyEvent;
}
+bool
+PresShell::DelayedKeyEvent::IsKeyPressEvent()
+{
+ return mEvent->mMessage == eKeyPress;
+}
+
// Start of DEBUG only code
#ifdef DEBUG
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/PresShell.h firefox-trunk-53.0~a1~hg20170115r329516/layout/base/PresShell.h
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/PresShell.h 2017-01-13 01:40:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/PresShell.h 2017-01-16 01:44:22.000000000 +0000
@@ -600,6 +600,7 @@
public:
virtual ~DelayedEvent() { }
virtual void Dispatch() { }
+ virtual bool IsKeyPressEvent() { return false; }
};
class DelayedInputEvent : public DelayedEvent
@@ -624,6 +625,7 @@
{
public:
explicit DelayedKeyEvent(mozilla::WidgetKeyboardEvent* aEvent);
+ virtual bool IsKeyPressEvent() override;
};
// Check if aEvent is a mouse event and record the mouse location for later
@@ -903,6 +905,8 @@
// Whether the widget has received a paint message yet.
bool mHasReceivedPaintMessage : 1;
+ bool mIsLastKeyDownCanceled : 1;
+
static bool sDisableNonTestMouseEvents;
};
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/RestyleTracker.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/RestyleTracker.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/RestyleTracker.cpp 2017-01-13 01:40:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/RestyleTracker.cpp 2017-01-16 01:44:22.000000000 +0000
@@ -61,9 +61,7 @@
struct RestyleEnumerateData : RestyleTracker::Hints {
RefPtr mElement;
-#if defined(MOZ_ENABLE_PROFILER_SPS)
UniqueProfilerBacktrace mBacktrace;
-#endif
};
inline void
@@ -257,12 +255,10 @@
data->mRestyleHint, MarkerTracingType::START)));
}
-#if defined(MOZ_ENABLE_PROFILER_SPS)
Maybe profilerRAII;
if (profiler_feature_active("restyle")) {
profilerRAII.emplace("Paint", "Styles", Move(data->mBacktrace));
}
-#endif
ProcessOneRestyle(element, data->mRestyleHint, data->mChangeHint,
data->mRestyleHintData);
AddRestyleRootsIfAwaitingRestyle(data->mDescendants);
@@ -337,9 +333,7 @@
// We can move data since we'll be clearing mPendingRestyles after
// we finish enumerating it.
restyle->mRestyleHintData = Move(data->mRestyleHintData);
-#if defined(MOZ_ENABLE_PROFILER_SPS)
restyle->mBacktrace = Move(data->mBacktrace);
-#endif
#ifdef RESTYLE_LOGGING
count++;
@@ -365,12 +359,10 @@
index++, count);
LOG_RESTYLE_INDENT();
-#if defined(MOZ_ENABLE_PROFILER_SPS)
Maybe profilerRAII;
if (profiler_feature_active("restyle")) {
profilerRAII.emplace("Paint", "Styles", Move(currentRestyle->mBacktrace));
}
-#endif
if (isTimelineRecording) {
timelines->AddMarkerForDocShell(docShell, Move(
MakeUnique(
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/RestyleTracker.h firefox-trunk-53.0~a1~hg20170115r329516/layout/base/RestyleTracker.h
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/RestyleTracker.h 2017-01-13 01:40:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/RestyleTracker.h 2017-01-16 01:44:22.000000000 +0000
@@ -22,10 +22,6 @@
#include "GeckoProfiler.h"
#include "mozilla/Maybe.h"
-#if defined(MOZ_ENABLE_PROFILER_SPS)
-#include "ProfilerBacktrace.h"
-#endif
-
namespace mozilla {
class RestyleManager;
@@ -128,9 +124,7 @@
// that we called AddPendingRestyle for and found the element this is
// the RestyleData for as its nearest restyle root.
nsTArray> mDescendants;
-#if defined(MOZ_ENABLE_PROFILER_SPS)
UniqueProfilerBacktrace mBacktrace;
-#endif
};
/**
@@ -265,11 +259,9 @@
if (!existingData) {
RestyleData* rd =
new RestyleData(aRestyleHint, aMinChangeHint, aRestyleHintData);
-#if defined(MOZ_ENABLE_PROFILER_SPS)
if (profiler_feature_active("restyle")) {
rd->mBacktrace = profiler_get_backtrace();
}
-#endif
mPendingRestyles.Put(aElement, rd);
return false;
}
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ServoRestyleManager.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ServoRestyleManager.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ServoRestyleManager.cpp 2017-01-13 01:40:39.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ServoRestyleManager.cpp 2017-01-16 01:44:22.000000000 +0000
@@ -30,6 +30,8 @@
nsRestyleHint aRestyleHint,
nsChangeHint aMinChangeHint)
{
+ MOZ_ASSERT(!(aMinChangeHint & nsChangeHint_NeutralChange),
+ "Didn't expect explicit change hints to be neutral!");
if (MOZ_UNLIKELY(IsDisconnected()) ||
MOZ_UNLIKELY(PresContext()->PresShell()->IsDestroying())) {
return;
@@ -147,8 +149,9 @@
// FIXME(bholley): Once we transfer ownership of the styles to the frame, we
// can fast-reject without the FFI call by checking mServoData for null.
nsChangeHint changeHint = Servo_TakeChangeHint(aElement);
- if (changeHint) {
- aChangeListToProcess.AppendChange(primaryFrame, aElement, changeHint);
+ if (changeHint & ~nsChangeHint_NeutralChange) {
+ aChangeListToProcess.AppendChange(
+ primaryFrame, aElement, changeHint & ~nsChangeHint_NeutralChange);
}
// If our change hint is reconstruct, we delegate to the frame constructor,
@@ -227,11 +230,18 @@
StyleChildrenIterator it(aElement);
for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) {
if (traverseElementChildren && n->IsElement()) {
- MOZ_ASSERT(primaryFrame,
- "Frame construction should be scheduled, and it takes the "
- "correct style for the children, so no need to be here.");
- RecreateStyleContexts(n->AsElement(), primaryFrame->StyleContext(),
- aStyleSet, aChangeListToProcess);
+ if (!primaryFrame) {
+ // The frame constructor presumably decided to suppress frame
+ // construction on this subtree. Just clear the dirty descendants
+ // bit from the subtree, since there's no point in harvesting the
+ // change hints.
+ MOZ_ASSERT(!n->AsElement()->GetPrimaryFrame(),
+ "Only display:contents should do this, and we don't handle that yet");
+ ClearDirtyDescendantsFromSubtree(n->AsElement());
+ } else {
+ RecreateStyleContexts(n->AsElement(), primaryFrame->StyleContext(),
+ aStyleSet, aChangeListToProcess);
+ }
} else if (traverseTextChildren && n->IsNodeOfType(nsINode::eTEXT)) {
RecreateStyleContextsForText(n, primaryFrame->StyleContext(),
aStyleSet);
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ShapeUtils.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ShapeUtils.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ShapeUtils.cpp 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ShapeUtils.cpp 2017-01-16 01:44:22.000000000 +0000
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/ShapeUtils.h"
+
+#include
+
+#include "nsCSSRendering.h"
+#include "nsRuleNode.h"
+#include "nsStyleCoord.h"
+#include "nsStyleStruct.h"
+#include "SVGContentUtils.h"
+
+namespace mozilla {
+
+nscoord
+ShapeUtils::ComputeShapeRadius(const StyleShapeRadius aType,
+ const nscoord aCenter,
+ const nscoord aPosMin,
+ const nscoord aPosMax)
+{
+ nscoord dist1 = std::abs(aPosMin - aCenter);
+ nscoord dist2 = std::abs(aPosMax - aCenter);
+ nscoord length = 0;
+ switch (aType) {
+ case StyleShapeRadius::FarthestSide:
+ length = dist1 > dist2 ? dist1 : dist2;
+ break;
+ case StyleShapeRadius::ClosestSide:
+ length = dist1 > dist2 ? dist2 : dist1;
+ break;
+ }
+ return length;
+}
+
+nsPoint
+ShapeUtils::ComputeCircleOrEllipseCenter(StyleBasicShape* const aBasicShape,
+ const nsRect& aRefBox)
+{
+ nsPoint topLeft, anchor;
+ nsSize size(aRefBox.Size());
+ nsImageRenderer::ComputeObjectAnchorPoint(aBasicShape->GetPosition(),
+ size, size,
+ &topLeft, &anchor);
+ return nsPoint(anchor.x + aRefBox.x, anchor.y + aRefBox.y);
+}
+
+nscoord
+ShapeUtils::ComputeCircleRadius(StyleBasicShape* const aBasicShape,
+ const nsPoint& aCenter,
+ const nsRect& aRefBox)
+{
+ const nsTArray& coords = aBasicShape->Coordinates();
+ MOZ_ASSERT(coords.Length() == 1, "wrong number of arguments");
+ nscoord r = 0;
+ if (coords[0].GetUnit() == eStyleUnit_Enumerated) {
+ const auto styleShapeRadius = coords[0].GetEnumValue();
+ nscoord horizontal =
+ ComputeShapeRadius(styleShapeRadius, aCenter.x, aRefBox.x, aRefBox.XMost());
+ nscoord vertical =
+ ComputeShapeRadius(styleShapeRadius, aCenter.y, aRefBox.y, aRefBox.YMost());
+ r = styleShapeRadius == StyleShapeRadius::FarthestSide
+ ? std::max(horizontal, vertical)
+ : std::min(horizontal, vertical);
+ } else {
+ // We resolve percent value for circle() as defined here:
+ // https://drafts.csswg.org/css-shapes/#funcdef-circle
+ double referenceLength =
+ SVGContentUtils::ComputeNormalizedHypotenuse(aRefBox.width,
+ aRefBox.height);
+ r = nsRuleNode::ComputeCoordPercentCalc(coords[0],
+ NSToCoordRound(referenceLength));
+ }
+ return r;
+}
+
+} // namespace mozilla
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ShapeUtils.h firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ShapeUtils.h
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/base/ShapeUtils.h 1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/base/ShapeUtils.h 2017-01-16 01:44:22.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_ShapeUtils_h
+#define mozilla_ShapeUtils_h
+
+#include "nsCoord.h"
+#include "nsStyleConsts.h"
+
+struct nsPoint;
+struct nsRect;
+
+namespace mozilla {
+class StyleBasicShape;
+
+// ShapeUtils is a namespace class containing utility functions related to
+// processing basic shapes in the CSS Shapes Module.
+// https://drafts.csswg.org/css-shapes/#basic-shape-functions
+//
+struct ShapeUtils final
+{
+ // Compute the length of a keyword , i.e. closest-side or
+ // farthest-side, for a circle or an ellipse on a single dimension. The
+ // caller needs to call for both dimensions and combine the result.
+ // https://drafts.csswg.org/css-shapes/#typedef-shape-radius.
+ //
+ // @return The length of the radius in app units.
+ static nscoord ComputeShapeRadius(const StyleShapeRadius aType,
+ const nscoord aCenter,
+ const nscoord aPosMin,
+ const nscoord aPosMax);
+
+ // Compute the center of a circle or an ellipse.
+ //
+ // @param aRefBox The reference box of the basic shape.
+ // @return The point of the center.
+ static nsPoint ComputeCircleOrEllipseCenter(
+ StyleBasicShape* const aBasicShape,
+ const nsRect& aRefBox);
+
+ // Compute the radius for a circle.
+ // @param aCenter the center of the circle.
+ // @param aRefBox the reference box of the circle.
+ // @return The length of the radius in app units.
+ static nscoord ComputeCircleRadius(
+ mozilla::StyleBasicShape* const aBasicShape,
+ const nsPoint& aCenter, const nsRect& aRefBox);
+};
+
+} // namespace mozilla
+
+#endif // mozilla_ShapeUtils_h
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/BlockReflowInput.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/BlockReflowInput.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/BlockReflowInput.cpp 2017-01-13 01:42:55.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/BlockReflowInput.cpp 2017-01-16 01:46:11.000000000 +0000
@@ -988,9 +988,8 @@
region.BSize(wm) = std::max(region.BSize(wm),
ContentBSize() - floatPos.B(wm));
}
- DebugOnly rv = mFloatManager->AddFloat(aFloat, region, wm,
- ContainerSize());
- MOZ_ASSERT(NS_SUCCEEDED(rv), "bad float placement");
+ mFloatManager->AddFloat(aFloat, region, wm, ContainerSize());
+
// store region
nsFloatManager::StoreRegionFor(wm, aFloat, region, ContainerSize());
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/crashtests/crashtests.list firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/crashtests/crashtests.list
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/crashtests/crashtests.list 2017-01-13 01:43:21.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/crashtests/crashtests.list 2017-01-16 01:47:03.000000000 +0000
@@ -207,7 +207,7 @@
load 406137.html
load 406380.html
load 406902-1.html
-skip-if(stylo) load 407009-1.xhtml # bug 1323654
+load 407009-1.xhtml
load 408304-1.xhtml
load 408602-1.html
load 408737-1.html
@@ -262,7 +262,7 @@
load 425253-1.html
load 426040-1.html
load 426272-1.html
-skip-if(stylo) load 428263-1.html # bug 1323671
+load 428263-1.html
load 429458.xhtml
load 429960-1.html
load 429960-2.html
diff -Nru firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/nsFloatManager.cpp firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/nsFloatManager.cpp
--- firefox-trunk-53.0~a1~hg20170113r329171/layout/generic/nsFloatManager.cpp 2017-01-13 01:43:22.000000000 +0000
+++ firefox-trunk-53.0~a1~hg20170115r329516/layout/generic/nsFloatManager.cpp 2017-01-16 01:47:05.000000000 +0000
@@ -10,6 +10,7 @@
#include
#include "mozilla/ReflowInput.h"
+#include "mozilla/ShapeUtils.h"
#include "nsBlockFrame.h"
#include "nsError.h"
#include "nsIPresShell.h"
@@ -187,7 +188,7 @@
// There aren't any more floats that could intersect this band.
break;
}
- if (fi.IsEmpty()) {
+ if (fi.IsEmpty(aShapeType)) {
// For compatibility, ignore floats with empty rects, even though it
// disagrees with the spec. (We might want to fix this in the
// future, though.)
@@ -261,7 +262,7 @@
lineRight - lineLeft, blockSize, haveFloats);
}
-nsresult
+void
nsFloatManager::AddFloat(nsIFrame* aFloatFrame, const LogicalRect& aMarginRect,
WritingMode aWM, const nsSize& aContainerSize)
{
@@ -290,10 +291,7 @@
if (thisBEnd > sideBEnd)
sideBEnd = thisBEnd;
- if (!mFloats.AppendElement(info))
- return NS_ERROR_OUT_OF_MEMORY;
-
- return NS_OK;
+ mFloats.AppendElement(Move(info));
}
// static
@@ -531,6 +529,145 @@
}
/////////////////////////////////////////////////////////////////////////////
+// BoxShapeInfo
+
+nscoord
+nsFloatManager::BoxShapeInfo::LineLeft(WritingMode aWM,
+ const nscoord aBStart,
+ const nscoord aBEnd) const
+{
+ nscoord radii[8];
+ bool hasRadii = mFrame->GetShapeBoxBorderRadii(radii);
+
+ if (!hasRadii) {
+ return mShapeBoxRect.x;
+ }
+
+ // Get the physical side for line-left since border-radii are in
+ // the physical axis.
+ mozilla::Side lineLeftSide =
+ aWM.PhysicalSide(aWM.LogicalSideForLineRelativeDir(eLineRelativeDirLeft));
+ nscoord blockStartCornerRadiusL =
+ radii[SideToHalfCorner(lineLeftSide, true, false)];
+ nscoord blockStartCornerRadiusB =
+ radii[SideToHalfCorner(lineLeftSide, true, true)];
+ nscoord blockEndCornerRadiusL =
+ radii[SideToHalfCorner(lineLeftSide, false, false)];
+ nscoord blockEndCornerRadiusB =
+ radii[SideToHalfCorner(lineLeftSide, false, true)];
+
+ if (aWM.IsLineInverted()) {
+ // This happens only when aWM is vertical-lr. Need to swap blockStart
+ // and blockEnd corners.
+ std::swap(blockStartCornerRadiusL, blockEndCornerRadiusL);
+ std::swap(blockStartCornerRadiusB, blockEndCornerRadiusB);
+ }
+
+ nscoord lineLeftDiff =
+ ComputeEllipseLineInterceptDiff(
+ mShapeBoxRect.y, mShapeBoxRect.YMost(),
+ blockStartCornerRadiusL, blockStartCornerRadiusB,
+ blockEndCornerRadiusL, blockEndCornerRadiusB,
+ aBStart, aBEnd);
+ return mShapeBoxRect.x + lineLeftDiff;
+}
+
+nscoord
+nsFloatManager::BoxShapeInfo::LineRight(WritingMode aWM,
+ const nscoord aBStart,
+ const nscoord aBEnd) const
+{
+ nscoord radii[8];
+ bool hasRadii = mFrame->GetShapeBoxBorderRadii(radii);
+
+ if (!hasRadii) {
+ return mShapeBoxRect.XMost();
+ }
+
+ // Get the physical side for line-right since border-radii are in
+ // the physical axis.
+ mozilla::Side lineRightSide =
+ aWM.PhysicalSide(aWM.LogicalSideForLineRelativeDir(eLineRelativeDirRight));
+ nscoord blockStartCornerRadiusL =
+ radii[SideToHalfCorner(lineRightSide, false, false)];
+ nscoord blockStartCornerRadiusB =
+ radii[SideToHalfCorner(lineRightSide, false, true)];
+ nscoord blockEndCornerRadiusL =
+ radii[SideToHalfCorner(lineRightSide, true, false)];
+ nscoord blockEndCornerRadiusB =
+ radii[SideToHalfCorner(lineRightSide, true, true)];
+
+ if (aWM.IsLineInverted()) {
+ // This happens only when aWM is vertical-lr. Need to swap blockStart
+ // and blockEnd corners.
+ std::swap(blockStartCornerRadiusL, blockEndCornerRadiusL);
+ std::swap(blockStartCornerRadiusB, blockEndCornerRadiusB);
+ }
+
+ nscoord lineRightDiff =
+ ComputeEllipseLineInterceptDiff(
+ mShapeBoxRect.y, mShapeBoxRect.YMost(),
+ blockStartCornerRadiusL, blockStartCornerRadiusB,
+ blockEndCornerRadiusL, blockEndCornerRadiusB,
+ aBStart, aBEnd);
+ return mShapeBoxRect.XMost() - lineRightDiff;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CircleShapeInfo
+
+nsFloatManager::CircleShapeInfo::CircleShapeInfo(
+ StyleBasicShape* const aBasicShape,
+ nscoord aLineLeft,
+ nscoord aBlockStart,
+ const LogicalRect& aShapeBoxRect,
+ WritingMode aWM,
+ const nsSize& aContainerSize)
+{
+ // Use physical coordinates to compute the center of the circle() since
+ // the keywords such as 'left', 'top', etc. are physical.
+ // https://drafts.csswg.org/css-shapes-1/#funcdef-circle
+ nsRect physicalShapeBoxRect =
+ aShapeBoxRect.GetPhysicalRect(aWM, aContainerSize);
+ nsPoint physicalCenter =
+ ShapeUtils::ComputeCircleOrEllipseCenter(aBasicShape, physicalShapeBoxRect);
+ mRadius =
+ ShapeUtils::ComputeCircleRadius(aBasicShape, physicalCenter,
+ physicalShapeBoxRect);
+
+ // Convert the coordinate space back to the same as FloatInfo::mRect.
+ // mCenter.x is in the line-axis of the frame manager and mCenter.y are in
+ // the frame manager's real block-axis.
+ LogicalPoint logicalCenter(aWM, physicalCenter, aContainerSize);
+ mCenter = nsPoint(logicalCenter.LineRelative(aWM, aContainerSize) + aLineLeft,
+ logicalCenter.B(aWM) + aBlockStart);
+}
+
+nscoord
+nsFloatManager::CircleShapeInfo::LineLeft(WritingMode aWM,
+ const nscoord aBStart,
+ const nscoord aBEnd) const
+{
+ nscoord lineLeftDiff =
+ ComputeEllipseLineInterceptDiff(BStart(), BEnd(),
+ mRadius, mRadius, mRadius, mRadius,
+ aBStart, aBEnd);
+ return mCenter.x - mRadius + lineLeftDiff;
+}
+
+nscoord
+nsFloatManager::CircleShapeInfo::LineRight(WritingMode aWM,
+ const nscoord aBStart,
+ const nscoord aBEnd) const
+{
+ nscoord lineRightDiff =
+ ComputeEllipseLineInterceptDiff(BStart(), BEnd(),
+ mRadius, mRadius, mRadius, mRadius,
+ aBStart, aBEnd);
+ return mCenter.x + mRadius - lineRightDiff;
+}
+
+/////////////////////////////////////////////////////////////////////////////
// FloatInfo
nsFloatManager::FloatInfo::FloatInfo(nsIFrame* aFrame,
@@ -548,41 +685,58 @@
const StyleShapeOutside& shapeOutside = mFrame->StyleDisplay()->mShapeOutside;
- if (shapeOutside.GetType() == StyleShapeSourceType::Box) {
- // Initialize shape-box reference rect.
- LogicalRect rect = aMarginRect;
+ if (shapeOutside.GetType() == StyleShapeSourceType::None) {
+ return;
+ }
- switch (shapeOutside.GetReferenceBox()) {
- case StyleShapeOutsideShapeBox::Content:
- rect.Deflate(aWM, mFrame->GetLogicalUsedPadding(aWM));
- MOZ_FALLTHROUGH;
- case StyleShapeOutsideShapeBox::Padding:
- rect.Deflate(aWM, mFrame->GetLogicalUsedBorder(aWM));
- MOZ_FALLTHROUGH;
- case StyleShapeOutsideShapeBox::Border:
- rect.Deflate(aWM, mFrame->GetLogicalUsedMargin(aWM));
- break;
- case StyleShapeOutsideShapeBox::Margin:
- // Do nothing. rect is already a margin rect.
- break;
- case StyleShapeOutsideShapeBox::NoBox:
- MOZ_ASSERT_UNREACHABLE("Why don't we have a shape-box?");
- break;
- }
+ // Initialize 's reference rect.
+ LogicalRect rect = aMarginRect;
- mShapeBoxRect.emplace(rect.LineLeft(aWM, aContainerSize) + aLineLeft,
- rect.BStart(aWM) + aBlockStart,
- rect.ISize(aWM), rect.BSize(aWM));
+ switch (shapeOutside.GetReferenceBox()) {
+ case StyleShapeOutsideShapeBox::Content:
+ rect.Deflate(aWM, mFrame->GetLogicalUsedPadding(aWM));
+ MOZ_FALLTHROUGH;
+ case StyleShapeOutsideShapeBox::Padding:
+ rect.Deflate(aWM, mFrame->GetLogicalUsedBorder(aWM));
+ MOZ_FALLTHROUGH;
+ case StyleShapeOutsideShapeBox::Border:
+ rect.Deflate(aWM, mFrame->GetLogicalUsedMargin(aWM));
+ break;
+ case StyleShapeOutsideShapeBox::Margin:
+ // Do nothing. rect is already a margin rect.
+ break;
+ case StyleShapeOutsideShapeBox::NoBox:
+ MOZ_ASSERT(shapeOutside.GetType() != StyleShapeSourceType::Box,
+ "Box source type must have specified!");
+ break;
+ }
+
+ if (shapeOutside.GetType() == StyleShapeSourceType::Box) {
+ nsRect shapeBoxRect(rect.LineLeft(aWM, aContainerSize) + aLineLeft,
+ rect.BStart(aWM) + aBlockStart,
+ rect.ISize(aWM), rect.BSize(aWM));
+ mShapeInfo = MakeUnique(shapeBoxRect, mFrame);
+ } else if (shapeOutside.GetType() == StyleShapeSourceType::Shape) {
+ StyleBasicShape* const basicShape = shapeOutside.GetBasicShape();
+
+ if (basicShape->GetShapeType() == StyleBasicShapeType::Circle) {
+ mShapeInfo = MakeUnique