a1 a2 a3 a4
+ a5
+ - +
diff --git a/browser/components/payments/test/mochitest/test_payment_dialog.html b/browser/components/payments/test/mochitest/test_payment_dialog.html
index 0f761cafbb0e6..9850ba680b502 100644
--- a/browser/components/payments/test/mochitest/test_payment_dialog.html
+++ b/browser/components/payments/test/mochitest/test_payment_dialog.html
@@ -21,6 +21,7 @@
diff --git a/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html b/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html
index 37a95b6a09aef..53608750ec6a1 100644
--- a/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html
+++ b/browser/components/payments/test/mochitest/test_payment_dialog_required_top_level_items.html
@@ -20,6 +20,7 @@
diff --git a/browser/components/pocket/skin/pocket.css b/browser/components/pocket/skin/pocket.css
index 6f81ce07098df..3db15eb260be7 100644
--- a/browser/components/pocket/skin/pocket.css
+++ b/browser/components/pocket/skin/pocket.css
@@ -49,8 +49,6 @@
#pocket-button-box[animate="true"] > #pocket-animatable-box,
#pocket-button > .toolbarbutton-animatable-box {
- position: absolute;
- overflow: hidden;
top: calc(50% - 8px); /* 8px is half the height of the sprite */
/* Since .toolbarbutton-icon uses a different width than the animatable box,
we need to set a padding relative to the difference in widths. */
@@ -163,7 +161,7 @@
}
}
-.toolbarbutton-animatable-box[animate="pocket"] > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="pocket"] > .toolbarbutton-animatable-image {
background-image: url("chrome://pocket/skin/library-pocket-animation.svg");
width: 1078px;
animation-name: library-pocket-animation;
@@ -171,11 +169,11 @@
animation-timing-function: steps(48);
}
-.toolbarbutton-animatable-box[animate="pocket"]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="pocket"]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-image {
animation-name: library-pocket-animation-rtl;
}
-.toolbarbutton-animatable-box[animate="pocket"][fade] > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="pocket"][fade] > .toolbarbutton-animatable-image {
animation-name: library-pocket-fade;
animation-duration: 2s;
animation-timing-function: ease-out;
diff --git a/browser/components/search/content/search-one-offs.js b/browser/components/search/content/search-one-offs.js
index 88f4428957e83..4973b029b2b87 100644
--- a/browser/components/search/content/search-one-offs.js
+++ b/browser/components/search/content/search-one-offs.js
@@ -8,6 +8,38 @@
{
+let sharedFragment;
+function getFragment() {
+ if (!sharedFragment) {
+ sharedFragment = MozXULElement.parseXULToFragment(`
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `, ["chrome://browser/locale/browser.dtd"]);
+ }
+
+ return document.importNode(sharedFragment, true);
+}
+
class MozSearchOneOffs extends MozXULElement {
constructor() {
super();
@@ -183,32 +215,11 @@ class MozSearchOneOffs extends MozXULElement {
}
connectedCallback() {
- this.appendChild(
- MozXULElement.parseXULToFragment(`
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- `, ["chrome://browser/locale/browser.dtd"])
- );
+ if (this.delayConnectedCallback()) {
+ return;
+ }
+
+ this.appendChild(getFragment());
this._popup = null;
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 84bff6789ecbb..b0b1723e8f9f0 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -26,7 +26,15 @@
+
+
+
+
+
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css
index a0d4eff9108d5..046d8341b0334 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -19,6 +19,22 @@ toolbar[brighttext] {
fill-opacity: var(--toolbarbutton-icon-fill-opacity);
}
+.toolbarbutton-animatable-box {
+ position: absolute;
+ overflow: hidden;
+ z-index: 2;
+}
+
+.toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
+ animation-fill-mode: forwards;
+ animation-iteration-count: 1;
+ list-style-image: none;
+ /* Height must be equal to height of toolbarbutton padding-box. --toolbarbutton-height
+ is calculated and set during runtime by BrowserUtils.setToolbarButtonHeightProperty()
+ before the animation begins. */
+ height: var(--toolbarbutton-height);
+}
+
#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
#reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
@@ -37,12 +53,6 @@ toolbar[brighttext] {
list-style-image: url("chrome://browser/skin/forward.svg");
}
-.toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
- animation-fill-mode: forwards;
- animation-iteration-count: 1;
- list-style-image: none;
-}
-
/* The animations for the reload-button and stop-button are disabled
outside of the nav-bar due to bug 1382894. */
:-moz-any(#reload-button, #stop-button) > .toolbarbutton-animatable-box {
@@ -100,8 +110,6 @@ toolbar[brighttext] {
#reload-button > .toolbarbutton-animatable-box,
#stop-button > .toolbarbutton-animatable-box {
- position: absolute;
- overflow: hidden;
top: calc(50% - 10px); /* Vertically center the 20px tall animatable image */
/* Since .toolbarbutton-icon uses a different width than the animatable-box,
we need to set a padding relative to the difference in widths. */
@@ -110,11 +118,6 @@ toolbar[brighttext] {
height: 20px; /* Height of each frame within the SVG sprite */
}
-#reload-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image,
-#stop-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
- height: var(--toolbarbutton-height); /* Height must be equal to height of toolbarbutton padding-box */
-}
-
#stop-reload-button[animate] > #reload-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
background-image: url("chrome://browser/skin/reload-to-stop.svg");
width: 468px;
@@ -338,8 +341,6 @@ toolbar[brighttext] {
}
#nav-bar-overflow-button > .toolbarbutton-animatable-box {
- position: absolute;
- overflow: hidden;
top: calc(50% - 18px); /* Vertically center the 36px tall animatable image */
/* Since .toolbarbutton-icon uses a different width than the animatable box,
we need to set a padding relative to the difference in widths. */
@@ -349,10 +350,6 @@ toolbar[brighttext] {
}
#nav-bar-overflow-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
- /* Height must be equal to height of toolbarbutton padding-box. --toolbarbutton-height
- is calculated and set during runtime by BrowserUtils.setToolbarButtonHeightProperty()
- before the animation begins. */
- height: var(--toolbarbutton-height);
min-height: 36px; /* Minimum height must be equal to the height of the SVG sprite */
}
@@ -459,29 +456,24 @@ toolbar[brighttext] {
fill: transparent;
}
-.toolbarbutton-animatable-box[animate] {
- position: absolute;
- overflow: hidden;
+#library-animatable-box[animate] {
/* Position the sprite at the y-position of the library-button, then adjust
based on the size difference between half of the button height and half
- of the sprite height. The titlebar may have padding from -moz-appearance
- that needs to be accounted for. */
- top: calc(var(--library-button-y) + var(--library-button-height) / 2 - 27px - var(--toolbox-y));
+ of the sprite height. */
+ top: calc(var(--library-button-height) / 2 - 27px);
/* Set a margin relative to the difference in widths of the .toolbarbutton-icon
and the .toolbar-animatable-box. This is correct even in RTL because the item
is positioned using `left`. */
left: calc(var(--library-icon-x) + (16px + 2 * var(--toolbarbutton-inner-padding) - 22px) / 2);
width: 22px; /* Width of each frame within the SVG sprite */
height: 54px; /* Height of each frame within the SVG sprite */
- z-index: 2;
}
-.toolbarbutton-animatable-box[animate] > .toolbarbutton-animatable-image {
- height: var(--toolbarbutton-height);
+#library-animatable-box[animate] > .toolbarbutton-animatable-image {
min-height: 54px; /* Minimum height must be equal to the height of the SVG sprite */
}
-.toolbarbutton-animatable-box[animate="bookmark"] > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="bookmark"] > .toolbarbutton-animatable-image {
background-image: url("chrome://browser/skin/library-bookmark-animation.svg");
width: 1078px;
animation-name: library-bookmark-animation;
@@ -491,11 +483,11 @@ toolbar[brighttext] {
stroke: var(--toolbarbutton-icon-fill-attention);
}
-.toolbarbutton-animatable-box[animate="bookmark"]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="bookmark"]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-image {
animation-name: library-bookmark-animation-rtl;
}
-.toolbarbutton-animatable-box[animate="bookmark"][fade] > .toolbarbutton-animatable-image {
+#library-animatable-box[animate="bookmark"][fade] > .toolbarbutton-animatable-image {
animation-name: library-bookmark-fade;
animation-duration: 2s;
animation-timing-function: ease-out;
@@ -505,6 +497,11 @@ toolbar[brighttext] {
.bookmark-item {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
+ -moz-context-properties: fill;
+ fill: currentColor;
+}
+
+toolbarbutton.bookmark-item {
-moz-context-properties: fill, fill-opacity;
fill: var(--lwt-toolbarbutton-icon-fill, currentColor);
fill-opacity: var(--toolbarbutton-icon-fill-opacity);
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css
index 4e8190aa3736d..3bd91a1802876 100644
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -83,7 +83,7 @@ toolbar[brighttext] {
padding: 0 var(--toolbarbutton-inner-padding) !important;
}
-#navigator-toolbox:not(:hover) > #TabsToolbar .tabbrowser-arrowscrollbox > .scrollbutton-down:not([highlight]) {
+#navigator-toolbox:not(:hover) .tabbrowser-arrowscrollbox > .scrollbutton-down:not([highlight]) {
transition: 1s background-color ease-out;
}
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 54c5933e16926..1410eff489859 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -109,7 +109,6 @@
#include "mozilla/Unused.h"
#include "mozilla/HangDetails.h"
#include "nsAnonymousTemporaryFile.h"
-#include "nsAppDirectoryServiceDefs.h"
#include "nsAppRunner.h"
#include "nsCDefaultURIFixup.h"
#include "nsCExternalHandlerService.h"
@@ -119,7 +118,6 @@
#include "nsConsoleService.h"
#include "nsContentUtils.h"
#include "nsDebugImpl.h"
-#include "nsDirectoryService.h"
#include "nsDirectoryServiceDefs.h"
#include "nsEmbedCID.h"
#include "nsFrameLoader.h"
@@ -575,6 +573,9 @@ UniquePtr ContentParent::sSandboxBrokerPolicyFactory
#endif
uint64_t ContentParent::sNextTabParentId = 0;
nsDataHashtable ContentParent::sNextTabParents;
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+StaticAutoPtr> ContentParent::sMacSandboxParams;
+#endif
// Whether a private docshell has been seen before.
static bool sHasSeenPrivateDocShell = false;
@@ -661,6 +662,10 @@ ContentParent::StartUp()
#if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)
sSandboxBrokerPolicyFactory = MakeUnique();
#endif
+
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+ sMacSandboxParams = new std::vector;
+#endif
}
/*static*/ void
@@ -673,6 +678,10 @@ ContentParent::ShutDown()
#if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)
sSandboxBrokerPolicyFactory = nullptr;
#endif
+
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+ sMacSandboxParams = nullptr;
+#endif
}
/*static*/ uint32_t
@@ -2051,17 +2060,29 @@ ContentParent::GetTestShellSingleton()
}
#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+// Append the sandbox command line parameters that are not static. i.e.,
+// parameters that can be different for different child processes.
void
-ContentParent::AppendSandboxParams(std::vector &aArgs)
+ContentParent::AppendDynamicSandboxParams(std::vector& aArgs)
{
- nsCOMPtr
- directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID));
- if (!directoryService) {
- MOZ_CRASH("Failed to get the directory service");
+ // For file content processes
+ if (GetRemoteType().EqualsLiteral(FILE_REMOTE_TYPE)) {
+ aArgs.push_back("-sbAllowFileAccess");
}
+}
+
+// Generate the static sandbox command line parameters and store
+// them in the provided params vector to be used each time a new
+// content process is launched.
+static void
+CacheSandboxParams(std::vector& aCachedParams)
+{
+ // This must only be called once and we should
+ // be starting with an empty list of parameters.
+ MOZ_ASSERT(aCachedParams.empty());
// Indicates the child should startup the sandbox
- aArgs.push_back("-sbStartup");
+ aCachedParams.push_back("-sbStartup");
// The content sandbox level
int contentSandboxLevel =
@@ -2069,28 +2090,23 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
std::ostringstream os;
os << contentSandboxLevel;
std::string contentSandboxLevelString = os.str();
- aArgs.push_back("-sbLevel");
- aArgs.push_back(contentSandboxLevelString);
+ aCachedParams.push_back("-sbLevel");
+ aCachedParams.push_back(contentSandboxLevelString);
// Sandbox logging
if (Preferences::GetBool("security.sandbox.logging.enabled") ||
PR_GetEnv("MOZ_SANDBOX_LOGGING")) {
- aArgs.push_back("-sbLogging");
- }
-
- // For file content processes
- if (GetRemoteType().EqualsLiteral(FILE_REMOTE_TYPE)) {
- aArgs.push_back("-sbAllowFileAccess");
+ aCachedParams.push_back("-sbLogging");
}
// Audio access
if (!Preferences::GetBool("media.cubeb.sandbox")) {
- aArgs.push_back("-sbAllowAudio");
+ aCachedParams.push_back("-sbAllowAudio");
}
// Windowserver access
if (!Preferences::GetBool("security.sandbox.content.mac.disconnect-windowserver")) {
- aArgs.push_back("-sbAllowWindowServer");
+ aCachedParams.push_back("-sbAllowWindowServer");
}
// .app path (normalized)
@@ -2098,16 +2114,16 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
if (!nsMacUtilsImpl::GetAppPath(appPath)) {
MOZ_CRASH("Failed to get app dir paths");
}
- aArgs.push_back("-sbAppPath");
- aArgs.push_back(appPath.get());
+ aCachedParams.push_back("-sbAppPath");
+ aCachedParams.push_back(appPath.get());
// TESTING_READ_PATH1
nsAutoCString testingReadPath1;
Preferences::GetCString("security.sandbox.content.mac.testing_read_path1",
testingReadPath1);
if (!testingReadPath1.IsEmpty()) {
- aArgs.push_back("-sbTestingReadPath");
- aArgs.push_back(testingReadPath1.get());
+ aCachedParams.push_back("-sbTestingReadPath");
+ aCachedParams.push_back(testingReadPath1.get());
}
// TESTING_READ_PATH2
@@ -2115,8 +2131,8 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
Preferences::GetCString("security.sandbox.content.mac.testing_read_path2",
testingReadPath2);
if (!testingReadPath2.IsEmpty()) {
- aArgs.push_back("-sbTestingReadPath");
- aArgs.push_back(testingReadPath2.get());
+ aCachedParams.push_back("-sbTestingReadPath");
+ aCachedParams.push_back(testingReadPath2.get());
}
// TESTING_READ_PATH3, TESTING_READ_PATH4. In development builds,
@@ -2131,8 +2147,8 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
}
nsCString repoDirPath;
Unused << repoDir->GetNativePath(repoDirPath);
- aArgs.push_back("-sbTestingReadPath");
- aArgs.push_back(repoDirPath.get());
+ aCachedParams.push_back("-sbTestingReadPath");
+ aCachedParams.push_back(repoDirPath.get());
// Object dir
nsCOMPtr objDir;
@@ -2142,8 +2158,8 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
}
nsCString objDirPath;
Unused << objDir->GetNativePath(objDirPath);
- aArgs.push_back("-sbTestingReadPath");
- aArgs.push_back(objDirPath.get());
+ aCachedParams.push_back("-sbTestingReadPath");
+ aCachedParams.push_back(objDirPath.get());
}
// DEBUG_WRITE_DIR
@@ -2157,11 +2173,33 @@ ContentParent::AppendSandboxParams(std::vector &aArgs)
// of that path.
nsAutoCString bloatDirectoryPath =
nsMacUtilsImpl::GetDirectoryPath(bloatLog);
- aArgs.push_back("-sbDebugWriteDir");
- aArgs.push_back(bloatDirectoryPath.get());
+ aCachedParams.push_back("-sbDebugWriteDir");
+ aCachedParams.push_back(bloatDirectoryPath.get());
}
#endif // DEBUG
}
+
+// Append sandboxing command line parameters.
+void
+ContentParent::AppendSandboxParams(std::vector& aArgs)
+{
+ MOZ_ASSERT(sMacSandboxParams != nullptr);
+
+ // An empty sMacSandboxParams indicates this is the
+ // first invocation and we don't have cached params yet.
+ if (sMacSandboxParams->empty()) {
+ CacheSandboxParams(*sMacSandboxParams);
+ MOZ_ASSERT(!sMacSandboxParams->empty());
+ }
+
+ // Append cached arguments.
+ aArgs.insert(aArgs.end(),
+ sMacSandboxParams->begin(),
+ sMacSandboxParams->end());
+
+ // Append remaining arguments.
+ AppendDynamicSandboxParams(aArgs);
+}
#endif // XP_MACOSX && MOZ_CONTENT_SANDBOX
bool
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index cda828491738a..3c391badaf696 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -718,6 +718,11 @@ class ContentParent final : public PContentParent
const TabId& aOpenerTabId,
const TabId& aTabId);
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+ // Cached Mac sandbox params used when launching content processes.
+ static StaticAutoPtr> sMacSandboxParams;
+#endif
+
// Hide the raw constructor methods since we don't want client code
// using them.
virtual PBrowserParent* SendPBrowserConstructor(
@@ -1245,7 +1250,10 @@ class ContentParent final : public PContentParent
// initializing.
void MaybeEnableRemoteInputEventQueue();
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
void AppendSandboxParams(std::vector& aArgs);
+ void AppendDynamicSandboxParams(std::vector& aArgs);
+#endif
public:
void SendGetFilesResponseAndForget(const nsID& aID,
diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp
index 70fa16a0564f1..38f1302fc6f35 100644
--- a/dom/media/platforms/android/RemoteDataDecoder.cpp
+++ b/dom/media/platforms/android/RemoteDataDecoder.cpp
@@ -279,6 +279,11 @@ class RemoteVideoDecoder : public RemoteDataDecoder
return mIsHardwareAccelerated;
}
+ ConversionRequired NeedsConversion() const override
+ {
+ return ConversionRequired::kNeedAnnexB;
+ }
+
private:
const VideoInfo mConfig;
GeckoSurface::GlobalRef mSurface;
@@ -339,11 +344,6 @@ class RemoteAudioDecoder : public RemoteDataDecoder
return InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__);
}
- ConversionRequired NeedsConversion() const override
- {
- return ConversionRequired::kNeedAnnexB;
- }
-
private:
class CallbacksSupport final : public JavaCallbacksSupport
{
diff --git a/gfx/layers/LayerMetricsWrapper.h b/gfx/layers/LayerMetricsWrapper.h
index e32c354f79aa6..b3aab5c178ff5 100644
--- a/gfx/layers/LayerMetricsWrapper.h
+++ b/gfx/layers/LayerMetricsWrapper.h
@@ -433,6 +433,15 @@ class MOZ_STACK_CLASS LayerMetricsWrapper {
return mLayer->GetFixedPositionScrollContainerId();
}
+ Maybe GetZoomAnimationId() const
+ {
+ MOZ_ASSERT(IsValid());
+ // This function is only really needed for template-compatibility with
+ // WebRenderScrollDataWrapper. Although it will be called, the return
+ // value is not used.
+ return Nothing();
+ }
+
bool IsBackfaceHidden() const
{
MOZ_ASSERT(IsValid());
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index ca26b1e0f283c..a95a4c5a8d7d9 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -134,6 +134,16 @@ struct APZCTreeManager::TreeBuildingState {
// children, meaning they are added to the children's ancestor transforms
// instead. Those deferred transforms are tracked here.
DeferredTransformMap mPerspectiveTransformsDeferredToChildren;
+
+ // As we recurse down through the tree, this picks up the zoom animation id
+ // from a node in the layer tree, and propagates it downwards to the nearest
+ // APZC instance that is for an RCD node. Generally it will be set on the
+ // root node of the layers (sub-)tree, which may not be same as the RCD node
+ // for the subtree, and so we need this mechanism to ensure it gets propagated
+ // to the RCD's APZC instance. Once it is set on the APZC instance, the value
+ // is cleared back to Nothing(). Note that this is only used in the WebRender
+ // codepath.
+ Maybe mZoomAnimationId;
};
class APZCTreeManager::CheckerboardFlushObserver : public nsIObserver {
@@ -604,6 +614,8 @@ APZCTreeManager::SampleForWebRender(wr::TransactionWrapper& aTxn,
AssertOnSamplerThread();
MutexAutoLock lock(mMapLock);
+ nsTArray transforms;
+
// Sample async transforms on scrollable layers.
for (const auto& mapping : mApzcMap) {
AsyncPanZoomController* apzc = mapping.second;
@@ -615,9 +627,13 @@ APZCTreeManager::SampleForWebRender(wr::TransactionWrapper& aTxn,
ParentLayerPoint layerTranslation = apzc->GetCurrentAsyncTransform(
AsyncPanZoomController::eForCompositing).mTranslation;
LayoutDeviceToParentLayerScale zoom;
- if (apzc->Metrics().IsRootContent()) {
+ if (Maybe zoomAnimationId = apzc->GetZoomAnimationId()) {
+ // for now we only support zooming on root content APZCs
+ MOZ_ASSERT(apzc->Metrics().IsRootContent());
zoom = apzc->GetCurrentPinchZoomScale(AsyncPanZoomController::eForCompositing);
- aTxn.UpdatePinchZoom(zoom.scale);
+ transforms.AppendElement(wr::ToWrTransformProperty(
+ *zoomAnimationId,
+ Matrix4x4::Scaling(zoom.scale, zoom.scale, 1.0f)));
}
// The positive translation means the painted content is supposed to
@@ -634,7 +650,6 @@ APZCTreeManager::SampleForWebRender(wr::TransactionWrapper& aTxn,
}
// Now collect all the async transforms needed for the scrollthumbs.
- nsTArray scrollbarTransforms;
for (const ScrollThumbInfo& info : mScrollThumbInfo) {
auto it = mApzcMap.find(info.mTargetGuid);
if (it == mApzcMap.end()) {
@@ -657,11 +672,11 @@ APZCTreeManager::SampleForWebRender(wr::TransactionWrapper& aTxn,
info.mTargetIsAncestor,
nullptr);
});
- scrollbarTransforms.AppendElement(wr::ToWrTransformProperty(
+ transforms.AppendElement(wr::ToWrTransformProperty(
info.mThumbAnimationId,
transform));
}
- aTxn.AppendTransformProperties(scrollbarTransforms);
+ aTxn.AppendTransformProperties(transforms);
// Advance animations. It's important that this happens after
// sampling all async transforms, because AdvanceAnimations() updates
@@ -885,6 +900,10 @@ APZCTreeManager::PrepareNodeForLayer(const RecursiveMutexAutoLock& aProofOfTreeL
bool parentHasPerspective = aState.mParentHasPerspective.top();
+ if (Maybe zoomAnimationId = aLayer.GetZoomAnimationId()) {
+ aState.mZoomAnimationId = zoomAnimationId;
+ }
+
RefPtr node = nullptr;
if (!needsApzc) {
// Note: if layer properties must be propagated to nodes, RecvUpdate in
@@ -995,6 +1014,11 @@ APZCTreeManager::PrepareNodeForLayer(const RecursiveMutexAutoLock& aProofOfTreeL
node->SetLastChild(nullptr);
}
+ if (aMetrics.IsRootContent()) {
+ apzc->SetZoomAnimationId(aState.mZoomAnimationId);
+ aState.mZoomAnimationId = Nothing();
+ }
+
APZCTM_LOG("Using APZC %p for layer %p with identifiers %" PRIx64 " %" PRId64 "\n",
apzc, aLayer.GetLayer(), uint64_t(aLayersId), aMetrics.GetScrollId());
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 4eeaac900d218..8d28ebb377c1a 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -5038,5 +5038,15 @@ bool AsyncPanZoomController::MaybeAdjustDestinationForScrollSnapping(
return false;
}
+void AsyncPanZoomController::SetZoomAnimationId(const Maybe& aZoomAnimationId)
+{
+ mZoomAnimationId = aZoomAnimationId;
+}
+
+Maybe AsyncPanZoomController::GetZoomAnimationId() const
+{
+ return mZoomAnimationId;
+}
+
} // namespace layers
} // namespace mozilla
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 9a492733ad64c..b40656c9effc4 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -982,6 +982,15 @@ class AsyncPanZoomController {
UniquePtr mOverscrollEffect;
+ // Zoom animation id, used for zooming in WebRender. This should only be
+ // set on the APZC instance for the root content document (i.e. the one we
+ // support zooming on), and is only used if WebRender is enabled. The
+ // animation id itself refers to the transform animation id that was set on
+ // the stacking context in the WR display list. By changing the transform
+ // associated with this id, we can adjust the scaling that WebRender applies,
+ // thereby controlling the zoom.
+ Maybe mZoomAnimationId;
+
friend class Axis;
public:
@@ -999,6 +1008,9 @@ class AsyncPanZoomController {
return callable(mLastContentPaintMetrics);
}
+ void SetZoomAnimationId(const Maybe& aZoomAnimationId);
+ Maybe GetZoomAnimationId() const;
+
/* ===================================================================
* The functions and members in this section are used to expose
* the current async transform state to callers.
diff --git a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
index 155ac9551a52c..8067a4f727021 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@@ -41,13 +41,30 @@ function nativeHorizontalWheelEventMsg() {
throw "Native wheel events not supported on platform " + getPlatform();
}
+// Given an event target which may be a window or an element, get the associated window.
+function windowForTarget(aTarget) {
+ if (aTarget instanceof Window) {
+ return aTarget;
+ }
+ return aTarget.ownerDocument.defaultView;
+}
+
+// Given an event target which may be a window or an element, get the associated element.
+function elementForTarget(aTarget) {
+ if (aTarget instanceof Window) {
+ return aTarget.document.documentElement;
+ }
+ return aTarget;
+}
+
// Given a pixel scrolling delta, converts it to the platform's native units.
-function nativeScrollUnits(aElement, aDimen) {
+function nativeScrollUnits(aTarget, aDimen) {
switch (getPlatform()) {
case "linux": {
// GTK deltas are treated as line height divided by 3 by gecko.
- var targetWindow = aElement.ownerDocument.defaultView;
- var lineHeight = targetWindow.getComputedStyle(aElement)["font-size"];
+ var targetWindow = windowForTarget(aTarget);
+ var targetElement = elementForTarget(aTarget);
+ var lineHeight = targetWindow.getComputedStyle(targetElement)["font-size"];
return aDimen / (parseInt(lineHeight) * 3);
}
}
@@ -84,14 +101,6 @@ function nativeMouseUpEventMsg() {
throw "Native mouse-up events not supported on platform " + getPlatform();
}
-// Given an event target which may be a window or an element, get the associated window.
-function windowForTarget(aTarget) {
- if (aTarget instanceof Window) {
- return aTarget;
- }
- return aTarget.ownerDocument.defaultView;
-}
-
function getBoundingClientRectRelativeToVisualViewport(aElement) {
let utils = SpecialPowers.getDOMWindowUtils(window);
var rect = aElement.getBoundingClientRect();
@@ -143,19 +152,20 @@ function rectRelativeToScreen(aElement) {
// Synthesizes a native mousewheel event and returns immediately. This does not
// guarantee anything; you probably want to use one of the other functions below
// which actually wait for results.
-// aX and aY are relative to the top-left of |aElement|'s containing window.
+// aX and aY are relative to the top-left of |aTarget|'s bounding rect.
// aDeltaX and aDeltaY are pixel deltas, and aObserver can be left undefined
// if not needed.
-function synthesizeNativeWheel(aElement, aX, aY, aDeltaX, aDeltaY, aObserver) {
- var pt = coordinatesRelativeToScreen(aX, aY, aElement);
+function synthesizeNativeWheel(aTarget, aX, aY, aDeltaX, aDeltaY, aObserver) {
+ var pt = coordinatesRelativeToScreen(aX, aY, aTarget);
if (aDeltaX && aDeltaY) {
throw "Simultaneous wheeling of horizontal and vertical is not supported on all platforms.";
}
- aDeltaX = nativeScrollUnits(aElement, aDeltaX);
- aDeltaY = nativeScrollUnits(aElement, aDeltaY);
+ aDeltaX = nativeScrollUnits(aTarget, aDeltaX);
+ aDeltaY = nativeScrollUnits(aTarget, aDeltaY);
var msg = aDeltaX ? nativeHorizontalWheelEventMsg() : nativeVerticalWheelEventMsg();
- var utils = SpecialPowers.getDOMWindowUtils(aElement.ownerDocument.defaultView);
- utils.sendNativeMouseScrollEvent(pt.x, pt.y, msg, aDeltaX, aDeltaY, 0, 0, 0, aElement, aObserver);
+ var utils = SpecialPowers.getDOMWindowUtils(windowForTarget(aTarget));
+ var element = elementForTarget(aTarget);
+ utils.sendNativeMouseScrollEvent(pt.x, pt.y, msg, aDeltaX, aDeltaY, 0, 0, 0, element, aObserver);
return true;
}
@@ -175,50 +185,52 @@ function synthesizeNativeWheelAndWaitForObserver(aElement, aX, aY, aDeltaX, aDel
}
// Synthesizes a native mousewheel event and invokes the callback once the
-// wheel event is dispatched to |aElement|'s containing window. If the event
-// targets content in a subdocument, |aElement| should be inside the
-// subdocument. See synthesizeNativeWheel for details on the other parameters.
-function synthesizeNativeWheelAndWaitForWheelEvent(aElement, aX, aY, aDeltaX, aDeltaY, aCallback) {
- var targetWindow = aElement.ownerDocument.defaultView;
+// wheel event is dispatched to |aTarget|'s containing window. If the event
+// targets content in a subdocument, |aTarget| should be inside the
+// subdocument (or the subdocument's window). See synthesizeNativeWheel for
+// details on the other parameters.
+function synthesizeNativeWheelAndWaitForWheelEvent(aTarget, aX, aY, aDeltaX, aDeltaY, aCallback) {
+ var targetWindow = windowForTarget(aTarget);
targetWindow.addEventListener("wheel", function(e) {
setTimeout(aCallback, 0);
}, {once: true});
- return synthesizeNativeWheel(aElement, aX, aY, aDeltaX, aDeltaY);
+ return synthesizeNativeWheel(aTarget, aX, aY, aDeltaX, aDeltaY);
}
// Synthesizes a native mousewheel event and invokes the callback once the
-// first resulting scroll event is dispatched to |aElement|'s containing window.
-// If the event targets content in a subdocument, |aElement| should be inside
-// the subdocument. See synthesizeNativeWheel for details on the other
-// parameters.
-function synthesizeNativeWheelAndWaitForScrollEvent(aElement, aX, aY, aDeltaX, aDeltaY, aCallback) {
- var targetWindow = aElement.ownerDocument.defaultView;
+// first resulting scroll event is dispatched to |aTarget|'s containing window.
+// If the event targets content in a subdocument, |aTarget| should be inside
+// the subdocument (or the subdocument's window). See synthesizeNativeWheel
+// for details on the other parameters.
+function synthesizeNativeWheelAndWaitForScrollEvent(aTarget, aX, aY, aDeltaX, aDeltaY, aCallback) {
+ var targetWindow = windowForTarget(aTarget);
targetWindow.addEventListener("scroll", function() {
setTimeout(aCallback, 0);
}, {capture: true, once: true}); // scroll events don't always bubble
- return synthesizeNativeWheel(aElement, aX, aY, aDeltaX, aDeltaY);
+ return synthesizeNativeWheel(aTarget, aX, aY, aDeltaX, aDeltaY);
}
// Synthesizes a native mouse move event and returns immediately.
-// aX and aY are relative to the top-left of |aElement|'s containing window.
-function synthesizeNativeMouseMove(aElement, aX, aY) {
- var pt = coordinatesRelativeToScreen(aX, aY, aElement);
- var utils = SpecialPowers.getDOMWindowUtils(aElement.ownerDocument.defaultView);
- utils.sendNativeMouseEvent(pt.x, pt.y, nativeMouseMoveEventMsg(), 0, aElement);
+// aX and aY are relative to the top-left of |aTarget|'s bounding rect.
+function synthesizeNativeMouseMove(aTarget, aX, aY) {
+ var pt = coordinatesRelativeToScreen(aX, aY, aTarget);
+ var utils = SpecialPowers.getDOMWindowUtils(windowForTarget(aTarget));
+ var element = elementForTarget(aTarget);
+ utils.sendNativeMouseEvent(pt.x, pt.y, nativeMouseMoveEventMsg(), 0, element);
return true;
}
// Synthesizes a native mouse move event and invokes the callback once the
-// mouse move event is dispatched to |aElement|'s containing window. If the event
-// targets content in a subdocument, |aElement| should be inside the
-// subdocument. See synthesizeNativeMouseMove for details on the other
-// parameters.
-function synthesizeNativeMouseMoveAndWaitForMoveEvent(aElement, aX, aY, aCallback) {
- var targetWindow = aElement.ownerDocument.defaultView;
+// mouse move event is dispatched to |aTarget|'s containing window. If the event
+// targets content in a subdocument, |aTarget| should be inside the
+// subdocument (or the subdocument window). See synthesizeNativeMouseMove for
+// details on the other parameters.
+function synthesizeNativeMouseMoveAndWaitForMoveEvent(aTarget, aX, aY, aCallback) {
+ var targetWindow = windowForTarget(aTarget);
targetWindow.addEventListener("mousemove", function(e) {
setTimeout(aCallback, 0);
}, {once: true});
- return synthesizeNativeMouseMove(aElement, aX, aY);
+ return synthesizeNativeMouseMove(aTarget, aX, aY);
}
// Synthesizes a native touch event and dispatches it. aX and aY in CSS pixels
@@ -361,7 +373,7 @@ function synthesizeNativeClick(aElement, aX, aY, aObserver = null) {
return true;
}
-// Move the mouse to (dx, dy) relative to |element|, and scroll the wheel
+// Move the mouse to (dx, dy) relative to |target|, and scroll the wheel
// at that location.
// Moving the mouse is necessary to avoid wheel events from two consecutive
// moveMouseAndScrollWheelOver() calls on different elements being incorrectly
@@ -369,12 +381,12 @@ function synthesizeNativeClick(aElement, aX, aY, aObserver = null) {
// We also wait for the mouse move event to be processed before sending the
// wheel event, otherwise there is a chance they might get reordered, and
// we have the transaction problem again.
-function moveMouseAndScrollWheelOver(element, dx, dy, testDriver, waitForScroll = true) {
- return synthesizeNativeMouseMoveAndWaitForMoveEvent(element, dx, dy, function() {
+function moveMouseAndScrollWheelOver(target, dx, dy, testDriver, waitForScroll = true) {
+ return synthesizeNativeMouseMoveAndWaitForMoveEvent(target, dx, dy, function() {
if (waitForScroll) {
- synthesizeNativeWheelAndWaitForScrollEvent(element, dx, dy, 0, -10, testDriver);
+ synthesizeNativeWheelAndWaitForScrollEvent(target, dx, dy, 0, -10, testDriver);
} else {
- synthesizeNativeWheelAndWaitForWheelEvent(element, dx, dy, 0, -10, testDriver);
+ synthesizeNativeWheelAndWaitForWheelEvent(target, dx, dy, 0, -10, testDriver);
}
});
}
diff --git a/gfx/layers/apz/test/mochitest/helper_overscroll_behavior_bug1494440.html b/gfx/layers/apz/test/mochitest/helper_overscroll_behavior_bug1494440.html
new file mode 100644
index 0000000000000..845fa0ee57ec6
--- /dev/null
+++ b/gfx/layers/apz/test/mochitest/helper_overscroll_behavior_bug1494440.html
@@ -0,0 +1,52 @@
+
+
+ Inactive iframe with overscroll-behavior
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gfx/layers/apz/test/mochitest/test_group_wheelevents.html b/gfx/layers/apz/test/mochitest/test_group_wheelevents.html
index c7c3e1fe43f1e..3a64a900051ab 100644
--- a/gfx/layers/apz/test/mochitest/test_group_wheelevents.html
+++ b/gfx/layers/apz/test/mochitest/test_group_wheelevents.html
@@ -36,6 +36,7 @@
{'file': 'helper_bug1271432.html', 'prefs': prefs},
{'file': 'helper_overscroll_behavior_bug1425573.html', 'prefs': timeout_prefs},
{'file': 'helper_overscroll_behavior_bug1425603.html', 'prefs': prefs},
+ {'file': 'helper_overscroll_behavior_bug1494440.html', 'prefs': prefs},
{'file': 'helper_scroll_inactive_perspective.html', 'prefs': prefs},
{'file': 'helper_scroll_inactive_zindex.html', 'prefs': prefs},
{'file': 'helper_scroll_over_scrollbar.html', 'prefs': scrollbar_prefs},
diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp
index cdfd4d57d1b47..1da63f7c9481f 100644
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -1321,7 +1321,14 @@ WebRenderCommandBuilder::BuildWebRenderCommands(wr::DisplayListBuilder& aBuilder
mClipManager.BeginBuild(mManager, aBuilder);
{
- StackingContextHelper pageRootSc(sc, nullptr, aBuilder, aFilters);
+ if (!mZoomProp && gfxPrefs::APZAllowZooming() && XRE_IsContentProcess()) {
+ mZoomProp.emplace();
+ mZoomProp->effect_type = wr::WrAnimationType::Transform;
+ mZoomProp->id = AnimationHelper::GetNextCompositorAnimationsId();
+ }
+
+ StackingContextHelper pageRootSc(sc, nullptr, aBuilder, aFilters,
+ LayoutDeviceRect(), nullptr, mZoomProp.ptrOr(nullptr));
if (ShouldDumpDisplayList(aDisplayListBuilder)) {
mBuilderDumpIndex = aBuilder.Dump(mDumpIndent + 1, Some(mBuilderDumpIndex), Nothing());
}
@@ -1332,6 +1339,9 @@ WebRenderCommandBuilder::BuildWebRenderCommands(wr::DisplayListBuilder& aBuilder
// Make a "root" layer data that has everything else as descendants
mLayerScrollData.emplace_back();
mLayerScrollData.back().InitializeRoot(mLayerScrollData.size() - 1);
+ if (mZoomProp) {
+ mLayerScrollData.back().SetZoomAnimationId(mZoomProp->id);
+ }
auto callback = [&aScrollData](ScrollableLayerGuid::ViewID aScrollId) -> bool {
return aScrollData.HasMetadataFor(aScrollId).isSome();
};
diff --git a/gfx/layers/wr/WebRenderCommandBuilder.h b/gfx/layers/wr/WebRenderCommandBuilder.h
index 91932d69b5dca..aebdc3bbddc8f 100644
--- a/gfx/layers/wr/WebRenderCommandBuilder.h
+++ b/gfx/layers/wr/WebRenderCommandBuilder.h
@@ -193,6 +193,11 @@ class WebRenderCommandBuilder {
wr::usize mBuilderDumpIndex;
wr::usize mDumpIndent;
+
+ // When zooming is enabled, this stores the animation property that we use
+ // to manipulate the zoom from APZ.
+ Maybe mZoomProp;
+
public:
// Whether consecutive inactive display items should be grouped into one
// blob image.
diff --git a/gfx/layers/wr/WebRenderScrollData.h b/gfx/layers/wr/WebRenderScrollData.h
index 0ada8cc83cde9..43098ce8a55ef 100644
--- a/gfx/layers/wr/WebRenderScrollData.h
+++ b/gfx/layers/wr/WebRenderScrollData.h
@@ -87,6 +87,9 @@ class WebRenderLayerScrollData
void SetFixedPositionScrollContainerId(ScrollableLayerGuid::ViewID aId) { mFixedPosScrollContainerId = aId; }
ScrollableLayerGuid::ViewID GetFixedPositionScrollContainerId() const { return mFixedPosScrollContainerId; }
+ void SetZoomAnimationId(const uint64_t& aId) { mZoomAnimationId = Some(aId); }
+ Maybe GetZoomAnimationId() const { return mZoomAnimationId; }
+
void Dump(const WebRenderScrollData& aOwner) const;
friend struct IPC::ParamTraits;
@@ -117,6 +120,7 @@ class WebRenderLayerScrollData
ScrollbarData mScrollbarData;
uint64_t mScrollbarAnimationId;
ScrollableLayerGuid::ViewID mFixedPosScrollContainerId;
+ Maybe mZoomAnimationId;
};
// Data needed by APZ, for the whole layer tree. One instance of this class
@@ -237,6 +241,7 @@ struct ParamTraits
WriteParam(aMsg, aParam.mScrollbarData);
WriteParam(aMsg, aParam.mScrollbarAnimationId);
WriteParam(aMsg, aParam.mFixedPosScrollContainerId);
+ WriteParam(aMsg, aParam.mZoomAnimationId);
}
static bool
@@ -253,7 +258,8 @@ struct ParamTraits
&& ReadParam(aMsg, aIter, &aResult->mEventRegionsOverride)
&& ReadParam(aMsg, aIter, &aResult->mScrollbarData)
&& ReadParam(aMsg, aIter, &aResult->mScrollbarAnimationId)
- && ReadParam(aMsg, aIter, &aResult->mFixedPosScrollContainerId);
+ && ReadParam(aMsg, aIter, &aResult->mFixedPosScrollContainerId)
+ && ReadParam(aMsg, aIter, &aResult->mZoomAnimationId);
}
};
diff --git a/gfx/layers/wr/WebRenderScrollDataWrapper.h b/gfx/layers/wr/WebRenderScrollDataWrapper.h
index 8c1ddef645386..14c2b9c15194e 100644
--- a/gfx/layers/wr/WebRenderScrollDataWrapper.h
+++ b/gfx/layers/wr/WebRenderScrollDataWrapper.h
@@ -316,6 +316,12 @@ class MOZ_STACK_CLASS WebRenderScrollDataWrapper {
return mLayer->GetFixedPositionScrollContainerId();
}
+ Maybe GetZoomAnimationId() const
+ {
+ MOZ_ASSERT(IsValid());
+ return mLayer->GetZoomAnimationId();
+ }
+
bool IsBackfaceHidden() const
{
// This is only used by APZCTM hit testing, and WR does its own
diff --git a/gfx/webrender/Cargo.toml b/gfx/webrender/Cargo.toml
index 6d900860e4304..68a5481366be4 100644
--- a/gfx/webrender/Cargo.toml
+++ b/gfx/webrender/Cargo.toml
@@ -73,7 +73,7 @@ mozangle = "0.1"
freetype = { version = "0.4", default-features = false }
[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.6"
+dwrote = "0.6.1"
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.6"
diff --git a/gfx/webrender_api/Cargo.toml b/gfx/webrender_api/Cargo.toml
index fc9991e59193d..d069042170253 100644
--- a/gfx/webrender_api/Cargo.toml
+++ b/gfx/webrender_api/Cargo.toml
@@ -29,4 +29,4 @@ core-foundation = "0.6"
core-graphics = "0.17.1"
[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.6"
+dwrote = "0.6.1"
diff --git a/gfx/webrender_bindings/Cargo.toml b/gfx/webrender_bindings/Cargo.toml
index a5d7d4a77c98f..0228969af3045 100644
--- a/gfx/webrender_bindings/Cargo.toml
+++ b/gfx/webrender_bindings/Cargo.toml
@@ -23,7 +23,7 @@ default-features = false
features = ["capture", "serialize_program"]
[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.6"
+dwrote = "0.6.1"
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.6"
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
index 7a60d7aae851a..6ead74df9115b 100644
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-874d782a891db37707364be2071d91117c6e255a
+56ffe6edc4c453a370784314194f9516af0a8950
diff --git a/gfx/wrench/Cargo.toml b/gfx/wrench/Cargo.toml
index 33440743f543e..d0ff0226e4dd7 100644
--- a/gfx/wrench/Cargo.toml
+++ b/gfx/wrench/Cargo.toml
@@ -39,7 +39,7 @@ headless = [ "osmesa-sys", "osmesa-src" ]
pathfinder = [ "webrender/pathfinder" ]
[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.6"
+dwrote = "0.6.1"
mozangle = {version = "0.1.5", features = ["egl"]}
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
diff --git a/js/public/Stream.h b/js/public/Stream.h
index 36edb69b4a268..fc6e926eb7d7e 100644
--- a/js/public/Stream.h
+++ b/js/public/Stream.h
@@ -76,6 +76,15 @@
namespace JS {
+/**
+ * ## Readable stream callbacks
+ *
+ * Compartment safety: All callbacks (except Finalize) receive `cx` and
+ * `stream` arguments. SpiderMonkey enters the realm of the stream object
+ * before invoking these callbacks, so `stream` is never a wrapper. Other
+ * arguments may be wrappers.
+ */
+
/**
* Invoked whenever a reader desires more data from a ReadableStream's
* embedding-provided underlying source.
diff --git a/js/src/builtin/Stream.cpp b/js/src/builtin/Stream.cpp
index 2e18e9a33c604..c1601d7e47b52 100644
--- a/js/src/builtin/Stream.cpp
+++ b/js/src/builtin/Stream.cpp
@@ -174,9 +174,12 @@ PromiseInvokeOrNoop(JSContext* cx, HandleValue O, HandlePropertyName P, HandleVa
static MOZ_MUST_USE JSObject*
PromiseRejectedWithPendingError(JSContext* cx) {
- // Not much we can do about uncatchable exceptions, just bail.
RootedValue exn(cx);
- if (!GetAndClearException(cx, &exn)) {
+ if (!cx->isExceptionPending() || !GetAndClearException(cx, &exn)) {
+ // Uncatchable error. This happens when a slow script is killed or a
+ // worker is terminated. Propagate the uncatchable error. This will
+ // typically kill off the calling asynchronous process: the caller
+ // can't hook its continuation to the new rejected promise.
return nullptr;
}
return PromiseObject::unforgeableReject(cx, exn);
@@ -1640,13 +1643,6 @@ ReadableStreamGetNumReadRequests(ReadableStream* stream)
return reader->requests()->getDenseInitializedLength();
}
-enum class ReaderMode
-{
- None,
- Default,
-};
-
-#if DEBUG
// Streams spec 3.4.12. ReadableStreamHasDefaultReader ( stream )
static MOZ_MUST_USE bool
ReadableStreamHasDefaultReader(JSContext* cx, Handle stream, bool* result)
@@ -1668,25 +1664,6 @@ ReadableStreamHasDefaultReader(JSContext* cx, Handle stream, bo
*result = reader->is();
return true;
}
-#endif // DEBUG
-
-static MOZ_MUST_USE bool
-ReadableStreamGetReaderMode(JSContext* cx, Handle stream, ReaderMode* mode)
-{
- if (!stream->hasReader()) {
- *mode = ReaderMode::None;
- return true;
- }
-
- Rooted reader(cx);
- if (!UnwrapReaderFromStream(cx, stream, &reader)) {
- return false;
- }
-
- *mode = ReaderMode::Default;
-
- return true;
-}
/*** 3.5. Class ReadableStreamDefaultReader ******************************************************/
@@ -2048,8 +2025,9 @@ ReadableStreamReaderGenericRelease(JSContext* cx, Handle
// clean way to do this, unfortunately.
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_READABLESTREAMREADER_RELEASED);
RootedValue exn(cx);
- // Not much we can do about uncatchable exceptions, just bail.
- if (!GetAndClearException(cx, &exn)) {
+ if (!cx->isExceptionPending() || !GetAndClearException(cx, &exn)) {
+ // Uncatchable error. Die immediately without resolving
+ // reader.[[closedPromise]].
return false;
}
@@ -2621,16 +2599,13 @@ ReadableStreamControllerCancelSteps(JSContext* cx,
if (unwrappedController->hasExternalSource()) {
RootedValue rval(cx);
{
- RootedValue wrappedReason(cx, reason);
AutoRealm ar(cx, unwrappedController);
+ Rooted stream(cx, unwrappedController->stream());
+ void* source = unwrappedUnderlyingSource.toPrivate();
+ RootedValue wrappedReason(cx, reason);
if (!cx->compartment()->wrap(cx, &wrappedReason)) {
return nullptr;
}
- void* source = unwrappedUnderlyingSource.toPrivate();
-
- // Thanks to `ar`, `unwrappedController` is now same-compartment with `cx`.
- // That's why this variable `stream` does not get the `unwrapped` prefix.
- Rooted stream(cx, unwrappedController->stream());
cx->check(stream, wrappedReason);
rval = cx->runtime()->readableStreamCancelCallback(cx, stream, source,
@@ -2850,11 +2825,17 @@ ReadableStreamControllerCallPullIfNeeded(JSContext* cx,
Rooted stream(cx, controller->stream());
pullPromise = ReadableStreamTee_Pull(cx, teeState);
} else if (controller->hasExternalSource()) {
- void* source = underlyingSource.toPrivate();
- Rooted stream(cx, controller->stream());
- double desiredSize = ReadableStreamControllerGetDesiredSizeUnchecked(controller);
- cx->runtime()->readableStreamDataRequestCallback(cx, stream, source,
- stream->embeddingFlags(), desiredSize);
+ {
+ AutoRealm ar(cx, controller);
+ Rooted stream(cx, controller->stream());
+ void* source = underlyingSource.toPrivate();
+ double desiredSize = ReadableStreamControllerGetDesiredSizeUnchecked(controller);
+ cx->runtime()->readableStreamDataRequestCallback(cx,
+ stream,
+ source,
+ stream->embeddingFlags(),
+ desiredSize);
+ }
pullPromise = PromiseObject::unforgeableResolve(cx, UndefinedHandleValue);
} else {
pullPromise = PromiseInvokeOrNoop(cx, underlyingSource, cx->names().pull, controllerVal);
@@ -3016,7 +2997,9 @@ ReadableStreamDefaultControllerEnqueue(JSContext* cx,
// and
// Step d: If enqueueResult is an abrupt completion,
RootedValue exn(cx);
- if (!cx->getPendingException(&exn)) {
+ if (!cx->isExceptionPending() || !GetAndClearException(cx, &exn)) {
+ // Uncatchable error. Die immediately without erroring the
+ // stream.
return false;
}
@@ -3028,6 +3011,7 @@ ReadableStreamDefaultControllerEnqueue(JSContext* cx,
}
// Step b.ii.2: Return chunkSize.
+ cx->setPendingException(exn);
return false;
}
}
@@ -3052,6 +3036,7 @@ static MOZ_MUST_USE bool
ReadableStreamControllerError(JSContext* cx, Handle controller,
HandleValue e)
{
+ MOZ_ASSERT(!cx->isExceptionPending());
AssertSameCompartment(cx, e);
// Step 1: Let stream be controller.[[controlledReadableStream]].
@@ -3090,6 +3075,8 @@ ReadableStreamDefaultControllerErrorIfNeeded(JSContext* cx,
Handle controller,
HandleValue e)
{
+ MOZ_ASSERT(!cx->isExceptionPending());
+
// Step 1: If controller.[[controlledReadableStream]].[[state]] is "readable",
// perform ! ReadableStreamDefaultControllerError(controller, e).
Rooted stream(cx, controller->stream());
@@ -3386,9 +3373,6 @@ static const ClassOps ReadableByteStreamControllerClassOps = {
CLASS_SPEC(ReadableByteStreamController, 3, SlotCount, ClassSpec::DontDefineConstructor,
JSCLASS_BACKGROUND_FINALIZE, &ReadableByteStreamControllerClassOps);
-
-/*** */
-
// Streams spec, 3.10.5.1. [[CancelSteps]] ()
// Unified with 3.8.5.1 above.
@@ -3438,14 +3422,15 @@ ReadableByteStreamControllerPullSteps(JSContext* cx,
size_t bytesWritten;
{
+ AutoRealm ar(cx, stream);
JS::AutoSuppressGCAnalysis suppressGC(cx);
JS::AutoCheckCannotGC noGC;
bool dummy;
void* buffer = JS_GetArrayBufferViewData(view, &dummy, noGC);
+
auto cb = cx->runtime()->readableStreamWriteIntoReadRequestCallback;
MOZ_ASSERT(cb);
// TODO: use bytesWritten to correctly update the request's state.
- // TODO: make this compartment-safe.
cb(cx, stream, underlyingSource, stream->embeddingFlags(), buffer,
queueTotalSize, &bytesWritten);
}
@@ -3664,8 +3649,9 @@ ReadableByteStreamControllerClose(JSContext* cx, HandlegetPendingException(&e)) {
+ if (!cx->isExceptionPending() || !GetAndClearException(cx, &e)) {
+ // Uncatchable error. Die immediately without erroring the
+ // stream.
return false;
}
@@ -3675,6 +3661,7 @@ ReadableByteStreamControllerClose(JSContext* cx, HandlesetPendingException(e);
return false;
}
}
@@ -4172,8 +4159,9 @@ JS::NewReadableDefaultStreamObject(JSContext* cx,
RootedObject source(cx, underlyingSource);
if (!source) {
source = NewBuiltinClassInstance(cx);
- if (!source)
+ if (!source) {
return nullptr;
+ }
}
RootedValue sourceVal(cx, ObjectValue(*source));
RootedValue sizeVal(cx, size ? ObjectValue(*size) : UndefinedValue());
@@ -4234,8 +4222,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamIsReadable(JSContext* cx, HandleObject streamObj, bool* result)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
*result = stream->readable();
return true;
@@ -4245,8 +4234,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamIsLocked(JSContext* cx, HandleObject streamObj, bool* result)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
*result = stream->locked();
return true;
@@ -4256,8 +4246,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamIsDisturbed(JSContext* cx, HandleObject streamObj, bool* result)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
*result = stream->disturbed();
return true;
@@ -4267,8 +4258,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamGetEmbeddingFlags(JSContext* cx, HandleObject streamObj, uint8_t* flags)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
*flags = stream->embeddingFlags();
return true;
@@ -4282,8 +4274,9 @@ JS::ReadableStreamCancel(JSContext* cx, HandleObject streamObj, HandleValue reas
cx->check(reason);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return nullptr;
+ }
return ::ReadableStreamCancel(cx, stream, reason);
}
@@ -4292,8 +4285,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamGetMode(JSContext* cx, HandleObject streamObj, JS::ReadableStreamMode* mode)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
*mode = stream->mode();
return true;
@@ -4306,8 +4300,9 @@ JS::ReadableStreamGetReader(JSContext* cx, HandleObject streamObj, ReadableStrea
CHECK_THREAD(cx);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return nullptr;
+ }
JSObject* result = CreateReadableStreamDefaultReader(cx, stream);
MOZ_ASSERT_IF(result, IsObjectInContextCompartment(result, cx));
@@ -4321,8 +4316,9 @@ JS::ReadableStreamGetExternalUnderlyingSource(JSContext* cx, HandleObject stream
CHECK_THREAD(cx);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
MOZ_ASSERT(stream->mode() == JS::ReadableStreamMode::ExternalSource);
if (stream->locked()) {
@@ -4346,8 +4342,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamReleaseExternalUnderlyingSource(JSContext* cx, HandleObject streamObj)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
MOZ_ASSERT(stream->mode() == JS::ReadableStreamMode::ExternalSource);
MOZ_ASSERT(stream->locked());
@@ -4364,8 +4361,9 @@ JS::ReadableStreamUpdateDataAvailableFromSource(JSContext* cx, JS::HandleObject
CHECK_THREAD(cx);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
// This is based on Streams spec 3.10.4.4. enqueue(chunk) steps 1-3 and
// 3.12.9. ReadableByteStreamControllerEnqueue(controller, chunk) steps
@@ -4412,12 +4410,11 @@ JS::ReadableStreamUpdateDataAvailableFromSource(JSContext* cx, JS::HandleObject
}
// Step 8: If ! ReadableStreamHasDefaultReader(stream) is true
- ReaderMode readerMode;
- if (!ReadableStreamGetReaderMode(cx, stream, &readerMode)) {
+ bool hasDefaultReader;
+ if (!ReadableStreamHasDefaultReader(cx, stream, &hasDefaultReader)) {
return false;
}
-
- if (readerMode == ReaderMode::Default) {
+ if (hasDefaultReader) {
// Step b: Otherwise,
// Step i: Assert: controller.[[queue]] is empty.
MOZ_ASSERT(oldAvailableData == 0);
@@ -4434,6 +4431,7 @@ JS::ReadableStreamUpdateDataAvailableFromSource(JSContext* cx, JS::HandleObject
size_t bytesWritten;
{
+ AutoRealm ar(cx, stream);
JS::AutoSuppressGCAnalysis suppressGC(cx);
JS::AutoCheckCannotGC noGC;
bool dummy;
@@ -4441,7 +4439,6 @@ JS::ReadableStreamUpdateDataAvailableFromSource(JSContext* cx, JS::HandleObject
auto cb = cx->runtime()->readableStreamWriteIntoReadRequestCallback;
MOZ_ASSERT(cb);
// TODO: use bytesWritten to correctly update the request's state.
- // TODO: make cross-compartment safe.
cb(cx, stream, underlyingSource, stream->embeddingFlags(), buffer,
availableData, &bytesWritten);
}
@@ -4477,12 +4474,12 @@ JS::ReadableStreamTee(JSContext* cx, HandleObject streamObj,
CHECK_THREAD(cx);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
Rooted branch1Stream(cx);
Rooted branch2Stream(cx);
-
if (!ReadableStreamTee(cx, stream, false, &branch1Stream, &branch2Stream)) {
return false;
}
@@ -4497,8 +4494,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamGetDesiredSize(JSContext* cx, JSObject* streamObj, bool* hasValue, double* value)
{
ReadableStream* stream = APIToUnwrapped(cx, streamObj);
- if (!stream)
+ if (!stream) {
return false;
+ }
if (stream->errored()) {
*hasValue = false;
@@ -4523,8 +4521,9 @@ JS::ReadableStreamClose(JSContext* cx, HandleObject streamObj)
CHECK_THREAD(cx);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
Rooted controllerObj(cx, stream->controller());
if (!VerifyControllerStateForClosing(cx, controllerObj)) {
@@ -4550,8 +4549,9 @@ JS::ReadableStreamEnqueue(JSContext* cx, HandleObject streamObj, HandleValue chu
cx->check(chunk);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
if (stream->mode() != JS::ReadableStreamMode::Default) {
JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
@@ -4577,8 +4577,9 @@ JS::ReadableStreamError(JSContext* cx, HandleObject streamObj, HandleValue error
cx->check(error);
Rooted stream(cx, APIToUnwrapped(cx, streamObj));
- if (!stream)
+ if (!stream) {
return false;
+ }
// Step 3: If stream.[[state]] is not "readable", throw a TypeError exception.
if (!stream->readable()) {
@@ -4596,8 +4597,9 @@ JS_PUBLIC_API(bool)
JS::ReadableStreamReaderIsClosed(JSContext* cx, HandleObject readerObj, bool* result)
{
Rooted reader(cx, APIToUnwrapped(cx, readerObj));
- if (!reader)
+ if (!reader) {
return false;
+ }
*result = reader->isClosed();
return true;
@@ -4611,8 +4613,9 @@ JS::ReadableStreamReaderCancel(JSContext* cx, HandleObject readerObj, HandleValu
cx->check(reason);
Rooted reader(cx, APIToUnwrapped(cx, readerObj));
- if (!reader)
+ if (!reader) {
return false;
+ }
return ReadableStreamReaderGenericCancel(cx, reader, reason);
}
@@ -4624,8 +4627,9 @@ JS::ReadableStreamReaderReleaseLock(JSContext* cx, HandleObject readerObj)
CHECK_THREAD(cx);
Rooted reader(cx, APIToUnwrapped(cx, readerObj));
- if (!reader)
+ if (!reader) {
return false;
+ }
#ifdef DEBUG
Rooted stream(cx);
@@ -4646,8 +4650,9 @@ JS::ReadableStreamDefaultReaderRead(JSContext* cx, HandleObject readerObj)
Rooted reader(cx);
reader = APIToUnwrapped(cx, readerObj);
- if (!reader)
+ if (!reader) {
return nullptr;
+ }
return ::ReadableStreamDefaultReaderRead(cx, reader);
}
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index 563ce90e890b1..71f692e82f7bf 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -427,7 +427,6 @@ FoldType(JSContext* cx, ParseNode* pn, ParseNodeKind kind)
return false;
}
pn->setKind(ParseNodeKind::Number);
- pn->setArity(PN_NUMBER);
pn->setOp(JSOP_DOUBLE);
pn->as().setValue(d);
}
@@ -440,7 +439,6 @@ FoldType(JSContext* cx, ParseNode* pn, ParseNodeKind kind)
return false;
}
pn->setKind(ParseNodeKind::String);
- pn->setArity(PN_NAME);
pn->setOp(JSOP_STRING);
pn->as().setAtom(atom);
}
@@ -547,7 +545,6 @@ FoldCondition(JSContext* cx, ParseNode** nodePtr, PerHandlerParsersetKind(ParseNodeKind::False);
node->setOp(JSOP_FALSE);
}
- node->setArity(PN_NULLARY);
}
return true;
@@ -580,7 +577,6 @@ FoldTypeOfExpr(JSContext* cx, UnaryNode* node, PerHandlerParsersetKind(ParseNodeKind::String);
- node->setArity(PN_NAME);
node->setOp(JSOP_NOP);
node->as().setAtom(result);
}
@@ -603,7 +599,6 @@ FoldDeleteExpr(JSContext* cx, UnaryNode* node, PerHandlerParsersetKind(ParseNodeKind::True);
- node->setArity(PN_NULLARY);
node->setOp(JSOP_TRUE);
}
@@ -677,12 +672,10 @@ FoldNot(JSContext* cx, UnaryNode* node, PerHandlerParser& pars
node->setKind(ParseNodeKind::False);
node->setOp(JSOP_FALSE);
}
- node->setArity(PN_NULLARY);
} else if (expr->isKind(ParseNodeKind::True) || expr->isKind(ParseNodeKind::False)) {
bool newval = !expr->isKind(ParseNodeKind::True);
node->setKind(newval ? ParseNodeKind::True : ParseNodeKind::False);
- node->setArity(PN_NULLARY);
node->setOp(newval ? JSOP_TRUE : JSOP_FALSE);
}
@@ -720,7 +713,6 @@ FoldUnaryArithmetic(JSContext* cx, UnaryNode* node, PerHandlerParsersetKind(ParseNodeKind::Number);
- node->setArity(PN_NUMBER);
node->setOp(JSOP_DOUBLE);
node->as().setValue(d);
}
@@ -965,7 +957,6 @@ FoldIf(JSContext* cx, ParseNode** nodePtr, PerHandlerParser& p
// with no |else|. Replace the entire thing with an empty
// statement list.
node->setKind(ParseNodeKind::StatementList);
- node->setArity(PN_LIST);
node->as().makeEmpty();
} else {
// Replacement invalidates |nextNode|, so reset it (if the
@@ -1091,7 +1082,6 @@ FoldBinaryArithmetic(JSContext* cx, ListNode* node, PerHandlerParserpn_next = next;
elem->setKind(ParseNodeKind::Number);
- elem->setArity(PN_NUMBER);
elem->setOp(JSOP_DOUBLE);
elem->as().setValue(d);
@@ -1104,7 +1094,6 @@ FoldBinaryArithmetic(JSContext* cx, ListNode* node, PerHandlerParseras().value();
node->setKind(ParseNodeKind::Number);
- node->setArity(PN_NUMBER);
node->setOp(JSOP_DOUBLE);
node->as().setValue(d);
}
@@ -1152,7 +1141,6 @@ FoldExponentiation(JSContext* cx, ListNode* node, PerHandlerParseras().value();
node->setKind(ParseNodeKind::Number);
- node->setArity(PN_NUMBER);
node->setOp(JSOP_DOUBLE);
node->as().setValue(ecmaPow(d1, d2));
return true;
@@ -1279,7 +1267,6 @@ FoldElement(JSContext* cx, ParseNode** nodePtr, PerHandlerParsersetKind(ParseNodeKind::Number);
- key->setArity(PN_NUMBER);
key->setOp(JSOP_DOUBLE);
key->as().setValue(index);
} else {
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 8d3638e0292d3..5728e4f63caa6 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -102,14 +102,14 @@ ParseNode::appendOrCreateList(ParseNodeKind kind, ParseNode* left, ParseNode* ri
return list;
}
-#ifdef DEBUG
-
const ParseNodeArity js::frontend::ParseNodeKindArity[] = {
#define ARITY(_name, arity) arity,
FOR_EACH_PARSE_NODE_KIND(ARITY)
#undef ARITY
};
+#ifdef DEBUG
+
static const char * const parseNodeNames[] = {
#define STRINGIFY(name, _arity) #name,
FOR_EACH_PARSE_NODE_KIND(STRINGIFY)
@@ -152,7 +152,7 @@ ParseNode::dump()
void
ParseNode::dump(GenericPrinter& out, int indent)
{
- switch (ParseNodeArity(pn_arity)) {
+ switch (getArity()) {
case PN_NULLARY:
as().dump(out);
return;
@@ -190,8 +190,8 @@ ParseNode::dump(GenericPrinter& out, int indent)
as().dump(out, indent);
return;
}
- out.printf("#",
- (void*) this, unsigned(getKind()), unsigned(pn_arity));
+ out.printf("#",
+ (void*) this, unsigned(getKind()));
}
void
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 71645efb09465..8033f1f4be6be 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -579,20 +579,17 @@ class typeName;
FOR_EACH_PARSENODE_SUBCLASS(DECLARE_CLASS)
#undef DECLARE_CLASS
-#ifdef DEBUG
// ParseNodeKindArity[size_t(pnk)] is the arity of a ParseNode of kind pnk.
extern const ParseNodeArity ParseNodeKindArity[];
-#endif
class ParseNode
{
ParseNodeKind pn_type; /* ParseNodeKind::PNK_* type */
- // pn_op and pn_arity are not declared as the correct enum types
- // due to difficulties with MS bitfield layout rules and a GCC
- // bug. See https://bugzilla.mozilla.org/show_bug.cgi?id=1383157#c4 for
- // details.
+
+ // pn_op is not declared as the correct enum type due to difficulties with
+ // MS bitfield layout rules and a GCC bug. See
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=1383157#c4 for details.
uint8_t pn_op; /* see JSOp enum and jsopcode.tbl */
- uint8_t pn_arity:4; /* see ParseNodeArity enum */
bool pn_parens:1; /* this expr was enclosed in parens */
bool pn_rhs_anon_fun:1; /* this expr is anonymous function or class that
* is a direct RHS of ParseNodeKind::Assign or ParseNodeKind::Colon of
@@ -602,31 +599,27 @@ class ParseNode
void operator=(const ParseNode& other) = delete;
public:
- ParseNode(ParseNodeKind kind, JSOp op, ParseNodeArity arity)
+ ParseNode(ParseNodeKind kind, JSOp op)
: pn_type(kind),
pn_op(op),
- pn_arity(arity),
pn_parens(false),
pn_rhs_anon_fun(false),
pn_pos(0, 0),
pn_next(nullptr)
{
MOZ_ASSERT(kind < ParseNodeKind::Limit);
- MOZ_ASSERT(hasExpectedArity());
memset(&pn_u, 0, sizeof pn_u);
}
- ParseNode(ParseNodeKind kind, JSOp op, ParseNodeArity arity, const TokenPos& pos)
+ ParseNode(ParseNodeKind kind, JSOp op, const TokenPos& pos)
: pn_type(kind),
pn_op(op),
- pn_arity(arity),
pn_parens(false),
pn_rhs_anon_fun(false),
pn_pos(pos),
pn_next(nullptr)
{
MOZ_ASSERT(kind < ParseNodeKind::Limit);
- MOZ_ASSERT(hasExpectedArity());
memset(&pn_u, 0, sizeof pn_u);
}
@@ -636,7 +629,6 @@ class ParseNode
ParseNodeKind getKind() const {
MOZ_ASSERT(pn_type < ParseNodeKind::Limit);
- MOZ_ASSERT(hasExpectedArity());
return pn_type;
}
void setKind(ParseNodeKind kind) {
@@ -645,12 +637,8 @@ class ParseNode
}
bool isKind(ParseNodeKind kind) const { return getKind() == kind; }
- ParseNodeArity getArity() const { return ParseNodeArity(pn_arity); }
-#ifdef DEBUG
- bool hasExpectedArity() const { return isArity(ParseNodeKindArity[size_t(pn_type)]); }
-#endif
+ ParseNodeArity getArity() const { return ParseNodeKindArity[size_t(getKind())]; }
bool isArity(ParseNodeArity a) const { return getArity() == a; }
- void setArity(ParseNodeArity a) { pn_arity = a; MOZ_ASSERT(hasExpectedArity()); }
bool isBinaryOperation() const {
ParseNodeKind kind = getKind();
@@ -816,10 +804,16 @@ class NullaryNode : public ParseNode
{
public:
NullaryNode(ParseNodeKind kind, const TokenPos& pos)
- : ParseNode(kind, JSOP_NOP, PN_NULLARY, pos) {}
+ : ParseNode(kind, JSOP_NOP, pos)
+ {
+ MOZ_ASSERT(is());
+ }
NullaryNode(ParseNodeKind kind, JSOp op, const TokenPos& pos)
- : ParseNode(kind, op, PN_NULLARY, pos) {}
+ : ParseNode(kind, op, pos)
+ {
+ MOZ_ASSERT(is());
+ }
static bool test(const ParseNode& node) {
return node.isArity(PN_NULLARY);
@@ -834,18 +828,20 @@ class NameNode : public ParseNode
{
protected:
NameNode(ParseNodeKind kind, JSOp op, JSAtom* atom, ParseNode* initOrStmt, const TokenPos& pos)
- : ParseNode(kind, op, PN_NAME, pos)
+ : ParseNode(kind, op, pos)
{
pn_u.name.atom = atom;
pn_u.name.initOrStmt = initOrStmt;
+ MOZ_ASSERT(is());
}
public:
NameNode(ParseNodeKind kind, JSOp op, JSAtom* atom, const TokenPos& pos)
- : ParseNode(kind, op, PN_NAME, pos)
+ : ParseNode(kind, op, pos)
{
pn_u.name.atom = atom;
pn_u.name.initOrStmt = nullptr;
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -893,9 +889,10 @@ class UnaryNode : public ParseNode
{
public:
UnaryNode(ParseNodeKind kind, const TokenPos& pos, ParseNode* kid)
- : ParseNode(kind, JSOP_NOP, PN_UNARY, pos)
+ : ParseNode(kind, JSOP_NOP, pos)
{
pn_u.unary.kid = kid;
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -952,17 +949,19 @@ class BinaryNode : public ParseNode
{
public:
BinaryNode(ParseNodeKind kind, JSOp op, const TokenPos& pos, ParseNode* left, ParseNode* right)
- : ParseNode(kind, op, PN_BINARY, pos)
+ : ParseNode(kind, op, pos)
{
pn_u.binary.left = left;
pn_u.binary.right = right;
+ MOZ_ASSERT(is());
}
BinaryNode(ParseNodeKind kind, JSOp op, ParseNode* left, ParseNode* right)
- : ParseNode(kind, op, PN_BINARY, TokenPos::box(left->pn_pos, right->pn_pos))
+ : ParseNode(kind, op, TokenPos::box(left->pn_pos, right->pn_pos))
{
pn_u.binary.left = left;
pn_u.binary.right = right;
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -1052,11 +1051,12 @@ class TernaryNode : public ParseNode
TernaryNode(ParseNodeKind kind, ParseNode* kid1, ParseNode* kid2, ParseNode* kid3,
const TokenPos& pos)
- : ParseNode(kind, JSOP_NOP, PN_TERNARY, pos)
+ : ParseNode(kind, JSOP_NOP, pos)
{
pn_u.ternary.kid1 = kid1;
pn_u.ternary.kid2 = kid2;
pn_u.ternary.kid3 = kid3;
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -1127,19 +1127,21 @@ class ListNode : public ParseNode
public:
ListNode(ParseNodeKind kind, const TokenPos& pos)
- : ParseNode(kind, JSOP_NOP, PN_LIST, pos)
+ : ParseNode(kind, JSOP_NOP, pos)
{
makeEmpty();
+ MOZ_ASSERT(is());
}
ListNode(ParseNodeKind kind, JSOp op, const TokenPos& pos)
- : ParseNode(kind, op, PN_LIST, pos)
+ : ParseNode(kind, op, pos)
{
makeEmpty();
+ MOZ_ASSERT(is());
}
ListNode(ParseNodeKind kind, JSOp op, ParseNode* kid)
- : ParseNode(kind, op, PN_LIST, kid->pn_pos)
+ : ParseNode(kind, op, kid->pn_pos)
{
if (kid->pn_pos.begin < pn_pos.begin) {
pn_pos.begin = kid->pn_pos.begin;
@@ -1150,6 +1152,7 @@ class ListNode : public ParseNode
pn_u.list.tail = &kid->pn_next;
pn_u.list.count = 1;
pn_u.list.xflags = 0;
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -1434,7 +1437,7 @@ class CodeNode : public ParseNode
{
public:
CodeNode(ParseNodeKind kind, JSOp op, const TokenPos& pos)
- : ParseNode(kind, op, PN_CODE, pos)
+ : ParseNode(kind, op, pos)
{
MOZ_ASSERT(kind == ParseNodeKind::Function || kind == ParseNodeKind::Module);
MOZ_ASSERT_IF(kind == ParseNodeKind::Module, op == JSOP_NOP);
@@ -1443,6 +1446,7 @@ class CodeNode : public ParseNode
op == JSOP_LAMBDA); // expression, method, accessor, &c.
MOZ_ASSERT(!pn_u.code.body);
MOZ_ASSERT(!pn_u.code.funbox);
+ MOZ_ASSERT(is());
}
static bool test(const ParseNode& node) {
@@ -1493,7 +1497,7 @@ class NumericLiteral : public ParseNode
{
public:
NumericLiteral(double value, DecimalPoint decimalPoint, const TokenPos& pos)
- : ParseNode(ParseNodeKind::Number, JSOP_NOP, PN_NUMBER, pos)
+ : ParseNode(ParseNodeKind::Number, JSOP_NOP, pos)
{
pn_u.number.value = value;
pn_u.number.decimalPoint = decimalPoint;
@@ -1526,7 +1530,7 @@ class LexicalScopeNode : public ParseNode
{
public:
LexicalScopeNode(LexicalScope::Data* bindings, ParseNode* body)
- : ParseNode(ParseNodeKind::LexicalScope, JSOP_NOP, PN_SCOPE, body->pn_pos)
+ : ParseNode(ParseNodeKind::LexicalScope, JSOP_NOP, body->pn_pos)
{
pn_u.scope.bindings = bindings;
pn_u.scope.body = body;
@@ -1628,10 +1632,11 @@ class LoopControlStatement : public ParseNode
{
protected:
LoopControlStatement(ParseNodeKind kind, PropertyName* label, const TokenPos& pos)
- : ParseNode(kind, JSOP_NOP, PN_LOOP, pos)
+ : ParseNode(kind, JSOP_NOP, pos)
{
MOZ_ASSERT(kind == ParseNodeKind::Break || kind == ParseNodeKind::Continue);
pn_u.loopControl.label = label;
+ MOZ_ASSERT(is());
}
public:
@@ -1822,7 +1827,7 @@ class RegExpLiteral : public ParseNode
{
public:
RegExpLiteral(ObjectBox* reobj, const TokenPos& pos)
- : ParseNode(ParseNodeKind::RegExp, JSOP_REGEXP, PN_REGEXP, pos)
+ : ParseNode(ParseNodeKind::RegExp, JSOP_REGEXP, pos)
{
pn_u.regexp.objbox = reobj;
}
@@ -1979,7 +1984,7 @@ class ClassField : public ParseNode
{
public:
ClassField(ParseNode* name, ParseNode* initializer)
- : ParseNode(ParseNodeKind::ClassField, JSOP_NOP, PN_FIELD,
+ : ParseNode(ParseNodeKind::ClassField, JSOP_NOP,
initializer == nullptr ? name->pn_pos : TokenPos::box(name->pn_pos, initializer->pn_pos))
{
pn_u.field.name = name;
diff --git a/js/src/jit-test/tests/arguments/bug1503071.js b/js/src/jit-test/tests/arguments/bug1503071.js
new file mode 100644
index 0000000000000..d34e9d598daef
--- /dev/null
+++ b/js/src/jit-test/tests/arguments/bug1503071.js
@@ -0,0 +1,16 @@
+// |jit-test| exitstatus: 6
+var g = true
+
+setInterruptCallback(function() {
+ print(getBacktrace({args: true}));
+});
+
+function foo(bt, x=3, y = eval("g")) {
+ if (g) {
+ g = false
+ interruptIf(true);
+ foo(false);
+ }
+ (function() { n = bt;});
+}
+foo(false);
diff --git a/js/src/jit-test/tests/stream/bug-1387503-1.js b/js/src/jit-test/tests/stream/bug-1387503-1.js
new file mode 100644
index 0000000000000..8ac6164a47ab8
--- /dev/null
+++ b/js/src/jit-test/tests/stream/bug-1387503-1.js
@@ -0,0 +1,37 @@
+// Test uncatchable error when a stream source's pull() method is called.
+
+// Make `debugger;` raise an uncatchable error.
+let g = newGlobal();
+g.parent = this;
+g.hit = false;
+g.eval(`
+ new Debugger(parent).onDebuggerStatement = _frame => (hit = true, null);
+`);
+
+// Create a stream whose pull() method raises an uncatchable error,
+// and try reading from it.
+let readerCreated = false;
+let fnFinished = false;
+async function fn() {
+ try {
+ let stream = new ReadableStream({
+ start(controller) {},
+ pull(controller) {
+ debugger;
+ }
+ });
+
+ let reader = stream.getReader();
+ let p = reader.read();
+ readerCreated = true;
+ await p;
+ } finally {
+ fnFinished = true;
+ }
+}
+
+fn();
+drainJobQueue();
+assertEq(readerCreated, true);
+assertEq(g.hit, true);
+assertEq(fnFinished, false);
diff --git a/js/src/jit-test/tests/stream/bug-1387503-2.js b/js/src/jit-test/tests/stream/bug-1387503-2.js
new file mode 100644
index 0000000000000..852e99b28eb9b
--- /dev/null
+++ b/js/src/jit-test/tests/stream/bug-1387503-2.js
@@ -0,0 +1,39 @@
+// Test uncatchable error when a stream's queuing strategy's size() method is called.
+
+// Make `debugger;` raise an uncatchable exception.
+let g = newGlobal();
+g.parent = this;
+g.hit = false;
+g.eval(`
+ var dbg = new Debugger(parent);
+ dbg.onDebuggerStatement = (_frame, exc) => (hit = true, null);
+`);
+
+let fnFinished = false;
+async function fn() {
+ // Await once to postpone the uncatchable error until we're running inside
+ // a reaction job. We don't want the rest of the test to be terminated.
+ // (`drainJobQueue` catches uncatchable errors!)
+ await 1;
+
+ try {
+ // Create a stream with a strategy whose .size() method raises an
+ // uncatchable exception, and have it call that method.
+ new ReadableStream({
+ start(controller) {
+ controller.enqueue("FIRST POST"); // this calls .size()
+ }
+ }, {
+ size() {
+ debugger;
+ }
+ });
+ } finally {
+ fnFinished = true;
+ }
+}
+
+fn();
+drainJobQueue();
+assertEq(g.hit, true);
+assertEq(fnFinished, false);
diff --git a/js/src/jsapi-tests/testReadableStream.cpp b/js/src/jsapi-tests/testReadableStream.cpp
index 627303b5f7fab..6a1f5ee648c27 100644
--- a/js/src/jsapi-tests/testReadableStream.cpp
+++ b/js/src/jsapi-tests/testReadableStream.cpp
@@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "jsapi.h"
-
+#include "jsfriendapi.h"
#include "jsapi-tests/tests.h"
using namespace JS;
@@ -39,6 +39,7 @@ static void
DataRequestCB(JSContext* cx, HandleObject stream, void* underlyingSource, uint8_t flags,
size_t desiredSize)
{
+ js::AssertSameCompartment(cx, stream);
MOZ_ASSERT(!dataRequestCBCalled, "Invalid test setup");
dataRequestCBCalled = true;
}
@@ -48,6 +49,7 @@ static void
WriteIntoRequestBufferCB(JSContext* cx, HandleObject stream, void* underlyingSource, uint8_t flags,
void* buffer, size_t length, size_t* bytesWritten)
{
+ js::AssertSameCompartment(cx, stream);
MOZ_ASSERT(!writeIntoRequestBufferCBCalled, "Invalid test setup");
writeIntoRequestBufferCBCalled = true;
@@ -64,6 +66,8 @@ static Value
CancelStreamCB(JSContext* cx, HandleObject stream, void* underlyingSource, uint8_t flags,
HandleValue reason)
{
+ js::AssertSameCompartment(cx, stream);
+ js::AssertSameCompartment(cx, reason);
MOZ_ASSERT(!cancelStreamCBCalled, "Invalid test setup");
cancelStreamCBCalled = true;
cancelStreamReason = reason;
@@ -75,6 +79,7 @@ static Value streamClosedReason;
static void
StreamClosedCB(JSContext* cx, HandleObject stream, void* underlyingSource, uint8_t flags)
{
+ js::AssertSameCompartment(cx, stream);
MOZ_ASSERT(!streamClosedCBCalled, "Invalid test setup");
streamClosedCBCalled = true;
}
@@ -85,6 +90,8 @@ static void
StreamErroredCB(JSContext* cx, HandleObject stream, void* underlyingSource, uint8_t flags,
HandleValue reason)
{
+ js::AssertSameCompartment(cx, stream);
+ js::AssertSameCompartment(cx, reason);
MOZ_ASSERT(!streamErroredCBCalled, "Invalid test setup");
streamErroredCBCalled = true;
streamErroredReason = reason;
@@ -418,19 +425,65 @@ BEGIN_FIXTURE_TEST(StreamTestFixture,
END_FIXTURE_TEST(StreamTestFixture,
testReadableStream_ExternalSourceGetReader)
+enum class CompartmentMode {
+ Same,
+ Cross,
+};
+
struct ReadFromExternalSourceFixture : public StreamTestFixture
{
virtual ~ReadFromExternalSourceFixture() {}
- bool readWithoutDataAvailable(const char* evalSrc, const char* evalSrc2,
+
+ // On success, streamGlobal is a global object (not a wrapper)
+ // and stream is in the same compartment as cx (it may be a CCW).
+ bool createExternalSourceStream(CompartmentMode compartmentMode,
+ MutableHandleObject streamGlobal,
+ MutableHandleObject stream)
+ {
+ if (compartmentMode == CompartmentMode::Same) {
+ streamGlobal.set(global);
+ stream.set(NewExternalSourceStream(cx));
+ if (!stream) {
+ return false;
+ }
+ } else {
+ RootedObject savedGlobal(cx, global);
+ streamGlobal.set(createGlobal());
+ if (!streamGlobal) {
+ return false;
+ }
+ global = savedGlobal;
+
+ {
+ JSAutoRealm ar(cx, streamGlobal);
+ stream.set(NewExternalSourceStream(cx));
+ if (!stream) {
+ return false;
+ }
+ }
+ if (!JS_WrapObject(cx, stream)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ bool readWithoutDataAvailable(CompartmentMode compartmentMode,
+ const char* evalSrc,
+ const char* evalSrc2,
uint32_t writtenLength)
{
ResetCallbacks();
definePrint();
- RootedObject stream(cx, NewExternalSourceStream(cx));
- CHECK(stream);
+ // Create the stream.
+ RootedObject streamGlobal(cx);
+ RootedObject stream(cx); // can be a wrapper
+ CHECK(createExternalSourceStream(compartmentMode, &streamGlobal, &stream));
js::RunJobs(cx);
+
+ // GetExternalUnderlyingSource locks the stream.
void* underlyingSource;
CHECK(ReadableStreamGetExternalUnderlyingSource(cx, stream, &underlyingSource));
CHECK(underlyingSource == &stubExternalUnderlyingSource);
@@ -439,31 +492,36 @@ struct ReadFromExternalSourceFixture : public StreamTestFixture
CHECK(locked);
CHECK(ReadableStreamReleaseExternalUnderlyingSource(cx, stream));
+ // Run caller-supplied JS code to read from the stream.
RootedValue streamVal(cx, ObjectValue(*stream));
CHECK(JS_SetProperty(cx, global, "stream", streamVal));
-
RootedValue rval(cx);
EVAL(evalSrc, &rval);
CHECK(dataRequestCBCalled);
CHECK(!writeIntoRequestBufferCBCalled);
CHECK(rval.isObject());
- RootedObject promise(cx, &rval.toObject());
- CHECK(IsPromiseObject(promise));
- CHECK(GetPromiseState(promise) == PromiseState::Pending);
+ RootedObject unwrappedPromise(cx, js::CheckedUnwrap(&rval.toObject()));
+ CHECK(unwrappedPromise);
+ CHECK(IsPromiseObject(unwrappedPromise));
+ CHECK(GetPromiseState(unwrappedPromise) == PromiseState::Pending);
+ // Stream in some data; this resolves the read() result promise.
size_t length = sizeof(testBufferData);
- ReadableStreamUpdateDataAvailableFromSource(cx, stream, length);
-
+ CHECK(ReadableStreamUpdateDataAvailableFromSource(cx, stream, length));
CHECK(writeIntoRequestBufferCBCalled);
- CHECK(GetPromiseState(promise) == PromiseState::Fulfilled);
- RootedValue iterVal(cx);
- bool done;
- if (!GetIterResult(cx, promise, &iterVal, &done)) {
- return false;
+ CHECK(GetPromiseState(unwrappedPromise) == PromiseState::Fulfilled);
+ RootedObject chunk(cx);
+ {
+ JSAutoRealm ar(cx, unwrappedPromise);
+ RootedValue iterVal(cx);
+ bool done;
+ if (!GetIterResult(cx, unwrappedPromise, &iterVal, &done)) {
+ return false;
+ }
+ CHECK(!done);
+ chunk = &iterVal.toObject();
}
-
- CHECK(!done);
- RootedObject chunk(cx, &iterVal.toObject());
+ CHECK(JS_WrapObject(cx, &chunk));
CHECK(JS_IsUint8Array(chunk));
{
@@ -473,6 +531,7 @@ struct ReadFromExternalSourceFixture : public StreamTestFixture
CHECK(!memcmp(buffer, testBufferData, writtenLength));
}
+ // Check the callbacks fired by calling read() again.
dataRequestCBCalled = false;
writeIntoRequestBufferCBCalled = false;
EVAL(evalSrc2, &rval);
@@ -482,12 +541,19 @@ struct ReadFromExternalSourceFixture : public StreamTestFixture
return true;
}
- bool readWithDataAvailable(const char* evalSrc, uint32_t writtenLength) {
+ bool readWithDataAvailable(CompartmentMode compartmentMode,
+ const char* evalSrc,
+ uint32_t writtenLength)
+ {
ResetCallbacks();
definePrint();
- RootedObject stream(cx, NewExternalSourceStream(cx));
- CHECK(stream);
+ // Create a stream.
+ RootedObject streamGlobal(cx);
+ RootedObject stream(cx);
+ CHECK(createExternalSourceStream(compartmentMode, &streamGlobal, &stream));
+
+ // Getting the underlying source locks the stream.
void* underlyingSource;
CHECK(ReadableStreamGetExternalUnderlyingSource(cx, stream, &underlyingSource));
CHECK(underlyingSource == &stubExternalUnderlyingSource);
@@ -496,27 +562,33 @@ struct ReadFromExternalSourceFixture : public StreamTestFixture
CHECK(locked);
CHECK(ReadableStreamReleaseExternalUnderlyingSource(cx, stream));
+ // Make some data available.
size_t length = sizeof(testBufferData);
- ReadableStreamUpdateDataAvailableFromSource(cx, stream, length);
+ CHECK(ReadableStreamUpdateDataAvailableFromSource(cx, stream, length));
+ // Read from the stream.
RootedValue streamVal(cx, ObjectValue(*stream));
CHECK(JS_SetProperty(cx, global, "stream", streamVal));
-
RootedValue rval(cx);
EVAL(evalSrc, &rval);
CHECK(writeIntoRequestBufferCBCalled);
CHECK(rval.isObject());
- RootedObject promise(cx, &rval.toObject());
- CHECK(IsPromiseObject(promise));
- CHECK(GetPromiseState(promise) == PromiseState::Fulfilled);
- RootedValue iterVal(cx);
- bool done;
- if (!GetIterResult(cx, promise, &iterVal, &done)) {
- return false;
+ RootedObject unwrappedPromise(cx, js::CheckedUnwrap(&rval.toObject()));
+ CHECK(unwrappedPromise);
+ CHECK(IsPromiseObject(unwrappedPromise));
+ CHECK(GetPromiseState(unwrappedPromise) == PromiseState::Fulfilled);
+ RootedObject chunk(cx);
+ {
+ JSAutoRealm ar(cx, unwrappedPromise);
+ RootedValue iterVal(cx);
+ bool done;
+ if (!GetIterResult(cx, unwrappedPromise, &iterVal, &done)) {
+ return false;
+ }
+ CHECK(!done);
+ chunk = &iterVal.toObject();
}
-
- CHECK(!done);
- RootedObject chunk(cx, &iterVal.toObject());
+ CHECK(JS_WrapObject(cx, &chunk));
CHECK(JS_IsUint8Array(chunk));
{
@@ -533,16 +605,59 @@ struct ReadFromExternalSourceFixture : public StreamTestFixture
BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable)
{
- return readWithoutDataAvailable("r = stream.getReader(); r.read()", "r.read()", sizeof(testBufferData));
+ return readWithoutDataAvailable(CompartmentMode::Same,
+ "r = stream.getReader(); r.read()",
+ "r.read()",
+ sizeof(testBufferData));
}
END_FIXTURE_TEST(ReadFromExternalSourceFixture,
testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable)
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment1)
+{
+ // Scenario 1: The stream and reader are both in the same compartment, but
+ // ReadableStreamUpdateDataAvailableFromSource is applied to a wrapper.
+ return readWithoutDataAvailable(CompartmentMode::Cross,
+ "r = stream.getReader(); r.read()",
+ "r.read()",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment1)
+
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment2)
+{
+ // Scenario 2: The stream and reader are in the same compartment, but a
+ // `read` method from another compartment is used on the reader.
+ return readWithoutDataAvailable(CompartmentMode::Cross,
+ "r = stream.getReader(); read = new ReadableStream({start(){}}).getReader().read; read.call(r)",
+ "read.call(r)",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment2)
+
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment3)
+{
+ // Scenario 3: The stream and reader are in different compartments.
+ return readWithoutDataAvailable(CompartmentMode::Cross,
+ "r = ReadableStream.prototype.getReader.call(stream); r.read()",
+ "r.read()",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithoutDataAvailable_CrossCompartment3)
+
BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
testReadableStream_ExternalSourceCloseWithPendingRead)
{
- CHECK(readWithoutDataAvailable("r = stream.getReader(); request0 = r.read(); "
- "request1 = r.read(); request0", "r.read()",
+ CHECK(readWithoutDataAvailable(CompartmentMode::Same,
+ "r = stream.getReader(); request0 = r.read(); "
+ "request1 = r.read(); request0",
+ "r.read()",
sizeof(testBufferData)));
RootedValue val(cx);
@@ -574,11 +689,48 @@ END_FIXTURE_TEST(ReadFromExternalSourceFixture,
BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
testReadableStream_ExternalSourceReadDefaultWithDataAvailable)
{
- return readWithDataAvailable("r = stream.getReader(); r.read()", sizeof(testBufferData));
+ return readWithDataAvailable(CompartmentMode::Same,
+ "r = stream.getReader(); r.read()",
+ sizeof(testBufferData));
}
END_FIXTURE_TEST(ReadFromExternalSourceFixture,
testReadableStream_ExternalSourceReadDefaultWithDataAvailable)
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment1)
+{
+ // Scenario 1: The stream and reader are both in the same compartment, but
+ // ReadableStreamUpdateDataAvailableFromSource is applied to a wrapper.
+ return readWithDataAvailable(CompartmentMode::Cross,
+ "r = stream.getReader(); r.read()",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment1)
+
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment2)
+{
+ // Scenario 2: The stream and reader are in the same compartment, but a
+ // `read` method from another compartment is used on the reader.
+ return readWithDataAvailable(CompartmentMode::Cross,
+ "r = stream.getReader(); read = new ReadableStream({start(){}}).getReader().read; read.call(r)",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment2)
+
+BEGIN_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment3)
+{
+ // Scenario 3: The stream and reader are in different compartments.
+ return readWithDataAvailable(CompartmentMode::Cross,
+ "r = ReadableStream.prototype.getReader.call(stream); r.read()",
+ sizeof(testBufferData));
+}
+END_FIXTURE_TEST(ReadFromExternalSourceFixture,
+ testReadableStream_ExternalSourceReadDefaultWithDataAvailable_CrossCompartment3)
+
// Cross-global tests:
BEGIN_FIXTURE_TEST(StreamTestFixture,
testReadableStream_ReadableStreamOtherGlobalDefaultReaderRead)
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 2fd77506c8a31..3395c405a0fd3 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -840,7 +840,9 @@ js::DumpScript(JSContext* cx, JSScript* scriptArg)
static const char*
FormatValue(JSContext* cx, HandleValue v, UniqueChars& bytes)
{
- if (v.isMagic(JS_OPTIMIZED_OUT)) {
+ if (v.isMagic()) {
+ MOZ_ASSERT(v.whyMagic() == JS_OPTIMIZED_OUT ||
+ v.whyMagic() == JS_UNINITIALIZED_LEXICAL);
return "[unavailable]";
}
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 9789709dc7d8d..25e709a6877f1 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1334,6 +1334,8 @@ CheckOverflow(const nsStyleDisplay* aDisplay, ScrollStyles* aStyles)
{
if (aDisplay->mOverflowX == NS_STYLE_OVERFLOW_VISIBLE &&
aDisplay->mScrollBehavior == NS_STYLE_SCROLL_BEHAVIOR_AUTO &&
+ aDisplay->mOverscrollBehaviorX == StyleOverscrollBehavior::Auto &&
+ aDisplay->mOverscrollBehaviorY == StyleOverscrollBehavior::Auto &&
aDisplay->mScrollSnapTypeX == NS_STYLE_SCROLL_SNAP_TYPE_NONE &&
aDisplay->mScrollSnapTypeY == NS_STYLE_SCROLL_SNAP_TYPE_NONE &&
aDisplay->mScrollSnapPointsX == nsStyleCoord(eStyleUnit_None) &&
diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index f7a5f03fa6061..fcd71bc8a3765 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -107,7 +107,7 @@ nsContainerFrame*
NS_NewColumnSetFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle, nsFrameState aStateFlags)
{
nsColumnSetFrame* it = new (aPresShell) nsColumnSetFrame(aStyle);
- it->AddStateBits(aStateFlags | NS_BLOCK_MARGIN_ROOT);
+ it->AddStateBits(aStateFlags);
return it;
}
@@ -481,12 +481,11 @@ nsColumnSetFrame::ReflowColumns(ReflowOutput& aDesiredSize,
nsReflowStatus& aReflowStatus,
ReflowConfig& aConfig,
bool aLastColumnUnbounded,
- nsCollapsingMargin* aCarriedOutBEndMargin,
ColumnBalanceData& aColData)
{
bool feasible = ReflowChildren(aDesiredSize, aReflowInput,
aReflowStatus, aConfig, aLastColumnUnbounded,
- aCarriedOutBEndMargin, aColData);
+ aColData);
if (aColData.mHasExcessBSize) {
aConfig = ChooseColumnStrategy(aReflowInput, true);
@@ -495,8 +494,7 @@ nsColumnSetFrame::ReflowColumns(ReflowOutput& aDesiredSize,
// end up with a stale column height for some of our columns, since we
// bailed out of balancing.
feasible = ReflowChildren(aDesiredSize, aReflowInput, aReflowStatus,
- aConfig, aLastColumnUnbounded,
- aCarriedOutBEndMargin, aColData);
+ aConfig, aLastColumnUnbounded, aColData);
}
return feasible;
@@ -595,7 +593,6 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
nsReflowStatus& aStatus,
const ReflowConfig& aConfig,
bool aUnboundedLastColumn,
- nsCollapsingMargin* aCarriedOutBEndMargin,
ColumnBalanceData& aColData)
{
aColData.Reset();
@@ -765,7 +762,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
availSize, &kidCBSize);
kidReflowInput.mFlags.mIsTopOfPage = true;
kidReflowInput.mFlags.mTableIsSplittable = false;
- kidReflowInput.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < INT32_MAX;
+ kidReflowInput.mFlags.mIsColumnBalancing = aConfig.mIsBalancing;
// We need to reflow any float placeholders, even if our column height
// hasn't changed.
@@ -807,7 +804,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
reflowNext = aStatus.NextInFlowNeedsReflow();
COLUMN_SET_LOG("%s: Reflowed child #%d %p: status=%s,"
- " desiredSize=(%d,%d), CarriedOutBEndMargin=%d",
+ " desiredSize=(%d,%d), CarriedOutBEndMargin=%d (ignored)",
__func__,
columnCount,
child,
@@ -816,9 +813,23 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
kidDesiredSize.BSize(wm),
kidDesiredSize.mCarriedOutBEndMargin.get());
- NS_FRAME_TRACE_REFLOW_OUT("Column::Reflow", aStatus);
+ // The carried-out block-end margin of column content might be non-zero
+ // when we try to find the best column balancing block size, but it should
+ // never affect the size column set nor be further carried out. Set it to
+ // zero.
+ //
+ // FIXME: For some types of fragmentation, we should carry the margin into
+ // the next column. Also see
+ // https://drafts.csswg.org/css-break-4/#break-margins
+ //
+ // FIXME: This should never happen for the last column, since it should be
+ // a margin root; see nsBlockFrame::IsMarginRoot(). However, sometimes the
+ // last column has an empty continuation while searching for the best
+ // column balancing bsize, which prevents the last column from being a
+ // margin root.
+ kidDesiredSize.mCarriedOutBEndMargin.Zero();
- *aCarriedOutBEndMargin = kidDesiredSize.mCarriedOutBEndMargin;
+ NS_FRAME_TRACE_REFLOW_OUT("Column::Reflow", aStatus);
FinishReflowChild(child, PresContext(), kidDesiredSize,
&kidReflowInput, wm, childOrigin, containerSize, 0);
@@ -878,7 +889,7 @@ nsColumnSetFrame::ReflowChildren(ReflowOutput& aDesiredSize,
if ((contentBEnd > aReflowInput.ComputedMaxBSize() ||
contentBEnd > aReflowInput.ComputedBSize()) &&
- aConfig.mBalanceColCount < INT32_MAX) {
+ aConfig.mIsBalancing) {
// We overflowed vertically, but have not exceeded the number of
// columns. We're going to go into overflow columns now, so balancing
// no longer applies.
@@ -1032,7 +1043,6 @@ nsColumnSetFrame::FindBestBalanceBSize(const ReflowInput& aReflowInput,
ReflowConfig& aConfig,
ColumnBalanceData& aColData,
ReflowOutput& aDesiredSize,
- nsCollapsingMargin& aOutMargin,
bool& aUnboundedLastColumn,
bool& aRunWasFeasible,
nsReflowStatus& aStatus)
@@ -1144,7 +1154,7 @@ nsColumnSetFrame::FindBestBalanceBSize(const ReflowInput& aReflowInput,
aUnboundedLastColumn = false;
MarkPrincipalChildrenDirty(this);
feasible = ReflowColumns(aDesiredSize, aReflowInput, aStatus, aConfig, false,
- &aOutMargin, aColData);
+ aColData);
if (!aConfig.mIsBalancing) {
// Looks like we had excess height when balancing, so we gave up on
@@ -1174,7 +1184,7 @@ nsColumnSetFrame::FindBestBalanceBSize(const ReflowInput& aReflowInput,
MarkPrincipalChildrenDirty(this);
feasible = ReflowColumns(aDesiredSize, aReflowInput, aStatus, aConfig,
availableContentBSize == NS_UNCONSTRAINEDSIZE,
- &aOutMargin, aColData);
+ aColData);
}
}
@@ -1238,20 +1248,17 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
// content back here and then have to push it out again!
nsIFrame* nextInFlow = GetNextInFlow();
bool unboundedLastColumn = config.mIsBalancing && !nextInFlow;
- nsCollapsingMargin carriedOutBottomMargin;
ColumnBalanceData colData;
bool feasible = ReflowColumns(aDesiredSize, aReflowInput, aStatus, config,
- unboundedLastColumn, &carriedOutBottomMargin,
- colData);
+ unboundedLastColumn, colData);
// If we're not balancing, then we're already done, since we should have
// reflown all of our children, and there is no need for a binary search to
// determine proper column height.
if (config.mIsBalancing && !aPresContext->HasPendingInterrupt()) {
FindBestBalanceBSize(aReflowInput, aPresContext, config, colData,
- aDesiredSize, carriedOutBottomMargin,
- unboundedLastColumn, feasible, aStatus);
+ aDesiredSize, unboundedLastColumn, feasible, aStatus);
}
if (aPresContext->HasPendingInterrupt() &&
@@ -1271,8 +1278,6 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize, aReflowInput, aStatus, false);
- aDesiredSize.mCarriedOutBEndMargin = carriedOutBottomMargin;
-
NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aDesiredSize);
}
diff --git a/layout/generic/nsColumnSetFrame.h b/layout/generic/nsColumnSetFrame.h
index 7d7777b69a8fd..2155fb935a9fb 100644
--- a/layout/generic/nsColumnSetFrame.h
+++ b/layout/generic/nsColumnSetFrame.h
@@ -120,7 +120,7 @@ class nsColumnSetFrame final : public nsContainerFrame
nscoord mColMaxBSize = NS_INTRINSICSIZE;
// A boolean controlling whether or not we are balancing. This should be
- // equivalent to mBalanceColCount == INT32_MAX.
+ // equivalent to mBalanceColCount != INT32_MAX.
bool mIsBalancing = false;
// The last known column block-size that was 'feasible'. A column bSize is
@@ -173,7 +173,6 @@ class nsColumnSetFrame final : public nsContainerFrame
nsReflowStatus& aReflowStatus,
ReflowConfig& aConfig,
bool aLastColumnUnbounded,
- nsCollapsingMargin* aCarriedOutBEndMargin,
ColumnBalanceData& aColData);
/**
@@ -198,8 +197,6 @@ class nsColumnSetFrame final : public nsContainerFrame
* successive iterations of the balancing process.
* @param aDesiredSize The final output size of the column set frame (output
* of reflow procedure).
- * @param aOutMargin The bottom margin of the column set frame that may be
- * carried out from reflow (and thus collapsed).
* @param aUnboundedLastColumn A boolean value indicating that the last column
* can be of any height. Used during the first iteration of the
* balancing procedure to measure the height of all content in
@@ -215,7 +212,6 @@ class nsColumnSetFrame final : public nsContainerFrame
ReflowConfig& aConfig,
ColumnBalanceData& aColData,
ReflowOutput& aDesiredSize,
- nsCollapsingMargin& aOutMargin,
bool& aUnboundedLastColumn,
bool& aRunWasFeasible,
nsReflowStatus& aStatus);
@@ -228,7 +224,6 @@ class nsColumnSetFrame final : public nsContainerFrame
nsReflowStatus& aStatus,
const ReflowConfig& aConfig,
bool aLastColumnUnbounded,
- nsCollapsingMargin* aCarriedOutBEndMargin,
ColumnBalanceData& aColData);
void ForEachColumnRule(const std::function& aSetLineRect,
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index f38968b02ee54..c7c1386de73ec 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -654,7 +654,7 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 372063-1.html 372063-1-r
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 372553-1.html 372553-1-ref.html # Bug 1392106
== 372632-1.html 372632-1-ref.html
== 372768-1.html 372768-1-ref.html
-fuzzy-if(webrender&&winWidget,83-83,2-2) == 373295-1.html 373295-1-ref.html
+fuzzy-if(webrender&&winWidget,83-92,1-2) == 373295-1.html 373295-1-ref.html
== 373298-1.html 373298-1-ref.html
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 373381-1.html 373381-1-ref.html # Bug 1392106
fuzzy-if(skiaContent&&!Android,0-2,0-40) == 373381-2.html 373381-2-ref.html
diff --git a/layout/reftests/image-element/reftest.list b/layout/reftests/image-element/reftest.list
index 566d128decfff..2d6923cb6e25e 100644
--- a/layout/reftests/image-element/reftest.list
+++ b/layout/reftests/image-element/reftest.list
@@ -7,7 +7,7 @@ random == bug-364968.html bug-364968-ref.html
== canvas-outside-document-invalidate-01.html about:blank
fails-if(azureSkia) fails-if(cocoaWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
#fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
-fuzzy-if(webrender&&!gtkWidget,117-129,54-54) == element-paint-simple.html element-paint-simple-ref.html
+fuzzy-if(webrender&&!gtkWidget,117-129,47-54) == element-paint-simple.html element-paint-simple-ref.html
== element-paint-repeated.html element-paint-repeated-ref.html
== element-paint-recursion.html element-paint-recursion-ref.html
== element-paint-continuation.html element-paint-continuation-ref.html
@@ -17,7 +17,7 @@ fuzzy-if(d2d&&/^Windows\x20NT\x206\.1/.test(http.oscpu),0-16,0-90) == element-pa
== element-paint-background-size-02.html element-paint-background-size-02-ref.html
fuzzy-if(skiaContent,0-255,0-4) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == element-paint-transform-repeated.html element-paint-transform-repeated-ref.html # Bug 1475907
fuzzy-if(d2d,0-255,0-24) == element-paint-transform-03.html element-paint-transform-03-ref.html
-fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-3,0-106) fuzzy-if(webrender&&!gtkWidget,134-222,1323-1588) == element-paint-native-widget.html element-paint-native-widget-ref.html # in -ref the scrollframe is active and layerized differently with APZ
+fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-3,0-106) fuzzy-if(webrender&&!gtkWidget,134-222,1197-1588) == element-paint-native-widget.html element-paint-native-widget-ref.html # in -ref the scrollframe is active and layerized differently with APZ
fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == element-paint-subimage-sampling-restriction.html about:blank
== element-paint-clippath.html element-paint-clippath-ref.html
fuzzy-if(webrender,36-36,702-702) == element-paint-sharpness-01a.html element-paint-sharpness-01b.html
diff --git a/layout/reftests/svg/text/reftest.list b/layout/reftests/svg/text/reftest.list
index b2adc848193f0..eafb50a847c97 100644
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@@ -1,14 +1,14 @@
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,249-254) == simple.svg simple-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,221-254) == simple.svg simple-ref.html # Bug 1392106
== simple-2.svg simple.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,249-254) == simple-underline.svg simple-underline-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,221-254) == simple-underline.svg simple-underline-ref.html # Bug 1392106
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-scaled.svg simple-underline-scaled-ref.svg # Bug 1392106
-fuzzy-if(webrender&&!gtkWidget,119-166,278-318) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
-fuzzy-if(webrender&&!gtkWidget,117-132,201-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
-fuzzy-if(webrender&&!gtkWidget,122-134,245-250) == simple-anchor-end.svg simple-anchor-end-ref.html
-fuzzy-if(skiaContent&&dwrite,0-104,0-131) fuzzy-if(webrender&&!gtkWidget,125-194,288-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
-fuzzy-if(webrender&&!gtkWidget,132-134,205-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
-fuzzy-if(skiaContent,0-111,0-81) fuzzy-if(webrender&&!gtkWidget,122-181,254-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
-fuzzy-if(webrender&&!gtkWidget,132-134,294-319) == simple-bidi.svg simple-bidi-ref.html
+fuzzy-if(webrender&&!gtkWidget,119-166,255-318) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
+fuzzy-if(webrender&&!gtkWidget,117-138,182-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
+fuzzy-if(webrender&&!gtkWidget,122-137,220-250) == simple-anchor-end.svg simple-anchor-end-ref.html
+fuzzy-if(skiaContent&&dwrite,0-104,0-131) fuzzy-if(webrender&&!gtkWidget,125-200,259-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
+fuzzy-if(webrender&&!gtkWidget,132-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
+fuzzy-if(skiaContent,0-111,0-81) fuzzy-if(webrender&&!gtkWidget,122-181,221-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
+fuzzy-if(webrender&&!gtkWidget,132-138,261-319) == simple-bidi.svg simple-bidi-ref.html
== simple-bidi-2.svg simple-bidi.svg
== simple-dx.svg simple.svg
@@ -25,12 +25,12 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-dx-anchor-end-bid
== simple-dx-rtl-2.svg simple-dx-rtl-2-ref.svg
== simple-fill-color-dynamic.svg simple-fill-color-dynamic-ref.svg
-fuzzy-if(webrender&&!gtkWidget,125-127,253-254) == simple-fill-color.svg simple-fill-color-ref.html
+fuzzy-if(webrender&&!gtkWidget,125-127,221-254) == simple-fill-color.svg simple-fill-color-ref.html
== simple-fill-gradient.svg simple-fill-gradient-ref.svg
== simple-fill-none.svg simple.svg
== simple-pointer-events.svg simple.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,249-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!gtkWidget,122-127,221-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html # Bug 1392106
== simple-multiple-dx-2.svg simple-multiple-dx.svg
== simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi-ref.svg
== simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi-ref.svg
@@ -43,7 +43,7 @@ fuzzy-if(skiaContent,0-1,0-2) == simple-multiple-dx-anchor-middle-rtl.svg simple
== simple-multiple-dx-rtl.svg simple-multiple-dx-rtl-ref.svg
== simple-multiple-dx-rtl-2.svg simple-multiple-dx-rtl.svg
-fuzzy-if(webrender&&!gtkWidget,132-134,205-206) == simple-rtl.svg simple-rtl-ref.html
+fuzzy-if(webrender&&!gtkWidget,132-138,183-206) == simple-rtl.svg simple-rtl-ref.html
== simple-rtl-2.svg simple-rtl.svg
== simple-transform-rotate.svg simple-transform-rotate-ref.svg
@@ -196,10 +196,10 @@ needs-focus == deselectAll.svg deselectAll-ref.svg
fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString.svg selectSubString-ref.svg
fuzzy-if(skiaContent,0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,251-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
-fuzzy-if(skiaContent,0-1,0-100) fuzzy-if(webrender,1-1,575-575) needs-focus fuzzy-if(webrender&&!gtkWidget,134-148,294-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
-fuzzy-if(skiaContent,0-1,0-50) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,253-254) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
-fuzzy-if(skiaContent,0-1,0-150) fuzzy-if(webrender,1-1,222-222) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,251-254) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
-fuzzy-if(skiaContent,0-1,0-300) fuzzy-if(webrender,1-1,934-934) needs-focus fuzzy-if(webrender&&!gtkWidget,134-152,494-501) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
+fuzzy-if(skiaContent,0-1,0-100) fuzzy-if(webrender,1-1,575-575) needs-focus fuzzy-if(webrender&&!gtkWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
+fuzzy-if(skiaContent,0-1,0-50) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
+fuzzy-if(skiaContent,0-1,0-150) fuzzy-if(webrender,1-1,222-222) needs-focus fuzzy-if(webrender&&!gtkWidget,127-148,221-254) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
+fuzzy-if(skiaContent,0-1,0-300) fuzzy-if(webrender,1-1,934-934) needs-focus fuzzy-if(webrender&&!gtkWidget,134-152,432-501) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
fuzzy-if(skiaContent,0-1,0-200) needs-focus == textpath-selection.svg textpath-selection-ref.svg
diff --git a/layout/reftests/text-overflow/reftest.list b/layout/reftests/text-overflow/reftest.list
index f07fbde06e98c..4160d01c21799 100644
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -5,7 +5,7 @@ fuzzy-if(Android,0-16,0-244) fuzzy-if(webrender,0-47,0-6) == marker-basic.html m
skip-if(Android) fuzzy-if(webrender,0-47,0-18) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-124,0-289) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
fuzzy-if(Android,0-24,0-4000) fuzzy-if(cocoaWidget,0-1,0-40) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-149,0-1836) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
-fuzzy(0-16,0-454) fails-if(gtkWidget) fuzzy-if(webrender&&!gtkWidget,50-85,459-499) skip-if(OSX&&!isDebugBuild&&verify) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103, fuzzy: subpixel aa
+fuzzy(0-16,0-454) fails-if(gtkWidget) fuzzy-if(webrender&&!gtkWidget,50-85,454-499) skip-if(OSX&&!isDebugBuild&&verify) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103, fuzzy: subpixel aa
fuzzy-if(webrender,0-47,0-3) == false-marker-overlap.html false-marker-overlap-ref.html
== visibility-hidden.html visibility-hidden-ref.html
fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-1724) fuzzy-if(gtkWidget,0-10,0-8) fuzzy-if(webrender,0-47,0-24) == block-padding.html block-padding-ref.html
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 8d1ebf514def0..ba6c1d9bf9aee 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -11,7 +11,7 @@ fuzzy-if(webrender,0-1,0-6) == rotatey-1a.html rotatey-1-ref.html
== rotatex-perspective-1c.html rotatex-1-ref.html
== rotatex-perspective-3a.html rotatex-perspective-3-ref.html
== scalez-1a.html scalez-1-ref.html
-fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(cocoaWidget,0-17,0-4) fuzzy-if(skiaContent,0-16,0-286) fuzzy-if(webrender&&winWidget,92-92,291-291) fuzzy-if(webrender&&cocoaWidget,126-126,380-380) == preserve3d-1a.html preserve3d-1-ref.html
+fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(cocoaWidget,0-17,0-4) fuzzy-if(skiaContent,0-16,0-286) fuzzy-if(webrender&&winWidget,92-92,240-291) fuzzy-if(webrender&&cocoaWidget,126-126,380-380) == preserve3d-1a.html preserve3d-1-ref.html
== preserve3d-1b.html about:blank
== preserve3d-clipped.html about:blank
== preserve3d-2a.html preserve3d-2-ref.html
diff --git a/layout/reftests/w3c-css/submitted/contain/reftest.list b/layout/reftests/w3c-css/submitted/contain/reftest.list
index 069cbacd14500..09a6e43408b6c 100644
--- a/layout/reftests/w3c-css/submitted/contain/reftest.list
+++ b/layout/reftests/w3c-css/submitted/contain/reftest.list
@@ -22,7 +22,7 @@ pref(layout.css.overflow-clip-box.enabled,true) == contain-paint-clip-006.html c
== contain-size-block-001.html contain-size-block-001-ref.html
== contain-size-inline-block-001.html contain-size-inline-block-001-ref.html
== contain-size-flex-001.html contain-size-flex-001-ref.html
-fuzzy-if(webrender&&winWidget,0-3,0-2) == contain-size-inline-flex-001.html contain-size-inline-flex-001-ref.html # bug 1474093
+fuzzy-if(webrender&&winWidget,0-24,0-2) == contain-size-inline-flex-001.html contain-size-inline-flex-001-ref.html # bug 1474093
== contain-size-grid-001.html contain-size-grid-001-ref.html
== contain-size-multicol-001.html contain-size-multicol-001-ref.html
== contain-size-fieldset-001.html contain-size-fieldset-001-ref.html
diff --git a/layout/style/ServoCSSPropList.mako.py b/layout/style/ServoCSSPropList.mako.py
index 48d52eef36e89..0ede99179e22c 100644
--- a/layout/style/ServoCSSPropList.mako.py
+++ b/layout/style/ServoCSSPropList.mako.py
@@ -107,6 +107,7 @@ def method(prop):
"Resize",
"Scale",
"TextAlign",
+ "Translate",
"TimingFunction",
"TransformStyle",
"background::BackgroundSize",
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index bba5b61672cbc..63e7b1e277204 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1294,85 +1294,6 @@ ReadIndividualTransformValue(nsCSSValueSharedList* aList,
return val.forget();
}
-already_AddRefed
-nsComputedDOMStyle::DoGetTranslate()
-{
- typedef nsStyleTransformMatrix::TransformReferenceBox TransformReferenceBox;
-
- RefPtr self(this);
- return ReadIndividualTransformValue(StyleDisplay()->mSpecifiedTranslate,
- [self](const nsCSSValue::Array* aData, nsString& aResult) {
- TransformReferenceBox refBox(self->mInnerFrame, nsSize(0, 0));
-
- // Even though the spec doesn't say to resolve percentage values, Blink
- // and Edge do and so until that is clarified we do as well:
- //
- // https://github.com/w3c/csswg-drafts/issues/2124
- switch (nsStyleTransformMatrix::TransformFunctionOf(aData)) {
- /* translate : */
- case eCSSKeyword_translatex: {
- MOZ_ASSERT(aData->Count() == 2, "Invalid array!");
- float tx = ProcessTranslatePart(aData->Item(1),
- &refBox,
- &TransformReferenceBox::Width);
- aResult.AppendFloat(tx);
- aResult.AppendLiteral("px");
- break;
- }
- /* translate : */
- case eCSSKeyword_translate: {
- MOZ_ASSERT(aData->Count() == 3, "Invalid array!");
- float tx = ProcessTranslatePart(aData->Item(1),
- &refBox,
- &TransformReferenceBox::Width);
- aResult.AppendFloat(tx);
- aResult.AppendLiteral("px");
-
- float ty = ProcessTranslatePart(aData->Item(2),
- &refBox,
- &TransformReferenceBox::Height);
- if (ty != 0) {
- aResult.AppendLiteral(" ");
- aResult.AppendFloat(ty);
- aResult.AppendLiteral("px");
- }
- break;
- }
- /* translate : */
- case eCSSKeyword_translate3d: {
- MOZ_ASSERT(aData->Count() == 4, "Invalid array!");
- float tx = ProcessTranslatePart(aData->Item(1),
- &refBox,
- &TransformReferenceBox::Width);
- aResult.AppendFloat(tx);
- aResult.AppendLiteral("px");
-
- float ty = ProcessTranslatePart(aData->Item(2),
- &refBox,
- &TransformReferenceBox::Height);
-
- float tz = ProcessTranslatePart(aData->Item(3),
- &refBox,
- nullptr);
- if (ty != 0. || tz != 0.) {
- aResult.AppendLiteral(" ");
- aResult.AppendFloat(ty);
- aResult.AppendLiteral("px");
- }
- if (tz != 0.) {
- aResult.AppendLiteral(" ");
- aResult.AppendFloat(tz);
- aResult.AppendLiteral("px");
- }
-
- break;
- }
- default:
- MOZ_ASSERT_UNREACHABLE("Unexpected CSS keyword.");
- }
- });
-}
-
already_AddRefed
nsComputedDOMStyle::DoGetRotate()
{
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 50c65a269dfcb..02f21107cdb88 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -365,7 +365,6 @@ class nsComputedDOMStyle final : public nsDOMCSSDeclaration
already_AddRefed DoGetOverflowClipBoxInline();
already_AddRefed DoGetTouchAction();
already_AddRefed DoGetTransform();
- already_AddRefed DoGetTranslate();
already_AddRefed DoGetRotate();
already_AddRefed DoGetTransformOrigin();
already_AddRefed DoGetPerspective();
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 558f7cf5d4298..25c8bd0416e8e 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -708,6 +708,9 @@ pref("layers.enable-tiles", true);
// Enable the dynamic toolbar
pref("browser.chrome.dynamictoolbar", true);
+// Location Bar AutoComplete.
+pref("browser.urlbar.autocomplete.enabled", true);
+
// Hide common parts of URLs like "www." or "http://"
pref("browser.urlbar.trimURLs", true);
diff --git a/servo/components/style/properties/helpers/animated_properties.mako.rs b/servo/components/style/properties/helpers/animated_properties.mako.rs
index 2ab27687241e3..85dfee7411028 100644
--- a/servo/components/style/properties/helpers/animated_properties.mako.rs
+++ b/servo/components/style/properties/helpers/animated_properties.mako.rs
@@ -2102,12 +2102,12 @@ impl Matrix3D {
///
impl ComputedRotate {
- fn resolve(rotate: &ComputedRotate) -> (Number, Number, Number, Angle) {
+ fn resolve(&self) -> (Number, Number, Number, Angle) {
// According to the spec:
// https://drafts.csswg.org/css-transforms-2/#individual-transforms
//
// If the axis is unspecified, it defaults to "0 0 1"
- match *rotate {
+ match *self {
Rotate::None => (0., 0., 1., Angle::zero()),
Rotate::Rotate3D(rx, ry, rz, angle) => (rx, ry, rz, angle),
Rotate::Rotate(angle) => (0., 0., 1., angle),
@@ -2122,8 +2122,7 @@ impl Animate for ComputedRotate {
other: &Self,
procedure: Procedure,
) -> Result {
- let from = ComputedRotate::resolve(self);
- let to = ComputedRotate::resolve(other);
+ let (from, to) = (self.resolve(), other.resolve());
let (mut fx, mut fy, mut fz, fa) =
transform::get_normalized_vector_and_angle(from.0, from.1, from.2, from.3);
@@ -2163,24 +2162,17 @@ impl Animate for ComputedRotate {
///
impl ComputedTranslate {
- fn resolve(
- translate: &ComputedTranslate,
- ) -> (LengthOrPercentage, LengthOrPercentage, Length) {
+ fn resolve(&self) -> (LengthOrPercentage, LengthOrPercentage, Length) {
// According to the spec:
// https://drafts.csswg.org/css-transforms-2/#individual-transforms
//
// Unspecified translations default to 0px
- match *translate {
+ match *self {
Translate::None => {
- (
- LengthOrPercentage::Length(Length::zero()),
- LengthOrPercentage::Length(Length::zero()),
- Length::zero(),
- )
+ (LengthOrPercentage::zero(), LengthOrPercentage::zero(), Length::zero())
},
Translate::Translate3D(tx, ty, tz) => (tx, ty, tz),
Translate::Translate(tx, ty) => (tx, ty, Length::zero()),
- Translate::TranslateX(tx) => (tx, LengthOrPercentage::Length(Length::zero()), Length::zero()),
}
}
}
@@ -2192,23 +2184,31 @@ impl Animate for ComputedTranslate {
other: &Self,
procedure: Procedure,
) -> Result {
- let from = ComputedTranslate::resolve(self);
- let to = ComputedTranslate::resolve(other);
-
- Ok(Translate::Translate3D(from.0.animate(&to.0, procedure)?,
- from.1.animate(&to.1, procedure)?,
- from.2.animate(&to.2, procedure)?))
+ match (self, other) {
+ (&Translate::None, &Translate::None) => Ok(Translate::None),
+ (&Translate::Translate3D(_, ..), _) | (_, &Translate::Translate3D(_, ..)) => {
+ let (from, to) = (self.resolve(), other.resolve());
+ Ok(Translate::Translate3D(from.0.animate(&to.0, procedure)?,
+ from.1.animate(&to.1, procedure)?,
+ from.2.animate(&to.2, procedure)?))
+ },
+ (&Translate::Translate(_, ..), _) | (_, &Translate::Translate(_, ..)) => {
+ let (from, to) = (self.resolve(), other.resolve());
+ Ok(Translate::Translate(from.0.animate(&to.0, procedure)?,
+ from.1.animate(&to.1, procedure)?))
+ },
+ }
}
}
///
impl ComputedScale {
- fn resolve(scale: &ComputedScale) -> (Number, Number, Number) {
+ fn resolve(&self) -> (Number, Number, Number) {
// According to the spec:
// https://drafts.csswg.org/css-transforms-2/#individual-transforms
//
// Unspecified scales default to 1
- match *scale {
+ match *self {
Scale::None => (1.0, 1.0, 1.0),
Scale::Scale3D(sx, sy, sz) => (sx, sy, sz),
Scale::Scale(sx, sy) => (sx, sy, 1.),
@@ -2226,8 +2226,7 @@ impl Animate for ComputedScale {
match (self, other) {
(&Scale::None, &Scale::None) => Ok(Scale::None),
(&Scale::Scale3D(_, ..), _) | (_, &Scale::Scale3D(_, ..)) => {
- let from = ComputedScale::resolve(self);
- let to = ComputedScale::resolve(other);
+ let (from, to) = (self.resolve(), other.resolve());
// FIXME(emilio, bug 1464791): why does this do something different than
// Scale3D / TransformOperation::Scale3D?
if procedure == Procedure::Add {
@@ -2241,8 +2240,7 @@ impl Animate for ComputedScale {
))
},
(&Scale::Scale(_, ..), _) | (_, &Scale::Scale(_, ..)) => {
- let from = ComputedScale::resolve(self);
- let to = ComputedScale::resolve(other);
+ let (from, to) = (self.resolve(), other.resolve());
// FIXME(emilio, bug 1464791): why does this do something different than
// Scale / TransformOperation::Scale?
if procedure == Procedure::Add {
diff --git a/servo/components/style/properties/longhands/box.mako.rs b/servo/components/style/properties/longhands/box.mako.rs
index c06ed16a22e6f..685e97aa3b06c 100644
--- a/servo/components/style/properties/longhands/box.mako.rs
+++ b/servo/components/style/properties/longhands/box.mako.rs
@@ -370,7 +370,7 @@ ${helpers.predefined_type(
"generics::transform::Translate::None",
animation_value_type="ComputedValue",
boxed=True,
- flags="CREATES_STACKING_CONTEXT FIXPOS_CB GETCS_NEEDS_LAYOUT_FLUSH",
+ flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
gecko_pref="layout.css.individual-transform.enabled",
spec="https://drafts.csswg.org/css-transforms-2/#individual-transforms",
servo_restyle_damage="reflow_out_of_flow",
diff --git a/servo/components/style/values/computed/length.rs b/servo/components/style/values/computed/length.rs
index 3a3242a386b53..d01824bac9561 100644
--- a/servo/components/style/values/computed/length.rs
+++ b/servo/components/style/values/computed/length.rs
@@ -14,6 +14,7 @@ use style_traits::{CssWriter, ToCss};
use values::animated::{Animate, Procedure, ToAnimatedValue, ToAnimatedZero};
use values::distance::{ComputeSquaredDistance, SquaredDistance};
use values::generics::length::{MaxLength as GenericMaxLength, MozLength as GenericMozLength};
+use values::generics::transform::IsZeroLength;
use values::generics::NonNegative;
use values::specified::length::ViewportPercentageLength;
use values::specified::length::{AbsoluteLength, FontBaseSize, FontRelativeLength};
@@ -494,6 +495,17 @@ impl ToComputedValue for specified::LengthOrPercentage {
}
}
+impl IsZeroLength for LengthOrPercentage {
+ #[inline]
+ fn is_zero_length(&self) -> bool {
+ match *self {
+ LengthOrPercentage::Length(l) => l.0 == 0.0,
+ LengthOrPercentage::Percentage(p) => p.0 == 0.0,
+ LengthOrPercentage::Calc(c) => c.unclamped_length().0 == 0.0 && c.percentage() == 0.0,
+ }
+ }
+}
+
#[allow(missing_docs)]
#[animate(fallback = "Self::animate_fallback")]
#[css(derive_debug)]
diff --git a/servo/components/style/values/computed/transform.rs b/servo/components/style/values/computed/transform.rs
index e937b95c77fbf..3ddd0dfcd4b53 100644
--- a/servo/components/style/values/computed/transform.rs
+++ b/servo/components/style/values/computed/transform.rs
@@ -334,7 +334,6 @@ impl Translate {
pub fn to_transform_operation(&self) -> Option {
match *self {
generic::Translate::None => None,
- generic::Translate::TranslateX(tx) => Some(generic::TransformOperation::TranslateX(tx)),
generic::Translate::Translate(tx, ty) => {
Some(generic::TransformOperation::Translate(tx, Some(ty)))
},
@@ -347,7 +346,6 @@ impl Translate {
/// Convert Translate to TransformOperation.
pub fn from_transform_operation(operation: &TransformOperation) -> Translate {
match *operation {
- generic::TransformOperation::TranslateX(tx) => generic::Translate::TranslateX(tx),
generic::TransformOperation::Translate(tx, Some(ty)) => {
generic::Translate::Translate(tx, ty)
},
diff --git a/servo/components/style/values/generics/transform.rs b/servo/components/style/values/generics/transform.rs
index 1eb46b0bd1d2b..c154614d9789c 100644
--- a/servo/components/style/values/generics/transform.rs
+++ b/servo/components/style/values/generics/transform.rs
@@ -610,7 +610,6 @@ impl ToCss for Scale {
SpecifiedValueInfo,
ToAnimatedZero,
ToComputedValue,
- ToCss,
)]
/// A value of the `Translate` property
///
@@ -618,14 +617,56 @@ impl ToCss for Scale {
pub enum Translate {
/// 'none'
None,
- /// ''
- TranslateX(LengthOrPercentage),
- /// ' '
+ /// '' or ' '
Translate(LengthOrPercentage, LengthOrPercentage),
/// ' '
Translate3D(LengthOrPercentage, LengthOrPercentage, Length),
}
+/// A trait to check if this is a zero length.
+/// An alternative way is use num_traits::Zero. However, in order to implement num_traits::Zero,
+/// we also have to implement Add, which may be complicated for LengthOrPercentage::Calc.
+/// We could do this if other types also need it. If so, we could drop this trait.
+pub trait IsZeroLength {
+ /// Returns true if this is a zero length.
+ fn is_zero_length(&self) -> bool;
+}
+
+impl ToCss for Translate {
+ fn to_css(&self, dest: &mut CssWriter) -> fmt::Result
+ where
+ W: fmt::Write,
+ {
+ // The spec says:
+ // 1. If a 2d translation is specified, the property must serialize with only one or two
+ // values (per usual, if the second value is 0px, the default, it must be omitted when
+ // serializing).
+ // 2. If a 3d translation is specified, all three values must be serialized.
+ // https://drafts.csswg.org/css-transforms-2/#individual-transform-serialization
+ //
+ // We don't omit the 3rd component even if it is 0px for now, and the related
+ // spec issue is https://github.com/w3c/csswg-drafts/issues/3305
+ match *self {
+ Translate::None => dest.write_str("none"),
+ Translate::Translate(ref x, ref y) => {
+ x.to_css(dest)?;
+ if !y.is_zero_length() {
+ dest.write_char(' ')?;
+ y.to_css(dest)?;
+ }
+ Ok(())
+ },
+ Translate::Translate3D(ref x, ref y, ref z) => {
+ x.to_css(dest)?;
+ dest.write_char(' ')?;
+ y.to_css(dest)?;
+ dest.write_char(' ')?;
+ z.to_css(dest)
+ },
+ }
+ }
+}
+
#[allow(missing_docs)]
#[derive(
Clone, Copy, Debug, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToComputedValue, ToCss,
diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs
index 535cf6f65eeb8..4e9eda2277e9c 100644
--- a/servo/components/style/values/specified/length.rs
+++ b/servo/components/style/values/specified/length.rs
@@ -19,6 +19,7 @@ use style_traits::{ParseError, SpecifiedValueInfo, StyleParseErrorKind};
use values::computed::{self, CSSPixelLength, Context, ExtremumLength};
use values::generics::length::{MaxLength as GenericMaxLength, MozLength as GenericMozLength};
use values::generics::NonNegative;
+use values::generics::transform::IsZeroLength;
use values::specified::calc::CalcNode;
use values::{Auto, CSSFloat, Either, IsAuto, Normal};
@@ -97,6 +98,16 @@ impl FontBaseSize {
}
impl FontRelativeLength {
+ /// Return true if this is a zero value.
+ fn is_zero(&self) -> bool {
+ match *self {
+ FontRelativeLength::Em(v) |
+ FontRelativeLength::Ex(v) |
+ FontRelativeLength::Ch(v) |
+ FontRelativeLength::Rem(v) => v == 0.0,
+ }
+ }
+
/// Computes the font-relative length.
pub fn to_computed_value(&self, context: &Context, base_size: FontBaseSize) -> CSSPixelLength {
use std::f32;
@@ -230,6 +241,16 @@ pub enum ViewportPercentageLength {
}
impl ViewportPercentageLength {
+ /// Return true if this is a zero value.
+ fn is_zero(&self) -> bool {
+ match *self {
+ ViewportPercentageLength::Vw(v) |
+ ViewportPercentageLength::Vh(v) |
+ ViewportPercentageLength::Vmin(v) |
+ ViewportPercentageLength::Vmax(v) => v == 0.0,
+ }
+ }
+
/// Computes the given viewport-relative length for the given viewport size.
pub fn to_computed_value(&self, viewport_size: Size2D) -> CSSPixelLength {
let (factor, length) = match *self {
@@ -485,6 +506,18 @@ impl NoCalcLength {
impl SpecifiedValueInfo for NoCalcLength {}
+impl IsZeroLength for NoCalcLength {
+ #[inline]
+ fn is_zero_length(&self) -> bool {
+ match *self {
+ NoCalcLength::Absolute(v) => v.is_zero(),
+ NoCalcLength::FontRelative(v) => v.is_zero(),
+ NoCalcLength::ViewportPercentage(v) => v.is_zero(),
+ NoCalcLength::ServoCharacterWidth(v) => v.0 == 0,
+ }
+ }
+}
+
/// An extension to `NoCalcLength` to parse `calc` expressions.
/// This is commonly used for the `` values.
///
@@ -839,6 +872,17 @@ impl LengthOrPercentage {
}
}
+impl IsZeroLength for LengthOrPercentage {
+ #[inline]
+ fn is_zero_length(&self) -> bool {
+ match *self {
+ LengthOrPercentage::Length(l) => l.is_zero_length(),
+ LengthOrPercentage::Percentage(p) => p.0 == 0.0,
+ LengthOrPercentage::Calc(_) => false,
+ }
+ }
+}
+
/// Either a ``, a ``, or the `auto` keyword.
#[allow(missing_docs)]
#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss)]
diff --git a/servo/components/style/values/specified/transform.rs b/servo/components/style/values/specified/transform.rs
index d397d3d36074e..2d38a071a5d03 100644
--- a/servo/components/style/values/specified/transform.rs
+++ b/servo/components/style/values/specified/transform.rs
@@ -395,7 +395,7 @@ impl Parse for Translate {
}
// 'translate: '
- Ok(generic::Translate::TranslateX(tx))
+ Ok(generic::Translate::Translate(tx, specified::LengthOrPercentage::zero()))
}
}
diff --git a/testing/web-platform/meta/audio-output/setSinkId.html.ini b/testing/web-platform/meta/audio-output/setSinkId.html.ini
index e9f5ba7f10a7e..d53c535e46498 100644
--- a/testing/web-platform/meta/audio-output/setSinkId.html.ini
+++ b/testing/web-platform/meta/audio-output/setSinkId.html.ini
@@ -1,6 +1,2 @@
[setSinkId.html]
prefs: [media.setsinkid.enabled:true]
- [List device, setSinkId should be allowed on the default, the rest of the devices will get a NotAllowedError]
- expected:
- if os == "android": FAIL
-
diff --git a/testing/web-platform/meta/audio-output/setSinkId.https.html.ini b/testing/web-platform/meta/audio-output/setSinkId.https.html.ini
index 0c117127649a5..e77f0a6ac9fee 100644
--- a/testing/web-platform/meta/audio-output/setSinkId.https.html.ini
+++ b/testing/web-platform/meta/audio-output/setSinkId.https.html.ini
@@ -1,6 +1,2 @@
[setSinkId.https.html]
prefs: [media.setsinkid.enabled:true]
- [List device, setSinkId should be allowed on the default, the rest of the devices will get a NotAllowedError]
- expected:
- if os == "android": FAIL
-
diff --git a/testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini b/testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini
index f0bf87b05aad6..e5bd78968add0 100644
--- a/testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini
@@ -1,22 +1,11 @@
[translate-interpolation.html]
- [Animation between "none" and "8px 80% 800px" at progress 0]
- expected: FAIL
-
- [Animation between "none" and "none" at progress -1]
- expected: FAIL
-
- [Animation between "none" and "none" at progress 0]
- expected: FAIL
-
- [Animation between "none" and "none" at progress 0.125]
- expected: FAIL
-
- [Animation between "none" and "none" at progress 0.875]
+ [Animation between "480px 400px 320px" and "240% 160%" at progress 0]
expected: FAIL
-
- [Animation between "none" and "none" at progress 1]
+ bug: https://github.com/w3c/csswg-drafts/issues/3290
+ [Animation between "480px 400px 320px" and "240% 160%" at progress 1]
expected: FAIL
+ bug: https://github.com/w3c/csswg-drafts/issues/3290
- [Animation between "none" and "none" at progress 2]
+ [Animation between "none" and "8px 80% 800px" at progress 0]
expected: FAIL
-
+ bug: https://github.com/w3c/csswg-drafts/issues/3290
diff --git a/testing/web-platform/meta/css/css-transforms/transforms-support-calc.html.ini b/testing/web-platform/meta/css/css-transforms/transforms-support-calc.html.ini
deleted file mode 100644
index 1954265ee6352..0000000000000
--- a/testing/web-platform/meta/css/css-transforms/transforms-support-calc.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transforms-support-calc.html]
- [translate supports calc]
- expected: FAIL
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-margin-003.html b/testing/web-platform/tests/css/css-multicol/multicol-margin-003.html
new file mode 100644
index 0000000000000..769bcc79259c6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-margin-003.html
@@ -0,0 +1,47 @@
+
+
+
+ CSS Multi-column Layout Test: multi-column and margin bottom of last child
+
+
+
+
+
+
+
+
+
+
+
+ b1 b2
+
+
+
+
diff --git a/testing/web-platform/tests/css/css-transforms/parsing/translate-parsing-valid.html b/testing/web-platform/tests/css/css-transforms/parsing/translate-parsing-valid.html
index fe16d545e1f92..e000f6a7f577a 100644
--- a/testing/web-platform/tests/css/css-transforms/parsing/translate-parsing-valid.html
+++ b/testing/web-platform/tests/css/css-transforms/parsing/translate-parsing-valid.html
@@ -17,9 +17,12 @@
test_valid_value("translate", "0px");
test_valid_value("translate", "100%");
+test_valid_value("translate", "100px 0px", "100px");
+test_valid_value("translate", "100px 0%", "100px");
test_valid_value("translate", "100px 200%");
test_valid_value("translate", "100% 200px");
+test_valid_value("translate", "100px 200px 0px");
test_valid_value("translate", "100px 200px 300px");
test_valid_value("translate", "100% 200% 300px");
diff --git a/testing/web-platform/tests/css/css-transforms/transforms-support-calc.html b/testing/web-platform/tests/css/css-transforms/transforms-support-calc.html
index 71a046f56b010..1ad1bcc4b68c5 100644
--- a/testing/web-platform/tests/css/css-transforms/transforms-support-calc.html
+++ b/testing/web-platform/tests/css/css-transforms/transforms-support-calc.html
@@ -31,7 +31,7 @@
test(function(){
target.style = 'translate: calc(30px + 20%) calc(-200px + 100%);';
- assert_equals(getComputedStyle(target).translate, 'calc(30px + 20%) calc(-200px + 100%)');
+ assert_equals(getComputedStyle(target).translate, 'calc(20% + 30px) calc(100% - 200px)');
}, 'translate supports calc');
test(function(){
diff --git a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
index a71783b99e143..5d1f9630b82da 100644
--- a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
+++ b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
@@ -1885,7 +1885,7 @@ const translateListType = {
1000
);
testAnimationSamples(animation, idlName,
- [{ time: 500, expected: '200px -25.5px 200px' }]);
+ [{ time: 500, expected: '200px calc(25% - 50.5px) 200px' }]);
}, `${property} with combination of percentages and lengths`);
},
testAddition: function(property, setup) {
@@ -1924,8 +1924,8 @@ const translateListType = {
{ duration: 1000, fill: 'both',
composite: 'add' });
testAnimationSamples(animation, idlName,
- [ { time: 0, expected: '-150px' },
- { time: 1000, expected: '550px' }]);
+ [ { time: 0, expected: 'calc(50% - 200px)' },
+ { time: 1000, expected: 'calc(50% + 500px)' }]);
}, `${property} with underlying percentage value`);
},
diff --git a/third_party/rust/dwrote/.cargo-checksum.json b/third_party/rust/dwrote/.cargo-checksum.json
index f030bdb239e7b..e881f905556bb 100644
--- a/third_party/rust/dwrote/.cargo-checksum.json
+++ b/third_party/rust/dwrote/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"7e1857aa6b66b8e3cd0840ac83e287cff0cd2078cd0a27a7aea9816af526e31e","README.md":"d69d75705e2582721cbfb2d3b4b2af052c71679057a0b2ac53a22c03f1755bba","appveyor.yml":"7c1e0718a363d3567cecd1ef772d4e17c2a17f18906dc464dce8a2411adff6be","src/bitmap_render_target.rs":"fc13525d7459515e4bf9769c8a8961b046b4d1ba4042591aaf0925dd5edebf64","src/com_helpers.rs":"02535b27bfb0cee6e4d8db3abd22f2d2e8137a4ce3ab3504beaf4fa3ca9370df","src/comptr.rs":"84794cf04b772398e75fdb5d55fd8fa015abf26c61b1f9c761a597133682b2e1","src/font.rs":"a79b944f2f5125bbef9e24921355dc6996f073e3742ddd410b8efaa0df3a3ee2","src/font_collection.rs":"df3767b305e9981fbe9398d9982123c668fb2a38cd92f5bdbaf574353005378d","src/font_collection_impl.rs":"a585a6ce62083b3346d67619ea47fec46423a7fb04cc11372828389ab26c5a05","src/font_face.rs":"55d3ddef22be160b9b9a0ffd677993290b0df0f847e7dbcce4014a222490205e","src/font_family.rs":"4e948542dba0c158187d0cb2d72343c443380480cacd12894070d0ef1351dd0a","src/font_file.rs":"1c012d0b436c2831d31cd76f77a59dab1edc5d63881c495eb486cd4febe23031","src/font_file_loader_impl.rs":"71c4153971dbfc21d42ba2e33f159fcb145f7dcfbd17e856e9fd75f0571d41e0","src/gdi_interop.rs":"04dbef7c34bb0fe62c4f2c2ceca62ca94c75a964d744b29b3322a6c3bbb4eabd","src/geometry_sink_impl.rs":"d615de212e55b8b8d95c8d605fc5d78044b4ae4dfd846f706911a16cc3afc049","src/glyph_run_analysis.rs":"3b2a351422098a19e8f490421e5b19227fc14a41a0df97d488c536fd1d4b552c","src/helpers.rs":"2f3c57642b24b80c45bbd012e7d6ca1fc524b1b42a8be004cb9b52ea13f4166d","src/lib.rs":"b634e62dd088d804429f451ba9f14aaab0b6a1179042d70fed825f3253ffacfb","src/outline_builder.rs":"0f5c842b2ffe75e21d68f93be6a3834c120bd43303d4e490fdfee9f4f964cdc4","src/rendering_params.rs":"850a51143790f5d29422dc49cbceddc232d814ecd0e6933434ad644e6eec539b","src/test.rs":"158aa4d03655f4efef00327fe72a03dfb504659176aa0eef976ca2485b2c1d74","src/types.rs":"587aea2e50720e85b28efe237c8ea10bc45b52049ca724447a0fc9b0e6672b11"},"package":"8b5a0af6d47ecf67355dc36e5fc09547050bd8a4b87870e637911ffe4aced32a"}
\ No newline at end of file
+{"files":{"Cargo.toml":"8a5134cca9cb028685157e5cf14e3c3196a84bcb03361545bce9893997fefe74","README.md":"d69d75705e2582721cbfb2d3b4b2af052c71679057a0b2ac53a22c03f1755bba","appveyor.yml":"7c1e0718a363d3567cecd1ef772d4e17c2a17f18906dc464dce8a2411adff6be","src/bitmap_render_target.rs":"fc13525d7459515e4bf9769c8a8961b046b4d1ba4042591aaf0925dd5edebf64","src/com_helpers.rs":"02535b27bfb0cee6e4d8db3abd22f2d2e8137a4ce3ab3504beaf4fa3ca9370df","src/comptr.rs":"84794cf04b772398e75fdb5d55fd8fa015abf26c61b1f9c761a597133682b2e1","src/font.rs":"a79b944f2f5125bbef9e24921355dc6996f073e3742ddd410b8efaa0df3a3ee2","src/font_collection.rs":"df3767b305e9981fbe9398d9982123c668fb2a38cd92f5bdbaf574353005378d","src/font_collection_impl.rs":"a585a6ce62083b3346d67619ea47fec46423a7fb04cc11372828389ab26c5a05","src/font_face.rs":"7f78c4132df39857d8118ac3eacbb57e11bca1d69f9d7f8e1c1c24b7a2b69749","src/font_family.rs":"4e948542dba0c158187d0cb2d72343c443380480cacd12894070d0ef1351dd0a","src/font_file.rs":"1c012d0b436c2831d31cd76f77a59dab1edc5d63881c495eb486cd4febe23031","src/font_file_loader_impl.rs":"71c4153971dbfc21d42ba2e33f159fcb145f7dcfbd17e856e9fd75f0571d41e0","src/gdi_interop.rs":"04dbef7c34bb0fe62c4f2c2ceca62ca94c75a964d744b29b3322a6c3bbb4eabd","src/geometry_sink_impl.rs":"d615de212e55b8b8d95c8d605fc5d78044b4ae4dfd846f706911a16cc3afc049","src/glyph_run_analysis.rs":"3b2a351422098a19e8f490421e5b19227fc14a41a0df97d488c536fd1d4b552c","src/helpers.rs":"2f3c57642b24b80c45bbd012e7d6ca1fc524b1b42a8be004cb9b52ea13f4166d","src/lib.rs":"b634e62dd088d804429f451ba9f14aaab0b6a1179042d70fed825f3253ffacfb","src/outline_builder.rs":"0f5c842b2ffe75e21d68f93be6a3834c120bd43303d4e490fdfee9f4f964cdc4","src/rendering_params.rs":"850a51143790f5d29422dc49cbceddc232d814ecd0e6933434ad644e6eec539b","src/test.rs":"158aa4d03655f4efef00327fe72a03dfb504659176aa0eef976ca2485b2c1d74","src/types.rs":"587aea2e50720e85b28efe237c8ea10bc45b52049ca724447a0fc9b0e6672b11"},"package":"18e895b763d82cafef31c7c1e2f4f17fb70f385ac651b0918a46ff5790664a63"}
\ No newline at end of file
diff --git a/third_party/rust/dwrote/Cargo.toml b/third_party/rust/dwrote/Cargo.toml
index 15f09a398f05a..35bfcb6496773 100644
--- a/third_party/rust/dwrote/Cargo.toml
+++ b/third_party/rust/dwrote/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "dwrote"
-version = "0.6.0"
+version = "0.6.1"
authors = ["Vladimir Vukicevic "]
description = "Lightweight binding to DirectWrite."
license = "MPL-2.0"
diff --git a/third_party/rust/dwrote/src/font_face.rs b/third_party/rust/dwrote/src/font_face.rs
index 365d68225927c..0ec3f87a7da0f 100644
--- a/third_party/rust/dwrote/src/font_face.rs
+++ b/third_party/rust/dwrote/src/font_face.rs
@@ -194,7 +194,7 @@ impl FontFace {
rendering_params,
&mut render_mode);
- if !(hr != 0) {
+ if hr != 0 {
return DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC;
}
diff --git a/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js b/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
index 824725856a845..b3c475248a007 100644
--- a/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
+++ b/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
@@ -52,8 +52,7 @@ add_task(async function simple_navigation() {
await BrowserTestUtils.synthesizeMouseAtCenter("#regular_load", {}, browser);
let windowContext = await dialogAppeared;
- is(windowContext.gBrowser.selectedBrowser.currentURI.spec, PAGE_URL,
- "got the right windowContext");
+ is(windowContext, browser.ownerGlobal, "got the right windowContext");
});
});
@@ -70,8 +69,7 @@ async function testNewTab(browser) {
await BrowserTestUtils.synthesizeMouseAtCenter("#target_blank", {}, browser);
let windowContext = await dialogAppeared;
- is(windowContext.gBrowser.selectedBrowser.currentURI.spec, targetURL,
- "got the right windowContext");
+ is(windowContext, browser.ownerGlobal, "got the right windowContext");
let [ tab, closingPromise ] = await tabOpened;
await closingPromise;
is(tab.linkedBrowser, null, "tab was opened and closed");
@@ -101,8 +99,7 @@ add_task(async function new_window() {
let windowContext = await dialogAppeared;
- is(windowContext.gBrowser.selectedBrowser.currentURI.spec, PAGE_URL,
- "got the right windowContext");
+ is(windowContext, browser.ownerGlobal, "got the right windowContext");
// The window should close on its own. If not, this test will time out.
await BrowserTestUtils.domWindowClosed(win);
Test passes if there is a filled green square.
+