diff --git a/accessible/android/ARIAGridAccessibleWrap.h b/accessible/android/ARIAGridAccessibleWrap.h new file mode 100644 index 000000000000..5d397e915c96 --- /dev/null +++ b/accessible/android/ARIAGridAccessibleWrap.h @@ -0,0 +1,22 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: + */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef MOZILLA_A11Y_ARIAGRIDACCESSIBLEWRAP_H +#define MOZILLA_A11Y_ARIAGRIDACCESSIBLEWRAP_H + +#include "ARIAGridAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class ARIAGridAccessible ARIAGridAccessibleWrap; +typedef class ARIAGridCellAccessible ARIAGridCellAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/AccessibleWrap.cpp b/accessible/android/AccessibleWrap.cpp new file mode 100644 index 000000000000..afbe39ed8baa --- /dev/null +++ b/accessible/android/AccessibleWrap.cpp @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "AccessibleWrap.h" + +using namespace mozilla::a11y; + +//----------------------------------------------------- +// construction +//----------------------------------------------------- +AccessibleWrap::AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) + : Accessible(aContent, aDoc) +{ +} + +//----------------------------------------------------- +// destruction +//----------------------------------------------------- +AccessibleWrap::~AccessibleWrap() +{ +} diff --git a/accessible/android/AccessibleWrap.h b/accessible/android/AccessibleWrap.h new file mode 100644 index 000000000000..438de460e78e --- /dev/null +++ b/accessible/android/AccessibleWrap.h @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_AccessibleWrap_h_ +#define mozilla_a11y_AccessibleWrap_h_ + +#include "nsCOMPtr.h" +#include "Accessible.h" + +namespace mozilla { +namespace a11y { + +class AccessibleWrap : public Accessible +{ +public: // construction, destruction + AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc); + virtual ~AccessibleWrap(); +}; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/ApplicationAccessibleWrap.h b/accessible/android/ApplicationAccessibleWrap.h new file mode 100644 index 000000000000..ed460b7bbc7b --- /dev/null +++ b/accessible/android/ApplicationAccessibleWrap.h @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_ApplicationAccessibleWrap_h__ +#define mozilla_a11y_ApplicationAccessibleWrap_h__ + +#include "ApplicationAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef ApplicationAccessible ApplicationAccessibleWrap; +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/DocAccessibleWrap.h b/accessible/android/DocAccessibleWrap.h new file mode 100644 index 000000000000..abaa0be0aa0c --- /dev/null +++ b/accessible/android/DocAccessibleWrap.h @@ -0,0 +1,19 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_DocAccessibleWrap_h__ +#define mozilla_a11y_DocAccessibleWrap_h__ + +#include "DocAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef DocAccessible DocAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/HTMLTableAccessibleWrap.h b/accessible/android/HTMLTableAccessibleWrap.h new file mode 100644 index 000000000000..744c995ef5b0 --- /dev/null +++ b/accessible/android/HTMLTableAccessibleWrap.h @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: + */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_HTMLTableAccessibleWrap_h__ +#define mozilla_a11y_HTMLTableAccessibleWrap_h__ + +#include "HTMLTableAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class HTMLTableAccessible HTMLTableAccessibleWrap; +typedef class HTMLTableCellAccessible HTMLTableCellAccessibleWrap; +typedef class HTMLTableHeaderCellAccessible HTMLTableHeaderCellAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/HyperTextAccessibleWrap.h b/accessible/android/HyperTextAccessibleWrap.h new file mode 100644 index 000000000000..401aa0c6f02b --- /dev/null +++ b/accessible/android/HyperTextAccessibleWrap.h @@ -0,0 +1,19 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_HyperTextAccessibleWrap_h__ +#define mozilla_a11y_HyperTextAccessibleWrap_h__ + +#include "HyperTextAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class HyperTextAccessible HyperTextAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/ImageAccessibleWrap.h b/accessible/android/ImageAccessibleWrap.h new file mode 100644 index 000000000000..f7517e6c682f --- /dev/null +++ b/accessible/android/ImageAccessibleWrap.h @@ -0,0 +1,21 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: + */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_ImageAccessibleWrap_h__ +#define mozilla_a11y_ImageAccessibleWrap_h__ + +#include "ImageAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class ImageAccessible ImageAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/Platform.cpp b/accessible/android/Platform.cpp new file mode 100644 index 000000000000..7ad38e0faf19 --- /dev/null +++ b/accessible/android/Platform.cpp @@ -0,0 +1,89 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "Platform.h" + +using namespace mozilla; +using namespace mozilla::a11y; + +void +a11y::PlatformInit() +{ +} + +void +a11y::PlatformShutdown() +{ +} + +void +a11y::ProxyCreated(ProxyAccessible*, uint32_t) +{ +} + +void +a11y::ProxyDestroyed(ProxyAccessible*) +{ +} + +void +a11y::ProxyEvent(ProxyAccessible*, uint32_t) +{ +} + +void +a11y::ProxyStateChangeEvent(ProxyAccessible*, uint64_t, bool) +{ +} + +void +a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset) +{ +} + +void +a11y::ProxyTextChangeEvent(ProxyAccessible*, + const nsString&, + int32_t, + uint32_t, + bool, + bool) +{ +} + +void +a11y::ProxyShowHideEvent(ProxyAccessible*, ProxyAccessible*, bool, bool) +{ +} + +void +a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t) +{ +} + +void +a11y::ProxyVirtualCursorChangeEvent(ProxyAccessible*, + ProxyAccessible*, + int32_t, + int32_t, + ProxyAccessible*, + int32_t, + int32_t, + int16_t, + int16_t, + bool) +{ +} + +void +a11y::ProxyScrollingEvent(ProxyAccessible*, + uint32_t, + uint32_t, + uint32_t, + uint32_t, + uint32_t) +{ +} diff --git a/accessible/android/RootAccessibleWrap.h b/accessible/android/RootAccessibleWrap.h new file mode 100644 index 000000000000..576b3962018e --- /dev/null +++ b/accessible/android/RootAccessibleWrap.h @@ -0,0 +1,19 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_RootAccessibleWrap_h__ +#define mozilla_a11y_RootAccessibleWrap_h__ + +#include "RootAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef RootAccessible RootAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/TextLeafAccessibleWrap.h b/accessible/android/TextLeafAccessibleWrap.h new file mode 100644 index 000000000000..d07b9defecbb --- /dev/null +++ b/accessible/android/TextLeafAccessibleWrap.h @@ -0,0 +1,19 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_TextLeafAccessibleWrap_h__ +#define mozilla_a11y_TextLeafAccessibleWrap_h__ + +#include "TextLeafAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class TextLeafAccessible TextLeafAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/XULListboxAccessibleWrap.h b/accessible/android/XULListboxAccessibleWrap.h new file mode 100644 index 000000000000..f7dc6cc5477f --- /dev/null +++ b/accessible/android/XULListboxAccessibleWrap.h @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_XULListboxAccessibleWrap_h__ +#define mozilla_a11y_XULListboxAccessibleWrap_h__ + +#include "XULListboxAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class XULListboxAccessible XULListboxAccessibleWrap; +typedef class XULListCellAccessible XULListCellAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/XULMenuAccessibleWrap.h b/accessible/android/XULMenuAccessibleWrap.h new file mode 100644 index 000000000000..6efcf007eb61 --- /dev/null +++ b/accessible/android/XULMenuAccessibleWrap.h @@ -0,0 +1,19 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_XULMenuAccessibleWrap_h__ +#define mozilla_a11y_XULMenuAccessibleWrap_h__ + +#include "XULMenuAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class XULMenuitemAccessible XULMenuitemAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/XULTreeGridAccessibleWrap.h b/accessible/android/XULTreeGridAccessibleWrap.h new file mode 100644 index 000000000000..b3631e9adb54 --- /dev/null +++ b/accessible/android/XULTreeGridAccessibleWrap.h @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef mozilla_a11y_XULTreeGridAccessibleWrap_h__ +#define mozilla_a11y_XULTreeGridAccessibleWrap_h__ + +#include "XULTreeGridAccessible.h" + +namespace mozilla { +namespace a11y { + +typedef class XULTreeGridAccessible XULTreeGridAccessibleWrap; +typedef class XULTreeGridCellAccessible XULTreeGridCellAccessibleWrap; + +} // namespace a11y +} // namespace mozilla + +#endif diff --git a/accessible/android/moz.build b/accessible/android/moz.build new file mode 100644 index 000000000000..6eae6a18ea56 --- /dev/null +++ b/accessible/android/moz.build @@ -0,0 +1,33 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +EXPORTS.mozilla.a11y += ['AccessibleWrap.h', + 'HyperTextAccessibleWrap.h', +] + +SOURCES += [ + 'AccessibleWrap.cpp', + 'Platform.cpp', +] + +LOCAL_INCLUDES += [ + '/accessible/base', + '/accessible/generic', + '/accessible/html', + '/accessible/ipc', + '/accessible/ipc/other', + '/accessible/xul', + '/dom/base', + '/widget', + '/widget/android', +] + +FINAL_LIBRARY = 'xul' + +include('/ipc/chromium/chromium-config.mozbuild') + +if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] diff --git a/accessible/aom/moz.build b/accessible/aom/moz.build index 700081215312..277caf345599 100644 --- a/accessible/aom/moz.build +++ b/accessible/aom/moz.build @@ -30,6 +30,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/base/Platform.h b/accessible/base/Platform.h index 868489a7f739..168c6babead2 100644 --- a/accessible/base/Platform.h +++ b/accessible/base/Platform.h @@ -114,7 +114,7 @@ void ProxyVirtualCursorChangeEvent(ProxyAccessible* aTarget, int16_t aReason, int16_t aBoundaryType, bool aFromUser); -void ProxyScrollingEvent(ProxyAccessible* aTarget, +void ProxyScrollingEvent(ProxyAccessible* aTarget, uint32_t aEventType, uint32_t aScrollX, uint32_t aScrollY, uint32_t aMaxScrollX, uint32_t aMaxScrollY); #endif diff --git a/accessible/base/RoleMap.h b/accessible/base/RoleMap.h index d283e07d0385..c0edb52f22ee 100644 --- a/accessible/base/RoleMap.h +++ b/accessible/base/RoleMap.h @@ -491,7 +491,7 @@ ROLE(SPINBUTTON, NSAccessibilityIncrementorRole, //Subroles: Increment/Decrement. ROLE_SYSTEM_SPINBUTTON, ROLE_SYSTEM_SPINBUTTON, - "android.widget.EditText", + "android.view.View", // A composite widget eNameFromValueRule) ROLE(DIAGRAM, diff --git a/accessible/base/moz.build b/accessible/base/moz.build index 0eaee8847af5..e75416ab25f4 100644 --- a/accessible/base/moz.build +++ b/accessible/base/moz.build @@ -104,6 +104,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/generic/Accessible.h b/accessible/generic/Accessible.h index b89b52db1087..721bfe9367c6 100644 --- a/accessible/generic/Accessible.h +++ b/accessible/generic/Accessible.h @@ -1195,7 +1195,6 @@ private: Accessible() = delete; Accessible(const Accessible&) = delete; Accessible& operator =(const Accessible&) = delete; - }; NS_DEFINE_STATIC_IID_ACCESSOR(Accessible, diff --git a/accessible/generic/moz.build b/accessible/generic/moz.build index 6a3783550e71..40619a61f4e3 100644 --- a/accessible/generic/moz.build +++ b/accessible/generic/moz.build @@ -59,6 +59,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/html/moz.build b/accessible/html/moz.build index 0f281965f6f1..89acc3198e39 100644 --- a/accessible/html/moz.build +++ b/accessible/html/moz.build @@ -37,6 +37,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/interfaces/ia2/moz.build b/accessible/interfaces/ia2/moz.build index da3d1d39b058..e12747769c5f 100644 --- a/accessible/interfaces/ia2/moz.build +++ b/accessible/interfaces/ia2/moz.build @@ -8,7 +8,7 @@ GeckoSharedLibrary('IA2Marshal', linkage=None) DEFINES['REGISTER_PROXY_DLL'] = True -DEFFILE = SRCDIR + '/IA2Marshal.def' +DEFFILE = 'IA2Marshal.def' OS_LIBS += [ 'uuid', diff --git a/accessible/interfaces/msaa/moz.build b/accessible/interfaces/msaa/moz.build index 14aabb852e2f..f8ae7ca4344d 100644 --- a/accessible/interfaces/msaa/moz.build +++ b/accessible/interfaces/msaa/moz.build @@ -18,7 +18,7 @@ DEFINES['REGISTER_PROXY_DLL'] = True # of AccessibleMarshal.dll. DEFINES['PROXY_CLSID'] = 'IID_ISimpleDOMNode' -DEFFILE = SRCDIR + '/AccessibleMarshal.def' +DEFFILE = 'AccessibleMarshal.def' OS_LIBS += [ 'kernel32', diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp index 259d62c575dd..6f83367d15e8 100644 --- a/accessible/ipc/DocAccessibleParent.cpp +++ b/accessible/ipc/DocAccessibleParent.cpp @@ -451,7 +451,7 @@ DocAccessibleParent::RecvScrollingEvent(const uint64_t& aID, } #if defined(ANDROID) - ProxyScrollingEvent(target, aScrollX, aScrollY, aMaxScrollX, aMaxScrollY); + ProxyScrollingEvent(target, aType, aScrollX, aScrollY, aMaxScrollX, aMaxScrollY); #endif if (!nsCoreUtils::AccEventObserversExist()) { diff --git a/accessible/ipc/moz.build b/accessible/ipc/moz.build index b47a25356a8b..c7e8eed1affe 100644 --- a/accessible/ipc/moz.build +++ b/accessible/ipc/moz.build @@ -24,6 +24,10 @@ else: LOCAL_INCLUDES += [ '/accessible/mac', ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/ipc/other/moz.build b/accessible/ipc/other/moz.build index 8241241d7c79..bf59b195f46c 100644 --- a/accessible/ipc/other/moz.build +++ b/accessible/ipc/other/moz.build @@ -33,6 +33,10 @@ if CONFIG['ACCESSIBILITY']: LOCAL_INCLUDES += [ '/accessible/mac', ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', @@ -44,4 +48,3 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] FINAL_LIBRARY = 'xul' - diff --git a/accessible/ipc/win/handler/moz.build b/accessible/ipc/win/handler/moz.build index fae401fef0b5..f3c7cc8af472 100644 --- a/accessible/ipc/win/handler/moz.build +++ b/accessible/ipc/win/handler/moz.build @@ -37,7 +37,7 @@ GENERATED_FILES += [ 'HandlerData_p.c', ] -DEFFILE = SRCDIR + '/AccessibleHandler.def' +DEFFILE = 'AccessibleHandler.def' USE_LIBS += [ 'mscom_oop', diff --git a/accessible/moz.build b/accessible/moz.build index fb83e3a7bee7..66de29db9bfb 100644 --- a/accessible/moz.build +++ b/accessible/moz.build @@ -12,6 +12,8 @@ elif toolkit == 'windows': DIRS += ['windows'] elif toolkit == 'cocoa': DIRS += ['mac'] +elif toolkit == 'android': + DIRS += ['android'] else: DIRS += ['other'] diff --git a/accessible/other/Platform.cpp b/accessible/other/Platform.cpp index e7ebcf9ed058..6f4527a78d36 100644 --- a/accessible/other/Platform.cpp +++ b/accessible/other/Platform.cpp @@ -59,17 +59,3 @@ void a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t) { } - -#if defined(ANDROID) -void -a11y::ProxyVirtualCursorChangeEvent(ProxyAccessible*, ProxyAccessible*, - int32_t, int32_t, ProxyAccessible*, - int32_t, int32_t, int16_t, int16_t, bool) -{ -} - -void -a11y::ProxyScrollingEvent(ProxyAccessible*, uint32_t, uint32_t, uint32_t, uint32_t) -{ -} -#endif diff --git a/accessible/xpcom/moz.build b/accessible/xpcom/moz.build index aa7a2b55a95e..6391c5bd85c4 100644 --- a/accessible/xpcom/moz.build +++ b/accessible/xpcom/moz.build @@ -47,6 +47,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/accessible/xul/moz.build b/accessible/xul/moz.build index 50d1926e8ba3..e25e65434197 100644 --- a/accessible/xul/moz.build +++ b/accessible/xul/moz.build @@ -43,6 +43,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LOCAL_INCLUDES += [ '/accessible/mac', ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + LOCAL_INCLUDES += [ + '/accessible/android', + ] else: LOCAL_INCLUDES += [ '/accessible/other', diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 index c75575386129..8e2b4d98d31b 100644 --- a/build/autoconf/config.status.m4 +++ b/build/autoconf/config.status.m4 @@ -100,16 +100,7 @@ ifelse($#, 2, _MOZ_AC_DEFINE_UNQUOTED($1, $2), $#, 3, _MOZ_AC_DEFINE_UNQUOTED($1 dnl Replace AC_OUTPUT to create and call a python config.status define([MOZ_CREATE_CONFIG_STATUS], -[dnl Top source directory in Windows format (as opposed to msys format). -WIN_TOP_SRC= -case "$host_os" in -mingw*) - WIN_TOP_SRC=`cd $srcdir; pwd -W` - ;; -esac -AC_SUBST(WIN_TOP_SRC) - -dnl Used in all Makefile.in files +[dnl Used in all Makefile.in files top_srcdir=$srcdir AC_SUBST(top_srcdir) diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py index e76afc85adb7..30c148ac12df 100755 --- a/build/pgo/profileserver.py +++ b/build/pgo/profileserver.py @@ -50,7 +50,6 @@ if __name__ == '__main__': prefpaths = [os.path.join(profile_data_dir, profile, 'user.js') for profile in base_profiles] - prefpaths.append(os.path.join(build.topsrcdir, "build", "pgo", "prefs_override.js")) prefs = {} for path in prefpaths: diff --git a/build/win32/crashinjectdll/moz.build b/build/win32/crashinjectdll/moz.build index d062589e775a..270b88ec07f6 100644 --- a/build/win32/crashinjectdll/moz.build +++ b/build/win32/crashinjectdll/moz.build @@ -10,7 +10,7 @@ SOURCES += [ SharedLibrary('crashinjectdll') -DEFFILE = SRCDIR + '/crashinjectdll.def' +DEFFILE = 'crashinjectdll.def' USE_STATIC_LIBS = True NO_PGO = True diff --git a/config/config.mk b/config/config.mk index ac28b7bd0221..72814ee4986b 100644 --- a/config/config.mk +++ b/config/config.mk @@ -103,22 +103,6 @@ endif # The VERSION_NUMBER is suffixed onto the end of the DLLs we ship. VERSION_NUMBER = 50 -ifeq ($(HOST_OS_ARCH),WINNT) - ifeq ($(MOZILLA_DIR),$(topsrcdir)) - win_srcdir := $(subst $(topsrcdir),$(WIN_TOP_SRC),$(srcdir)) - else - # This means we're in comm-central's topsrcdir, so we need to adjust - # WIN_TOP_SRC (which points to mozilla's topsrcdir) for the substitution - # to win_srcdir. - cc_WIN_TOP_SRC := $(WIN_TOP_SRC:%/mozilla=%) - win_srcdir := $(subst $(topsrcdir),$(cc_WIN_TOP_SRC),$(srcdir)) - endif - BUILD_TOOLS = $(WIN_TOP_SRC)/build/unix -else - win_srcdir := $(srcdir) - BUILD_TOOLS = $(MOZILLA_DIR)/build/unix -endif - CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/config AUTOCONF_TOOLS = $(MOZILLA_DIR)/build/autoconf diff --git a/config/rules.mk b/config/rules.mk index 5ba50272a4f6..0b8916e4bbb7 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -47,7 +47,7 @@ EXEC = exec # prints out failed commands anyway, so ELOG just makes things worse by # forcing shell invocations. ifneq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS)))) - ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh + ELOG := $(EXEC) sh $(MOZILLA_DIR)/build/unix/print-failed-commands.sh else ELOG := endif # -s @@ -153,9 +153,6 @@ CODFILE=$(basename $(@F)).cod endif endif # !GNU_CC - -EXTRA_DEPS += $(DEFFILE) - endif # WINNT ifeq (arm-Darwin,$(CPU_ARCH)-$(OS_TARGET)) @@ -568,15 +565,15 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f '$(srcdir)/$(notdir $@).manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \ + echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest and $@.manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \ else \ echo 'Embedding manifest from $@.manifest'; \ $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ fi; \ elif test -f '$(srcdir)/$(notdir $@).manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ + echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ fi endif # MSVC with manifest tool ifdef MOZ_PROFILE_GENERATE @@ -603,15 +600,15 @@ ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH)) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f '$(srcdir)/$(notdir $@).manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest and $@.manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \ + echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest and $@.manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \ else \ echo 'Embedding manifest from $@.manifest'; \ $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ fi; \ elif test -f '$(srcdir)/$(notdir $@).manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$(notdir $@).manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ + echo 'Embedding manifest from $(srcdir_rel)/$(notdir $@).manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ fi endif # MSVC with manifest tool else @@ -642,7 +639,7 @@ ifdef MSMANIFEST_TOOL $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ rm -f $@.manifest; \ elif test -f '$(srcdir)/$(notdir $@).manifest'; then \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$(notdir $@).manifest' -OUTPUTRESOURCE:$@\;1; \ fi endif # MSVC with manifest tool else @@ -720,15 +717,15 @@ ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ if test -f '$(srcdir)/$@.manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ + echo 'Embedding manifest from $(srcdir_rel)/$@.manifest and $@.manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$@.manifest' $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ else \ echo 'Embedding manifest from $@.manifest'; \ $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ fi; \ elif test -f '$(srcdir)/$@.manifest'; then \ - echo 'Embedding manifest from $(srcdir)/$@.manifest'; \ - $(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$@.manifest' -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ + echo 'Embedding manifest from $(srcdir_rel)/$@.manifest'; \ + $(MT) -NOLOGO -MANIFEST '$(srcdir_rel)/$@.manifest' -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \ fi endif # EMBED_MANIFEST_AT endif # MSVC with manifest tool diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla index 5db9dd70f84e..4b53218367b2 100644 --- a/devtools/client/debugger/new/README.mozilla +++ b/devtools/client/debugger/new/README.mozilla @@ -1,9 +1,9 @@ This is the debugger.html project output. See https://github.com/devtools-html/debugger.html -Version 87 +Version 88 -Comparison: https://github.com/devtools-html/debugger.html/compare/release-86...release-87 +Comparison: https://github.com/devtools-html/debugger.html/compare/release-87...release-88 Packages: - babel-plugin-transform-es2015-modules-commonjs @6.26.2 diff --git a/devtools/client/debugger/new/dist/debugger.css b/devtools/client/debugger/new/dist/debugger.css index 57ed642e9b75..dc5f8cd16223 100644 --- a/devtools/client/debugger/new/dist/debugger.css +++ b/devtools/client/debugger/new/dist/debugger.css @@ -2173,6 +2173,7 @@ menuseparator { padding: 0 2px; } +.objectBox-accessible.clickable, .objectBox-node.clickable { cursor: pointer; } @@ -2198,6 +2199,7 @@ menuseparator { color: var(--comment-node-color); } +.accessible-role, .tag-name { color: var(--object-color); } @@ -2274,8 +2276,9 @@ menuseparator { } /******************************************************************************/ -/* Open DOMNode in inspector button */ +/* Open DOMNode in inspector or Accessible in accessibility inspector button */ +button.open-accessibility-inspector, button.open-inspector { mask: url("chrome://devtools/skin/images/devtools-reps/open-inspector.svg") no-repeat; display: inline-block; @@ -2286,8 +2289,10 @@ button.open-inspector { cursor: pointer; } +.objectBox-accessible:hover .open-accessibility-inspector, .objectBox-node:hover .open-inspector, .objectBox-textNode:hover .open-inspector, +.open-accessibility-inspector:hover, .open-inspector:hover { background-color: var(--theme-highlight-blue); } @@ -3993,11 +3998,6 @@ html[dir="rtl"] .object-node { cursor: pointer; } -.welcomebox__searchSources, -.welcomebox__searchProject { - transition: color 0.15s linear; -} - .welcomebox__searchSources:hover, .welcomebox__searchProject:hover { color: var(--theme-body-color); diff --git a/devtools/client/debugger/new/dist/parser-worker.js b/devtools/client/debugger/new/dist/parser-worker.js index 6e150f4934f3..664d31268497 100644 --- a/devtools/client/debugger/new/dist/parser-worker.js +++ b/devtools/client/debugger/new/dist/parser-worker.js @@ -25724,8 +25724,8 @@ function WorkerDispatcher() { * file, You can obtain one at . */ WorkerDispatcher.prototype = { - start(url) { - this.worker = new Worker(url); + start(url, win = window) { + this.worker = new win.Worker(url); this.worker.onerror = () => { console.error(`Error in worker ${url}`); }; diff --git a/devtools/client/debugger/new/dist/pretty-print-worker.js b/devtools/client/debugger/new/dist/pretty-print-worker.js index 720c988d32d4..409e017c77f8 100644 --- a/devtools/client/debugger/new/dist/pretty-print-worker.js +++ b/devtools/client/debugger/new/dist/pretty-print-worker.js @@ -197,8 +197,8 @@ function WorkerDispatcher() { * file, You can obtain one at . */ WorkerDispatcher.prototype = { - start(url) { - this.worker = new Worker(url); + start(url, win = window) { + this.worker = new win.Worker(url); this.worker.onerror = () => { console.error(`Error in worker ${url}`); }; diff --git a/devtools/client/debugger/new/dist/search-worker.js b/devtools/client/debugger/new/dist/search-worker.js index 6ecd1cb6df26..8376f095169f 100644 --- a/devtools/client/debugger/new/dist/search-worker.js +++ b/devtools/client/debugger/new/dist/search-worker.js @@ -516,8 +516,8 @@ function WorkerDispatcher() { * file, You can obtain one at . */ WorkerDispatcher.prototype = { - start(url) { - this.worker = new Worker(url); + start(url, win = window) { + this.worker = new win.Worker(url); this.worker.onerror = () => { console.error(`Error in worker ${url}`); }; diff --git a/devtools/client/debugger/new/dist/vendors.js b/devtools/client/debugger/new/dist/vendors.js index 266e8b33dfa3..c3aea8475216 100644 --- a/devtools/client/debugger/new/dist/vendors.js +++ b/devtools/client/debugger/new/dist/vendors.js @@ -1,13 +1,13 @@ (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') - module.exports = factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/lodash"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")); + module.exports = factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")); else if(typeof define === 'function' && define.amd) - define(["devtools/client/shared/vendor/react", "devtools/client/shared/vendor/lodash", "devtools/client/shared/vendor/react-dom", "Services", "devtools/shared/flags", "devtools/client/shared/vendor/react-prop-types", "devtools/client/shared/vendor/react-dom-factories"], factory); + define(["devtools/client/shared/vendor/react", "devtools/client/shared/vendor/react-dom", "Services", "devtools/shared/flags", "devtools/client/shared/vendor/react-prop-types", "devtools/client/shared/vendor/react-dom-factories"], factory); else { - var a = typeof exports === 'object' ? factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/lodash"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")) : factory(root["devtools/client/shared/vendor/react"], root["devtools/client/shared/vendor/lodash"], root["devtools/client/shared/vendor/react-dom"], root["Services"], root["devtools/shared/flags"], root["devtools/client/shared/vendor/react-prop-types"], root["devtools/client/shared/vendor/react-dom-factories"]); + var a = typeof exports === 'object' ? factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")) : factory(root["devtools/client/shared/vendor/react"], root["devtools/client/shared/vendor/react-dom"], root["Services"], root["devtools/shared/flags"], root["devtools/client/shared/vendor/react-prop-types"], root["devtools/client/shared/vendor/react-dom-factories"]); for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i]; } -})(typeof self !== 'undefined' ? self : this, function(__WEBPACK_EXTERNAL_MODULE_0__, __WEBPACK_EXTERNAL_MODULE_2__, __WEBPACK_EXTERNAL_MODULE_4__, __WEBPACK_EXTERNAL_MODULE_22__, __WEBPACK_EXTERNAL_MODULE_52__, __WEBPACK_EXTERNAL_MODULE_3642__, __WEBPACK_EXTERNAL_MODULE_3643__) { +})(typeof self !== 'undefined' ? self : this, function(__WEBPACK_EXTERNAL_MODULE_0__, __WEBPACK_EXTERNAL_MODULE_4__, __WEBPACK_EXTERNAL_MODULE_22__, __WEBPACK_EXTERNAL_MODULE_52__, __WEBPACK_EXTERNAL_MODULE_3642__, __WEBPACK_EXTERNAL_MODULE_3643__) { return /******/ (function(modules) { // webpackBootstrap /******/ // The module cache /******/ var installedModules = {}; @@ -80,6 +80,92 @@ return /******/ (function(modules) { // webpackBootstrap module.exports = __WEBPACK_EXTERNAL_MODULE_0__; +/***/ }), + +/***/ 10: +/***/ (function(module, exports, __webpack_require__) { + +var Symbol = __webpack_require__(7); + +/** Used for built-in method references. */ +var objectProto = Object.prototype; + +/** Used to check objects for own properties. */ +var hasOwnProperty = objectProto.hasOwnProperty; + +/** + * Used to resolve the + * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) + * of values. + */ +var nativeObjectToString = objectProto.toString; + +/** Built-in value references. */ +var symToStringTag = Symbol ? Symbol.toStringTag : undefined; + +/** + * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values. + * + * @private + * @param {*} value The value to query. + * @returns {string} Returns the raw `toStringTag`. + */ +function getRawTag(value) { + var isOwn = hasOwnProperty.call(value, symToStringTag), + tag = value[symToStringTag]; + + try { + value[symToStringTag] = undefined; + var unmasked = true; + } catch (e) {} + + var result = nativeObjectToString.call(value); + if (unmasked) { + if (isOwn) { + value[symToStringTag] = tag; + } else { + delete value[symToStringTag]; + } + } + return result; +} + +module.exports = getRawTag; + + +/***/ }), + +/***/ 100: +/***/ (function(module, exports, __webpack_require__) { + +var assocIndexOf = __webpack_require__(96); + +/** + * Sets the list cache `key` to `value`. + * + * @private + * @name set + * @memberOf ListCache + * @param {string} key The key of the value to set. + * @param {*} value The value to set. + * @returns {Object} Returns the list cache instance. + */ +function listCacheSet(key, value) { + var data = this.__data__, + index = assocIndexOf(data, key); + + if (index < 0) { + ++this.size; + data.push([key, value]); + } else { + data[index][1] = value; + } + return this; +} + +module.exports = listCacheSet; + + /***/ }), /***/ 1000: @@ -115,6 +201,92 @@ module.exports = "" +/***/ }), + +/***/ 101: +/***/ (function(module, exports, __webpack_require__) { + +var getNative = __webpack_require__(81), + root = __webpack_require__(8); + +/* Built-in method references that are verified to be native. */ +var Map = getNative(root, 'Map'); + +module.exports = Map; + + +/***/ }), + +/***/ 102: +/***/ (function(module, exports, __webpack_require__) { + +var getMapData = __webpack_require__(103); + +/** + * Removes `key` and its value from the map. + * + * @private + * @name delete + * @memberOf MapCache + * @param {string} key The key of the value to remove. + * @returns {boolean} Returns `true` if the entry was removed, else `false`. + */ +function mapCacheDelete(key) { + var result = getMapData(this, key)['delete'](key); + this.size -= result ? 1 : 0; + return result; +} + +module.exports = mapCacheDelete; + + +/***/ }), + +/***/ 103: +/***/ (function(module, exports, __webpack_require__) { + +var isKeyable = __webpack_require__(104); + +/** + * Gets the data for `map`. + * + * @private + * @param {Object} map The map to query. + * @param {string} key The reference key. + * @returns {*} Returns the map data. + */ +function getMapData(map, key) { + var data = map.__data__; + return isKeyable(key) + ? data[typeof key == 'string' ? 'string' : 'hash'] + : data.map; +} + +module.exports = getMapData; + + +/***/ }), + +/***/ 104: +/***/ (function(module, exports) { + +/** + * Checks if `value` is suitable for use as unique object key. + * + * @private + * @param {*} value The value to check. + * @returns {boolean} Returns `true` if `value` is suitable, else `false`. + */ +function isKeyable(value) { + var type = typeof value; + return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean') + ? (value !== '__proto__') + : (value === null); +} + +module.exports = isKeyable; + + /***/ }), /***/ 1043: @@ -136,6 +308,245 @@ module.exports = "Created with Sketch." +/***/ }), + +/***/ 105: +/***/ (function(module, exports, __webpack_require__) { + +var getMapData = __webpack_require__(103); + +/** + * Gets the map value for `key`. + * + * @private + * @name get + * @memberOf MapCache + * @param {string} key The key of the value to get. + * @returns {*} Returns the entry value. + */ +function mapCacheGet(key) { + return getMapData(this, key).get(key); +} + +module.exports = mapCacheGet; + + +/***/ }), + +/***/ 106: +/***/ (function(module, exports, __webpack_require__) { + +var getMapData = __webpack_require__(103); + +/** + * Checks if a map value for `key` exists. + * + * @private + * @name has + * @memberOf MapCache + * @param {string} key The key of the entry to check. + * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`. + */ +function mapCacheHas(key) { + return getMapData(this, key).has(key); +} + +module.exports = mapCacheHas; + + +/***/ }), + +/***/ 107: +/***/ (function(module, exports, __webpack_require__) { + +var getMapData = __webpack_require__(103); + +/** + * Sets the map `key` to `value`. + * + * @private + * @name set + * @memberOf MapCache + * @param {string} key The key of the value to set. + * @param {*} value The value to set. + * @returns {Object} Returns the map cache instance. + */ +function mapCacheSet(key, value) { + var data = getMapData(this, key), + size = data.size; + + data.set(key, value); + this.size += data.size == size ? 0 : 1; + return this; +} + +module.exports = mapCacheSet; + + +/***/ }), + +/***/ 108: +/***/ (function(module, exports, __webpack_require__) { + +var baseToString = __webpack_require__(109); + +/** + * Converts `value` to a string. An empty string is returned for `null` + * and `undefined` values. The sign of `-0` is preserved. + * + * @static + * @memberOf _ + * @since 4.0.0 + * @category Lang + * @param {*} value The value to convert. + * @returns {string} Returns the converted string. + * @example + * + * _.toString(null); + * // => '' + * + * _.toString(-0); + * // => '-0' + * + * _.toString([1, 2, 3]); + * // => '1,2,3' + */ +function toString(value) { + return value == null ? '' : baseToString(value); +} + +module.exports = toString; + + +/***/ }), + +/***/ 109: +/***/ (function(module, exports, __webpack_require__) { + +var Symbol = __webpack_require__(7), + arrayMap = __webpack_require__(110), + isArray = __webpack_require__(70), + isSymbol = __webpack_require__(72); + +/** Used as references for various `Number` constants. */ +var INFINITY = 1 / 0; + +/** Used to convert symbols to primitives and strings. */ +var symbolProto = Symbol ? Symbol.prototype : undefined, + symbolToString = symbolProto ? symbolProto.toString : undefined; + +/** + * The base implementation of `_.toString` which doesn't convert nullish + * values to empty strings. + * + * @private + * @param {*} value The value to process. + * @returns {string} Returns the string. + */ +function baseToString(value) { + // Exit early for strings to avoid a performance hit in some environments. + if (typeof value == 'string') { + return value; + } + if (isArray(value)) { + // Recursively convert values (susceptible to call stack limits). + return arrayMap(value, baseToString) + ''; + } + if (isSymbol(value)) { + return symbolToString ? symbolToString.call(value) : ''; + } + var result = (value + ''); + return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result; +} + +module.exports = baseToString; + + +/***/ }), + +/***/ 11: +/***/ (function(module, exports) { + +/** Used for built-in method references. */ +var objectProto = Object.prototype; + +/** + * Used to resolve the + * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring) + * of values. + */ +var nativeObjectToString = objectProto.toString; + +/** + * Converts `value` to a string using `Object.prototype.toString`. + * + * @private + * @param {*} value The value to convert. + * @returns {string} Returns the converted string. + */ +function objectToString(value) { + return nativeObjectToString.call(value); +} + +module.exports = objectToString; + + +/***/ }), + +/***/ 110: +/***/ (function(module, exports) { + +/** + * A specialized version of `_.map` for arrays without support for iteratee + * shorthands. + * + * @private + * @param {Array} [array] The array to iterate over. + * @param {Function} iteratee The function invoked per iteration. + * @returns {Array} Returns the new mapped array. + */ +function arrayMap(array, iteratee) { + var index = -1, + length = array == null ? 0 : array.length, + result = Array(length); + + while (++index < length) { + result[index] = iteratee(array[index], index, array); + } + return result; +} + +module.exports = arrayMap; + + +/***/ }), + +/***/ 111: +/***/ (function(module, exports, __webpack_require__) { + +var isSymbol = __webpack_require__(72); + +/** Used as references for various `Number` constants. */ +var INFINITY = 1 / 0; + +/** + * Converts `value` to a string key if it's not a string or symbol. + * + * @private + * @param {*} value The value to inspect. + * @returns {string|symbol} Returns the key. + */ +function toKey(value) { + if (typeof value == 'string' || isSymbol(value)) { + return value; + } + var result = (value + ''); + return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result; +} + +module.exports = toKey; + + /***/ }), /***/ 1117: @@ -157,6 +568,219 @@ module.exports = "" +/***/ }), + +/***/ 112: +/***/ (function(module, exports, __webpack_require__) { + +var baseSet = __webpack_require__(113); + +/** + * Sets the value at `path` of `object`. If a portion of `path` doesn't exist, + * it's created. Arrays are created for missing index properties while objects + * are created for all other missing properties. Use `_.setWith` to customize + * `path` creation. + * + * **Note:** This method mutates `object`. + * + * @static + * @memberOf _ + * @since 3.7.0 + * @category Object + * @param {Object} object The object to modify. + * @param {Array|string} path The path of the property to set. + * @param {*} value The value to set. + * @returns {Object} Returns `object`. + * @example + * + * var object = { 'a': [{ 'b': { 'c': 3 } }] }; + * + * _.set(object, 'a[0].b.c', 4); + * console.log(object.a[0].b.c); + * // => 4 + * + * _.set(object, ['x', '0', 'y', 'z'], 5); + * console.log(object.x[0].y.z); + * // => 5 + */ +function set(object, path, value) { + return object == null ? object : baseSet(object, path, value); +} + +module.exports = set; + + +/***/ }), + +/***/ 113: +/***/ (function(module, exports, __webpack_require__) { + +var assignValue = __webpack_require__(114), + castPath = __webpack_require__(69), + isIndex = __webpack_require__(117), + isObject = __webpack_require__(84), + toKey = __webpack_require__(111); + +/** + * The base implementation of `_.set`. + * + * @private + * @param {Object} object The object to modify. + * @param {Array|string} path The path of the property to set. + * @param {*} value The value to set. + * @param {Function} [customizer] The function to customize path creation. + * @returns {Object} Returns `object`. + */ +function baseSet(object, path, value, customizer) { + if (!isObject(object)) { + return object; + } + path = castPath(path, object); + + var index = -1, + length = path.length, + lastIndex = length - 1, + nested = object; + + while (nested != null && ++index < length) { + var key = toKey(path[index]), + newValue = value; + + if (index != lastIndex) { + var objValue = nested[key]; + newValue = customizer ? customizer(objValue, key, nested) : undefined; + if (newValue === undefined) { + newValue = isObject(objValue) + ? objValue + : (isIndex(path[index + 1]) ? [] : {}); + } + } + assignValue(nested, key, newValue); + nested = nested[key]; + } + return object; +} + +module.exports = baseSet; + + +/***/ }), + +/***/ 114: +/***/ (function(module, exports, __webpack_require__) { + +var baseAssignValue = __webpack_require__(115), + eq = __webpack_require__(97); + +/** Used for built-in method references. */ +var objectProto = Object.prototype; + +/** Used to check objects for own properties. */ +var hasOwnProperty = objectProto.hasOwnProperty; + +/** + * Assigns `value` to `key` of `object` if the existing value is not equivalent + * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * for equality comparisons. + * + * @private + * @param {Object} object The object to modify. + * @param {string} key The key of the property to assign. + * @param {*} value The value to assign. + */ +function assignValue(object, key, value) { + var objValue = object[key]; + if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || + (value === undefined && !(key in object))) { + baseAssignValue(object, key, value); + } +} + +module.exports = assignValue; + + +/***/ }), + +/***/ 115: +/***/ (function(module, exports, __webpack_require__) { + +var defineProperty = __webpack_require__(116); + +/** + * The base implementation of `assignValue` and `assignMergeValue` without + * value checks. + * + * @private + * @param {Object} object The object to modify. + * @param {string} key The key of the property to assign. + * @param {*} value The value to assign. + */ +function baseAssignValue(object, key, value) { + if (key == '__proto__' && defineProperty) { + defineProperty(object, key, { + 'configurable': true, + 'enumerable': true, + 'value': value, + 'writable': true + }); + } else { + object[key] = value; + } +} + +module.exports = baseAssignValue; + + +/***/ }), + +/***/ 116: +/***/ (function(module, exports, __webpack_require__) { + +var getNative = __webpack_require__(81); + +var defineProperty = (function() { + try { + var func = getNative(Object, 'defineProperty'); + func({}, '', {}); + return func; + } catch (e) {} +}()); + +module.exports = defineProperty; + + +/***/ }), + +/***/ 117: +/***/ (function(module, exports) { + +/** Used as references for various `Number` constants. */ +var MAX_SAFE_INTEGER = 9007199254740991; + +/** Used to detect unsigned integer values. */ +var reIsUint = /^(?:0|[1-9]\d*)$/; + +/** + * Checks if `value` is a valid array-like index. + * + * @private + * @param {*} value The value to check. + * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index. + * @returns {boolean} Returns `true` if `value` is a valid index, else `false`. + */ +function isIndex(value, length) { + var type = typeof value; + length = length == null ? MAX_SAFE_INTEGER : length; + + return !!length && + (type == 'number' || + (type != 'symbol' && reIsUint.test(value))) && + (value > -1 && value % 1 == 0 && value < length); +} + +module.exports = isIndex; + + /***/ }), /***/ 1174: @@ -651,10 +1275,6 @@ module.exports = "" +/***/ }), + +/***/ 92: +/***/ (function(module, exports, __webpack_require__) { + +var nativeCreate = __webpack_require__(80); + +/** Used to stand-in for `undefined` hash values. */ +var HASH_UNDEFINED = '__lodash_hash_undefined__'; + +/** + * Sets the hash `key` to `value`. + * + * @private + * @name set + * @memberOf Hash + * @param {string} key The key of the value to set. + * @param {*} value The value to set. + * @returns {Object} Returns the hash instance. + */ +function hashSet(key, value) { + var data = this.__data__; + this.size += this.has(key) ? 0 : 1; + data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value; + return this; +} + +module.exports = hashSet; + + /***/ }), /***/ 920: @@ -7938,6 +9646,228 @@ module.exports = "" +/***/ }), + +/***/ 93: +/***/ (function(module, exports, __webpack_require__) { + +var listCacheClear = __webpack_require__(94), + listCacheDelete = __webpack_require__(95), + listCacheGet = __webpack_require__(98), + listCacheHas = __webpack_require__(99), + listCacheSet = __webpack_require__(100); + +/** + * Creates an list cache object. + * + * @private + * @constructor + * @param {Array} [entries] The key-value pairs to cache. + */ +function ListCache(entries) { + var index = -1, + length = entries == null ? 0 : entries.length; + + this.clear(); + while (++index < length) { + var entry = entries[index]; + this.set(entry[0], entry[1]); + } +} + +// Add methods to `ListCache`. +ListCache.prototype.clear = listCacheClear; +ListCache.prototype['delete'] = listCacheDelete; +ListCache.prototype.get = listCacheGet; +ListCache.prototype.has = listCacheHas; +ListCache.prototype.set = listCacheSet; + +module.exports = ListCache; + + +/***/ }), + +/***/ 94: +/***/ (function(module, exports) { + +/** + * Removes all key-value entries from the list cache. + * + * @private + * @name clear + * @memberOf ListCache + */ +function listCacheClear() { + this.__data__ = []; + this.size = 0; +} + +module.exports = listCacheClear; + + +/***/ }), + +/***/ 95: +/***/ (function(module, exports, __webpack_require__) { + +var assocIndexOf = __webpack_require__(96); + +/** Used for built-in method references. */ +var arrayProto = Array.prototype; + +/** Built-in value references. */ +var splice = arrayProto.splice; + +/** + * Removes `key` and its value from the list cache. + * + * @private + * @name delete + * @memberOf ListCache + * @param {string} key The key of the value to remove. + * @returns {boolean} Returns `true` if the entry was removed, else `false`. + */ +function listCacheDelete(key) { + var data = this.__data__, + index = assocIndexOf(data, key); + + if (index < 0) { + return false; + } + var lastIndex = data.length - 1; + if (index == lastIndex) { + data.pop(); + } else { + splice.call(data, index, 1); + } + --this.size; + return true; +} + +module.exports = listCacheDelete; + + +/***/ }), + +/***/ 96: +/***/ (function(module, exports, __webpack_require__) { + +var eq = __webpack_require__(97); + +/** + * Gets the index at which the `key` is found in `array` of key-value pairs. + * + * @private + * @param {Array} array The array to inspect. + * @param {*} key The key to search for. + * @returns {number} Returns the index of the matched value, else `-1`. + */ +function assocIndexOf(array, key) { + var length = array.length; + while (length--) { + if (eq(array[length][0], key)) { + return length; + } + } + return -1; +} + +module.exports = assocIndexOf; + + +/***/ }), + +/***/ 97: +/***/ (function(module, exports) { + +/** + * Performs a + * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero) + * comparison between two values to determine if they are equivalent. + * + * @static + * @memberOf _ + * @since 4.0.0 + * @category Lang + * @param {*} value The value to compare. + * @param {*} other The other value to compare. + * @returns {boolean} Returns `true` if the values are equivalent, else `false`. + * @example + * + * var object = { 'a': 1 }; + * var other = { 'a': 1 }; + * + * _.eq(object, object); + * // => true + * + * _.eq(object, other); + * // => false + * + * _.eq('a', 'a'); + * // => true + * + * _.eq('a', Object('a')); + * // => false + * + * _.eq(NaN, NaN); + * // => true + */ +function eq(value, other) { + return value === other || (value !== value && other !== other); +} + +module.exports = eq; + + +/***/ }), + +/***/ 98: +/***/ (function(module, exports, __webpack_require__) { + +var assocIndexOf = __webpack_require__(96); + +/** + * Gets the list cache value for `key`. + * + * @private + * @name get + * @memberOf ListCache + * @param {string} key The key of the value to get. + * @returns {*} Returns the entry value. + */ +function listCacheGet(key) { + var data = this.__data__, + index = assocIndexOf(data, key); + + return index < 0 ? undefined : data[index][1]; +} + +module.exports = listCacheGet; + + +/***/ }), + +/***/ 99: +/***/ (function(module, exports, __webpack_require__) { + +var assocIndexOf = __webpack_require__(96); + +/** + * Checks if a list cache value for `key` exists. + * + * @private + * @name has + * @memberOf ListCache + * @param {string} key The key of the entry to check. + * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`. + */ +function listCacheHas(key) { + return assocIndexOf(this.__data__, key) > -1; +} + +module.exports = listCacheHas; + + /***/ }), /***/ 993: diff --git a/devtools/client/debugger/new/src/actions/pause/mapFrames.js b/devtools/client/debugger/new/src/actions/pause/mapFrames.js index 128187190762..9b465024b77d 100644 --- a/devtools/client/debugger/new/src/actions/pause/mapFrames.js +++ b/devtools/client/debugger/new/src/actions/pause/mapFrames.js @@ -47,7 +47,12 @@ function mapDisplayNames(frames, getState) { return frame; } - const source = (0, _selectors.getSourceFromId)(getState(), frame.location.sourceId); + const source = (0, _selectors.getSource)(getState(), frame.location.sourceId); + + if (!source) { + return frame; + } + const symbols = (0, _selectors.getSymbols)(getState(), source); if (!symbols || !symbols.functions) { @@ -72,8 +77,8 @@ function isWasmOriginalSourceFrame(frame, getState) { return false; } - const generatedSource = (0, _selectors.getSourceFromId)(getState(), frame.generatedLocation.sourceId); - return generatedSource.isWasm; + const generatedSource = (0, _selectors.getSource)(getState(), frame.generatedLocation.sourceId); + return Boolean(generatedSource && generatedSource.isWasm); } async function expandFrames(frames, sourceMaps, getState) { diff --git a/devtools/client/debugger/new/src/actions/pause/mapScopes.js b/devtools/client/debugger/new/src/actions/pause/mapScopes.js index 95846f6a47b5..a0c9a00b0196 100644 --- a/devtools/client/debugger/new/src/actions/pause/mapScopes.js +++ b/devtools/client/debugger/new/src/actions/pause/mapScopes.js @@ -29,14 +29,13 @@ function mapScopes(scopes, frame) { client, sourceMaps }) { - const generatedSource = (0, _selectors.getSourceFromId)(getState(), frame.generatedLocation.sourceId); - const source = (0, _selectors.getSourceFromId)(getState(), frame.location.sourceId); - const shouldMapScopes = _prefs.features.mapScopes && !generatedSource.isWasm && !source.isPrettyPrinted && !(0, _devtoolsSourceMap.isGeneratedId)(frame.location.sourceId); + const generatedSource = (0, _selectors.getSource)(getState(), frame.generatedLocation.sourceId); + const source = (0, _selectors.getSource)(getState(), frame.location.sourceId); await dispatch({ type: "MAP_SCOPES", frame, [_promise.PROMISE]: async function () { - if (!shouldMapScopes) { + if (!_prefs.features.mapScopes || !source || !generatedSource || generatedSource.isWasm || source.isPrettyPrinted || (0, _devtoolsSourceMap.isGeneratedId)(frame.location.sourceId)) { return null; } diff --git a/devtools/client/debugger/new/src/actions/sources/loadSourceText.js b/devtools/client/debugger/new/src/actions/sources/loadSourceText.js index dc6302d5dc58..25f0f3c21b6e 100644 --- a/devtools/client/debugger/new/src/actions/sources/loadSourceText.js +++ b/devtools/client/debugger/new/src/actions/sources/loadSourceText.js @@ -68,6 +68,10 @@ function loadSourceText(source) { client, sourceMaps }) => { + if (!source) { + return; + } + const id = source.id; // Fetch the source text only once. if (requests.has(id)) { @@ -97,7 +101,11 @@ function loadSourceText(source) { return; } - const newSource = (0, _selectors.getSourceFromId)(getState(), source.id); + const newSource = (0, _selectors.getSource)(getState(), source.id); + + if (!newSource) { + return; + } if ((0, _devtoolsSourceMap.isOriginalId)(newSource.id) && !newSource.isWasm) { const generatedSource = (0, _selectors.getGeneratedSource)(getState(), source); diff --git a/devtools/client/debugger/new/src/actions/sources/newSources.js b/devtools/client/debugger/new/src/actions/sources/newSources.js index aed54ad33617..34361b6ed53f 100644 --- a/devtools/client/debugger/new/src/actions/sources/newSources.js +++ b/devtools/client/debugger/new/src/actions/sources/newSources.js @@ -112,10 +112,10 @@ function checkSelectedSource(sourceId) { dispatch, getState }) => { - const source = (0, _selectors.getSourceFromId)(getState(), sourceId); + const source = (0, _selectors.getSource)(getState(), sourceId); const pendingLocation = (0, _selectors.getPendingSelectedLocation)(getState()); - if (!pendingLocation || !pendingLocation.url || !source.url) { + if (!pendingLocation || !pendingLocation.url || !source || !source.url) { return; } @@ -141,7 +141,12 @@ function checkPendingBreakpoints(sourceId) { getState }) => { // source may have been modified by selectLocation - const source = (0, _selectors.getSourceFromId)(getState(), sourceId); + const source = (0, _selectors.getSource)(getState(), sourceId); + + if (!source) { + return; + } + const pendingBreakpoints = (0, _selectors.getPendingBreakpointsForSource)(getState(), source); if (pendingBreakpoints.length === 0) { diff --git a/devtools/client/debugger/new/src/client/firefox/commands.js b/devtools/client/debugger/new/src/client/firefox/commands.js index a250edf817d4..fdc90d2fa4f8 100644 --- a/devtools/client/debugger/new/src/client/firefox/commands.js +++ b/devtools/client/debugger/new/src/client/firefox/commands.js @@ -342,7 +342,12 @@ function pauseGrip(func) { async function fetchSources() { const { sources - } = await threadClient.getSources(); + } = await threadClient.getSources(); // NOTE: this happens when we fetch sources and then immediately navigate + + if (!sources) { + return; + } + return sources.map(source => (0, _create.createSource)(source, { supportsWasm })); diff --git a/devtools/client/debugger/new/src/client/firefox/events.js b/devtools/client/debugger/new/src/client/firefox/events.js index fadde881e2d2..ee297a88dbdb 100644 --- a/devtools/client/debugger/new/src/client/firefox/events.js +++ b/devtools/client/debugger/new/src/client/firefox/events.js @@ -57,10 +57,22 @@ async function paused(_, packet) { if (why.type === "interrupted" && !packet.why.onNext) { isInterrupted = true; return; - } // Eagerly fetch the frames + } + + let response; + + try { + // Eagerly fetch the frames + response = await threadClient.getFrames(0, CALL_STACK_PAGE_SIZE); + } catch (e) { + console.log(e); + return; + } // NOTE: this happens if we fetch frames and then immediately navigate - const response = await threadClient.getFrames(0, CALL_STACK_PAGE_SIZE); + if (!response.hasOwnProperty("frames")) { + return; + } if (why.type != "alreadyPaused") { const pause = (0, _create.createPause)(packet, response); diff --git a/devtools/client/debugger/new/src/components/Editor/EditorMenu.js b/devtools/client/debugger/new/src/components/Editor/EditorMenu.js index 579be733ac5d..ff62bf40d1e3 100644 --- a/devtools/client/debugger/new/src/components/Editor/EditorMenu.js +++ b/devtools/client/debugger/new/src/components/Editor/EditorMenu.js @@ -71,7 +71,7 @@ function getMenuItems(event, { const copyFunctionKey = L10N.getStr("copyFunction.accesskey"); const copyFunctionLabel = L10N.getStr("copyFunction.label"); const copySourceKey = L10N.getStr("copySource.accesskey"); - const copySourceLabel = L10N.getStr("copySource"); + const copySourceLabel = L10N.getStr("copySource.label"); const copyToClipboardKey = L10N.getStr("copyToClipboard.accesskey"); const copyToClipboardLabel = L10N.getStr("copyToClipboard.label"); const copySourceUri2Key = L10N.getStr("copySourceUri2.accesskey"); diff --git a/devtools/client/debugger/new/src/components/Editor/GutterMenu.js b/devtools/client/debugger/new/src/components/Editor/GutterMenu.js index 32f7684fdb5f..ee50fdb165cb 100644 --- a/devtools/client/debugger/new/src/components/Editor/GutterMenu.js +++ b/devtools/client/debugger/new/src/components/Editor/GutterMenu.js @@ -78,12 +78,14 @@ function gutterMenu({ closeConditionalPanel(); } }, + accelerator: L10N.getStr("toggleBreakpoint.key"), ...(breakpoint ? gutterItems.removeBreakpoint : gutterItems.addBreakpoint) }; const conditionalBreakpoint = { accesskey: L10N.getStr("editor.addConditionalBreakpoint.accesskey"), disabled: false, click: () => openConditionalPanel(line), + accelerator: L10N.getStr("toggleCondPanel.key"), ...(breakpoint && breakpoint.condition ? gutterItems.editConditional : gutterItems.addConditional) }; const items = [toggleBreakpointItem, conditionalBreakpoint]; diff --git a/devtools/client/debugger/new/src/components/Editor/SearchBar.js b/devtools/client/debugger/new/src/components/Editor/SearchBar.js index 51306e3dff62..fee6f1623c35 100644 --- a/devtools/client/debugger/new/src/components/Editor/SearchBar.js +++ b/devtools/client/debugger/new/src/components/Editor/SearchBar.js @@ -335,7 +335,7 @@ class SearchBar extends _react.Component { }, _react2.default.createElement(_SearchInput2.default, { query: this.state.query, count: count, - placeholder: L10N.getStr("sourceSearch.search.placeholder"), + placeholder: L10N.getStr("sourceSearch.search.placeholder2"), summaryMsg: this.buildSummaryMsg(), onChange: this.onChange, onBlur: this.onBlur, diff --git a/devtools/client/debugger/new/src/components/Editor/index.js b/devtools/client/debugger/new/src/components/Editor/index.js index c39d5f003f40..5efc9dc4cfd0 100644 --- a/devtools/client/debugger/new/src/components/Editor/index.js +++ b/devtools/client/debugger/new/src/components/Editor/index.js @@ -228,8 +228,10 @@ class Editor extends _react.PureComponent { return; } + (0, _editor.startOperation)(); (0, _ui.resizeBreakpointGutter)(this.state.editor.codeMirror); (0, _ui.resizeToggleButton)(this.state.editor.codeMirror); + (0, _editor.endOperation)(); } componentWillUpdate(nextProps) { @@ -260,8 +262,10 @@ class Editor extends _react.PureComponent { codeMirror } = editor; const codeMirrorWrapper = codeMirror.getWrapperElement(); + (0, _editor.startOperation)(); (0, _ui.resizeBreakpointGutter)(codeMirror); (0, _ui.resizeToggleButton)(codeMirror); + (0, _editor.endOperation)(); codeMirror.on("gutterClick", this.onGutterClick); // Set code editor wrapper to be focusable codeMirrorWrapper.tabIndex = 0; diff --git a/devtools/client/debugger/new/src/components/ProjectSearch.js b/devtools/client/debugger/new/src/components/ProjectSearch.js index 95c9f4e48dfd..37bb3bf1d53e 100644 --- a/devtools/client/debugger/new/src/components/ProjectSearch.js +++ b/devtools/client/debugger/new/src/components/ProjectSearch.js @@ -169,8 +169,7 @@ class ProjectSearch extends _react.Component { className: (0, _classnames2.default)("file-result", { focused }), - key: file.sourceId, - onClick: e => setExpanded(file, !expanded) + key: file.sourceId }, _react2.default.createElement(_Svg2.default, { name: "arrow", className: (0, _classnames2.default)({ diff --git a/devtools/client/debugger/new/src/components/QuickOpenModal.js b/devtools/client/debugger/new/src/components/QuickOpenModal.js index 85668ab22ce6..a46008427c08 100644 --- a/devtools/client/debugger/new/src/components/QuickOpenModal.js +++ b/devtools/client/debugger/new/src/components/QuickOpenModal.js @@ -436,7 +436,7 @@ class QuickOpenModal extends _react.Component { query: query, hasPrefix: true, count: this.getResultCount(), - placeholder: L10N.getStr("sourceSearch.search"), + placeholder: L10N.getStr("sourceSearch.search2"), summaryMsg: this.getSummaryMessage(), showErrorEmoji: this.shouldShowErrorEmoji(), onChange: this.onChange, diff --git a/devtools/client/debugger/new/src/components/ShortcutsModal.js b/devtools/client/debugger/new/src/components/ShortcutsModal.js index 3621d0a6802d..a3bc2c86bf79 100644 --- a/devtools/client/debugger/new/src/components/ShortcutsModal.js +++ b/devtools/client/debugger/new/src/components/ShortcutsModal.js @@ -51,7 +51,7 @@ class ShortcutsModal extends _react.Component { renderSearchShortcuts() { return _react2.default.createElement("ul", { className: "shortcuts-list" - }, this.renderShorcutItem(L10N.getStr("shortcuts.fileSearch"), (0, _text.formatKeyShortcut)(L10N.getStr("sources.search.key2"))), this.renderShorcutItem(L10N.getStr("shortcuts.searchAgain"), (0, _text.formatKeyShortcut)(L10N.getStr("sourceSearch.search.again.key2"))), this.renderShorcutItem(L10N.getStr("shortcuts.projectSearch"), (0, _text.formatKeyShortcut)(L10N.getStr("projectTextSearch.key"))), this.renderShorcutItem(L10N.getStr("shortcuts.functionSearch"), (0, _text.formatKeyShortcut)(L10N.getStr("functionSearch.key"))), this.renderShorcutItem(L10N.getStr("shortcuts.gotoLine"), (0, _text.formatKeyShortcut)(L10N.getStr("gotoLineModal.key2")))); + }, this.renderShorcutItem(L10N.getStr("shortcuts.fileSearch2"), (0, _text.formatKeyShortcut)(L10N.getStr("sources.search.key2"))), this.renderShorcutItem(L10N.getStr("shortcuts.searchAgain2"), (0, _text.formatKeyShortcut)(L10N.getStr("sourceSearch.search.again.key2"))), this.renderShorcutItem(L10N.getStr("shortcuts.projectSearch2"), (0, _text.formatKeyShortcut)(L10N.getStr("projectTextSearch.key"))), this.renderShorcutItem(L10N.getStr("shortcuts.functionSearch2"), (0, _text.formatKeyShortcut)(L10N.getStr("functionSearch.key"))), this.renderShorcutItem(L10N.getStr("shortcuts.gotoLine"), (0, _text.formatKeyShortcut)(L10N.getStr("gotoLineModal.key2")))); } renderShortcutsContent() { diff --git a/devtools/client/debugger/new/src/components/WelcomeBox.js b/devtools/client/debugger/new/src/components/WelcomeBox.js index 135c4502b3ec..08c2e1f2ad74 100644 --- a/devtools/client/debugger/new/src/components/WelcomeBox.js +++ b/devtools/client/debugger/new/src/components/WelcomeBox.js @@ -49,8 +49,8 @@ class WelcomeBox extends _react.Component { render() { const searchSourcesShortcut = (0, _text.formatKeyShortcut)(L10N.getStr("sources.search.key2")); const searchProjectShortcut = (0, _text.formatKeyShortcut)(L10N.getStr("projectTextSearch.key")); - const searchSourcesLabel = L10N.getStr("welcome.search").substring(2); - const searchProjectLabel = L10N.getStr("welcome.findInFiles").substring(2); + const searchSourcesLabel = L10N.getStr("welcome.search2").substring(2); + const searchProjectLabel = L10N.getStr("welcome.findInFiles2").substring(2); const { setActiveSearch, openQuickOpen diff --git a/devtools/client/debugger/new/src/reducers/source-tree.js b/devtools/client/debugger/new/src/reducers/source-tree.js index f9de236264fa..0d749e1e4aa1 100644 --- a/devtools/client/debugger/new/src/reducers/source-tree.js +++ b/devtools/client/debugger/new/src/reducers/source-tree.js @@ -7,12 +7,6 @@ exports.InitialState = InitialState; exports.default = update; exports.getExpandedState = getExpandedState; -var _makeRecord = require("../utils/makeRecord"); - -var _makeRecord2 = _interopRequireDefault(_makeRecord); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ @@ -22,20 +16,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de * @module reducers/source-tree */ function InitialState() { - return (0, _makeRecord2.default)({ + return { expanded: null - })(); + }; } function update(state = InitialState(), action) { switch (action.type) { case "SET_EXPANDED_STATE": - return state.set("expanded", action.expanded); + return updateExpanded(state, action); } return state; } +function updateExpanded(state, action) { + return { ...state, + expanded: new Set(action.expanded) + }; +} + function getExpandedState(state) { - return state.sourceTree.get("expanded"); + return state.sourceTree.expanded; } \ No newline at end of file diff --git a/devtools/client/debugger/new/src/reducers/sources.js b/devtools/client/debugger/new/src/reducers/sources.js index a8017f663f00..8c70772e10d5 100644 --- a/devtools/client/debugger/new/src/reducers/sources.js +++ b/devtools/client/debugger/new/src/reducers/sources.js @@ -178,6 +178,10 @@ function getTextPropsFromAction(action) { }; } + if (!action.value) { + return null; + } + return { id: sourceId, text: action.value.text, @@ -192,6 +196,11 @@ function getTextPropsFromAction(action) { function setSourceTextProps(state, action) { const source = getTextPropsFromAction(action); + + if (!source) { + return state; + } + return updateSources(state, [source]); } diff --git a/devtools/client/debugger/new/src/utils/editor/source-documents.js b/devtools/client/debugger/new/src/utils/editor/source-documents.js index 76e4e3ab9ccd..bbcd8e4bbaed 100644 --- a/devtools/client/debugger/new/src/utils/editor/source-documents.js +++ b/devtools/client/debugger/new/src/utils/editor/source-documents.js @@ -142,6 +142,15 @@ function setEditorText(editor, source) { editor.setText(text); } } + +function setMode(editor, source, symbols) { + const mode = (0, _source.getMode)(source, symbols); + const currentMode = editor.codeMirror.getOption("mode"); + + if (!currentMode || currentMode.name != mode.name) { + editor.setMode(mode); + } +} /** * Handle getting the source document or creating a new * document with the correct mode and text. @@ -157,19 +166,13 @@ function showSourceText(editor, source, symbols) { const doc = getDocument(source.id); if (editor.codeMirror.doc === doc) { - const mode = (0, _source.getMode)(source, symbols); - const currentMode = editor.codeMirror.getOption("mode"); - - if (currentMode.name != mode.name) { - editor.setMode(mode); - } - + setMode(editor, source, symbols); return; } editor.replaceDocument(doc); updateLineNumberFormat(editor, source.id); - editor.setMode((0, _source.getMode)(source, symbols)); + setMode(editor, source, symbols); return doc; } @@ -177,6 +180,6 @@ function showSourceText(editor, source, symbols) { setDocument(source.id, doc); editor.replaceDocument(doc); setEditorText(editor, source); - editor.setMode((0, _source.getMode)(source, symbols)); + setMode(editor, source, symbols); updateLineNumberFormat(editor, source.id); } \ No newline at end of file diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini index be0270051f77..cc373b30db02 100644 --- a/devtools/client/debugger/new/test/mochitest/browser.ini +++ b/devtools/client/debugger/new/test/mochitest/browser.ini @@ -710,6 +710,8 @@ skip-if = os == "win" skip-if = os == "win" [browser_dbg-returnvalues.js] [browser_dbg-reload.js] +[browser_dbg-reloading.js] +skip-if = true [browser_dbg-pause-points.js] [browser_dbg-scopes-mutations.js] [browser_dbg-search-file.js] @@ -726,6 +728,7 @@ skip-if = os == "win" || (verify) # Bug 1434792 [browser_dbg-sourcemaps-bogus.js] skip-if = os == 'linux' && !asan # bug 1447118 [browser_dbg-sources.js] +[browser_dbg-sources-arrow-keys.js] [browser_dbg-sources-named-eval.js] [browser_dbg-stepping.js] skip-if = debug || (verify && (os == 'win')) || (os == "win" && os_version == "6.1") diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js index 2807c908e2e7..a12001c925e2 100644 --- a/devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js +++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-quick-open.js @@ -70,10 +70,16 @@ add_task(async function() { info("Arrow keys and check to see if source is selected"); quickOpen(dbg, "sw"); is(resultCount(dbg), 2, "two file results"); + pressKey(dbg, "Escape"); + + + quickOpen(dbg, "sw2"); pressKey(dbg, "Down"); pressKey(dbg, "Enter"); await waitForSelectedSource(dbg, "switching-02"); + + quickOpen(dbg, "sw"); pressKey(dbg, "Tab"); assertDisabled(dbg); diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-reloading.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-reloading.js new file mode 100644 index 000000000000..1c4d67308b7b --- /dev/null +++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-reloading.js @@ -0,0 +1,42 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +/* + * Test reloading: + * 1. reload the source + * 2. re-sync breakpoints + */ + +async function waitForBreakpoint(dbg, location) { + return waitForState( + dbg, + state => { + return dbg.selectors.getBreakpoint(dbg.getState(), location); + }, + "Waiting for breakpoint" + ); +} + +add_task(async function() { + const dbg = await initDebugger("ember/quickstart/dist/"); + + await waitForSource(dbg, "ember-application/index.js"); + await selectSource(dbg, "ember-application/index.js"); + + info("1. reload and hit breakpoint") + await addBreakpoint(dbg, "ember-application/index.js", 4); + reload(dbg, "ember/quickstart/dist/"); + + info("2. Wait for sources to appear and then reload") + await waitForDispatch(dbg, "ADD_SOURCES") + reload(dbg, "ember/quickstart/dist/"); + + + info("3. Wait for sources to appear and then reload mid source-maps") + await waitForDispatch(dbg, "ADD_SOURCES"); + reload(dbg, "ember/quickstart/dist/"); + + info("4. wait for the debugger to pause and show that we're in the correct location") + await waitForPaused(dbg) + assertPausedLocation(dbg, "ember-application/index.js", 4); +}); diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-arrow-keys.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-arrow-keys.js new file mode 100644 index 000000000000..8dcf8b947e04 --- /dev/null +++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-sources-arrow-keys.js @@ -0,0 +1,79 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +// Test keyboard arrow behaviour + +async function waitForNodeToGainFocus(dbg, index) { + await waitUntil(() => { + const element = findElement(dbg, "sourceNode", index); + + if (element) { + return element.classList.contains("focused"); + } + + return false; + }, `waiting for source node ${index} to be focused`); +} + +async function assertNodeIsFocused(dbg, index) { + await waitForNodeToGainFocus(dbg, index); + const node = findElement(dbg, "sourceNode", index); + ok(node.classList.contains("focused"), `node ${index} is focused`); +} + +add_task(async function() { + const dbg = await initDebugger("doc-sources.html"); + await waitForSources(dbg, "simple1", "simple2", "nested-source", "long.js"); + + await clickElement(dbg, "sourceDirectoryLabel", 2); + await assertSourceCount(dbg, 7); + + // Right key on open dir + await pressKey(dbg, "Right"); + await assertNodeIsFocused(dbg, 3); + + // Right key on closed dir + await pressKey(dbg, "Right"); + await assertSourceCount(dbg, 8); + await assertNodeIsFocused(dbg, 3); + + // Left key on a open dir + await pressKey(dbg, "Left"); + await assertSourceCount(dbg, 7); + await assertNodeIsFocused(dbg, 3); + + // Down key on a closed dir + await pressKey(dbg, "Down"); + await assertNodeIsFocused(dbg, 4); + + // Right key on a source + await pressKey(dbg, "Right"); + await assertNodeIsFocused(dbg, 5); + + // Down key on a source + await pressKey(dbg, "Down"); + await assertNodeIsFocused(dbg, 6); + + // Go to bottom of tree and press down key + await pressKey(dbg, "Down"); + await pressKey(dbg, "Down"); + await assertNodeIsFocused(dbg, 7); + + // Up key on a source + await pressKey(dbg, "Up"); + await assertNodeIsFocused(dbg, 6); + + // Left key on a source + await pressKey(dbg, "Left"); + await assertNodeIsFocused(dbg, 2); + + // Left key on a closed dir + await pressKey(dbg, "Left"); + await assertSourceCount(dbg, 2); + await pressKey(dbg, "Left"); + await assertNodeIsFocused(dbg, 1); + + // Up Key at the top of the source tree + await pressKey(dbg, "Up"); + await assertNodeIsFocused(dbg, 1); +}); diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js index 0f5ace2a0425..b40c7cc26c7c 100644 --- a/devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js +++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-sources.js @@ -3,19 +3,6 @@ // Tests that the source tree works. -async function waitForSourceCount(dbg, i) { - // We are forced to wait until the DOM nodes appear because the - // source tree batches its rendering. - await waitUntil(() => { - return findAllElements(dbg, "sourceNodes").length === i; - }, `waiting for ${i} sources`); -} - -async function assertSourceCount(dbg, count) { - await waitForSourceCount(dbg, count); - is(findAllElements(dbg, "sourceNodes").length, count, `${count} sources`); -} - function getLabel(dbg, index) { return findElement(dbg, "sourceNode", index) .textContent.trim() diff --git a/devtools/client/debugger/new/test/mochitest/helpers.js b/devtools/client/debugger/new/test/mochitest/helpers.js index a958baf0e21b..888fab014243 100644 --- a/devtools/client/debugger/new/test/mochitest/helpers.js +++ b/devtools/client/debugger/new/test/mochitest/helpers.js @@ -1328,3 +1328,16 @@ async function assertPreviews(dbg, previews) { dbg.actions.clearPreview(); } } + +async function waitForSourceCount(dbg, i) { + // We are forced to wait until the DOM nodes appear because the + // source tree batches its rendering. + await waitUntil(() => { + return findAllElements(dbg, "sourceNodes").length === i; + }, `waiting for ${i} sources`); +} + +async function assertSourceCount(dbg, count) { + await waitForSourceCount(dbg, count); + is(findAllElements(dbg, "sourceNodes").length, count, `${count} sources`); +} diff --git a/devtools/client/inspector/flexbox/components/FlexContainer.js b/devtools/client/inspector/flexbox/components/FlexContainer.js index c1f873489ab0..338fcb6e7ffb 100644 --- a/devtools/client/inspector/flexbox/components/FlexContainer.js +++ b/devtools/client/inspector/flexbox/components/FlexContainer.js @@ -4,16 +4,16 @@ "use strict"; -const { createFactory, createRef, PureComponent } = require("devtools/client/shared/vendor/react"); +const { + createElement, + createRef, + Fragment, + PureComponent, +} = require("devtools/client/shared/vendor/react"); const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { translateNodeFrontToGrip } = require("devtools/client/inspector/shared/utils"); -loader.lazyGetter(this, "FlexItemSelector", function() { - return createFactory(require("./FlexItemSelector")); -}); - -// Reps const { REPS, MODE } = require("devtools/client/shared/components/reps/reps"); const { Rep } = REPS; const ElementNode = REPS.ElementNode; @@ -28,8 +28,6 @@ class FlexContainer extends PureComponent { onHideBoxModelHighlighter: PropTypes.func.isRequired, onSetFlexboxOverlayColor: PropTypes.func.isRequired, onShowBoxModelHighlighterForNode: PropTypes.func.isRequired, - onToggleFlexboxHighlighter: PropTypes.func.isRequired, - onToggleFlexItemShown: PropTypes.func.isRequired, setSelectedNode: PropTypes.func.isRequired, }; } @@ -40,7 +38,6 @@ class FlexContainer extends PureComponent { this.colorValueEl = createRef(); this.swatchEl = createRef(); - this.onFlexboxCheckboxClick = this.onFlexboxCheckboxClick.bind(this); this.onFlexboxInspectIconClick = this.onFlexboxInspectIconClick.bind(this); this.setFlexboxColor = this.setFlexboxColor.bind(this); } @@ -77,51 +74,12 @@ class FlexContainer extends PureComponent { this.props.onSetFlexboxOverlayColor(color); } - onFlexboxCheckboxClick(e) { - // If the click was on the svg icon to select the node in the inspector, bail out. - const originalTarget = e.nativeEvent && e.nativeEvent.explicitOriginalTarget; - if (originalTarget && originalTarget.namespaceURI === "http://www.w3.org/2000/svg") { - // We should be able to cancel the click event propagation after the following reps - // issue is implemented : https://github.com/devtools-html/reps/issues/95 . - e.preventDefault(); - return; - } - - const { - flexbox, - onToggleFlexboxHighlighter, - } = this.props; - - onToggleFlexboxHighlighter(flexbox.nodeFront); - } - onFlexboxInspectIconClick(nodeFront) { const { setSelectedNode } = this.props; setSelectedNode(nodeFront, { reason: "layout-panel" }); nodeFront.scrollIntoView().catch(e => console.error(e)); } - renderFlexItemSelector() { - const { - flexbox, - onToggleFlexItemShown, - } = this.props; - const { - flexItems, - flexItemShown, - } = flexbox; - - if (!flexItemShown) { - return null; - } - - return FlexItemSelector({ - flexItem: flexItems.find(item => item.nodeFront.actorID === flexItemShown), - flexItems, - onToggleFlexItemShown, - }); - } - render() { const { flexbox, @@ -130,56 +88,36 @@ class FlexContainer extends PureComponent { } = this.props; const { color, - highlighted, nodeFront, } = flexbox; - return ( - dom.div({ className: "flex-container devtools-monospace" }, - dom.div({}, - dom.label({}, - dom.input( - { - className: "devtools-checkbox-toggle", - checked: highlighted, - onChange: this.onFlexboxCheckboxClick, - type: "checkbox", - } - ), - Rep( - { - defaultRep: ElementNode, - mode: MODE.TINY, - object: translateNodeFrontToGrip(nodeFront), - onDOMNodeMouseOut: () => onHideBoxModelHighlighter(), - onDOMNodeMouseOver: () => onShowBoxModelHighlighterForNode(nodeFront), - onInspectIconClick: () => this.onFlexboxInspectIconClick(nodeFront), - } - ) - ), - dom.div( - { - className: "layout-color-swatch", - ref: this.swatchEl, - style: { - backgroundColor: color, - }, - title: color, - } - ), - // The SwatchColorPicker relies on the nextSibling of the swatch element to - // apply the selected color. This is why we use a span in display: none for - // now. Ideally we should modify the SwatchColorPickerTooltip to bypass this - // requirement. See https://bugzilla.mozilla.org/show_bug.cgi?id=1341578 - dom.span( - { - className: "layout-color-value", - ref: this.colorValueEl, - }, - color - ) - ), - this.renderFlexItemSelector() + return createElement(Fragment, null, + Rep({ + defaultRep: ElementNode, + mode: MODE.TINY, + object: translateNodeFrontToGrip(nodeFront), + onDOMNodeMouseOut: () => onHideBoxModelHighlighter(), + onDOMNodeMouseOver: () => onShowBoxModelHighlighterForNode(nodeFront), + onInspectIconClick: () => this.onFlexboxInspectIconClick(nodeFront), + }), + dom.div({ + className: "layout-color-swatch", + ref: this.swatchEl, + style: { + backgroundColor: color, + }, + title: color, + }), + // The SwatchColorPicker relies on the nextSibling of the swatch element to + // apply the selected color. This is why we use a span in display: none for + // now. Ideally we should modify the SwatchColorPickerTooltip to bypass this + // requirement. See https://bugzilla.mozilla.org/show_bug.cgi?id=1341578 + dom.span( + { + className: "layout-color-value", + ref: this.colorValueEl, + }, + color ) ); } diff --git a/devtools/client/inspector/flexbox/components/FlexItem.js b/devtools/client/inspector/flexbox/components/FlexItem.js index e604b4f334f7..12d36702ffa3 100644 --- a/devtools/client/inspector/flexbox/components/FlexItem.js +++ b/devtools/client/inspector/flexbox/components/FlexItem.js @@ -9,7 +9,6 @@ const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { translateNodeFrontToGrip } = require("devtools/client/inspector/shared/utils"); -// Reps const { REPS, MODE } = require("devtools/client/shared/components/reps/reps"); const { Rep } = REPS; const ElementNode = REPS.ElementNode; @@ -38,13 +37,11 @@ class FlexItem extends PureComponent { className: "devtools-button devtools-monospace", onClick: () => onToggleFlexItemShown(nodeFront), }, - Rep( - { - defaultRep: ElementNode, - mode: MODE.TINY, - object: translateNodeFrontToGrip(nodeFront) - } - ) + Rep({ + defaultRep: ElementNode, + mode: MODE.TINY, + object: translateNodeFrontToGrip(nodeFront), + }) ) ) ); diff --git a/devtools/client/inspector/flexbox/components/FlexItemSelector.js b/devtools/client/inspector/flexbox/components/FlexItemSelector.js index 7589bafb4b0f..65d2aa47c8d6 100644 --- a/devtools/client/inspector/flexbox/components/FlexItemSelector.js +++ b/devtools/client/inspector/flexbox/components/FlexItemSelector.js @@ -7,9 +7,11 @@ const { PureComponent } = require("devtools/client/shared/vendor/react"); const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const { translateNodeFrontToGrip } = require("devtools/client/inspector/shared/utils"); +const { + getSelectorFromGrip, + translateNodeFrontToGrip, +} = require("devtools/client/inspector/shared/utils"); -// Reps const { REPS, MODE } = require("devtools/client/shared/components/reps/reps"); const { Rep } = REPS; const ElementNode = REPS.ElementNode; @@ -43,7 +45,7 @@ class FlexItemSelector extends PureComponent { for (const item of flexItems) { const grip = translateNodeFrontToGrip(item.nodeFront); menuItems.push({ - label: getLabel(grip), + label: getSelectorFromGrip(grip), type: "checkbox", checked: item === flexItem, click: () => onToggleFlexItemShown(item.nodeFront), @@ -59,61 +61,20 @@ class FlexItemSelector extends PureComponent { const { flexItem } = this.props; return ( - dom.div({ className: "flex-item-selector-wrapper" }, - dom.button( - { - id: "flex-item-selector", - className: "devtools-button devtools-dropdown-button", - onClick: this.onShowFlexItemMenu, - }, - Rep( - { - defaultRep: ElementNode, - mode: MODE.TINY, - object: translateNodeFrontToGrip(flexItem.nodeFront) - } - ) - ) + dom.button( + { + id: "flex-item-selector", + className: "devtools-button devtools-dropdown-button", + onClick: this.onShowFlexItemMenu, + }, + Rep({ + defaultRep: ElementNode, + mode: MODE.TINY, + object: translateNodeFrontToGrip(flexItem.nodeFront), + }) ) ); } } -/** - * Returns a selector label of the Element Rep from the grip. This is based on the - * getElements() function in our devtools-reps component for a ElementNode. - * - * @param {Object} grip - * Grip-like object that can be used with Reps. - * @return {String} selector label of the element node. - */ -function getLabel(grip) { - const { - attributes, - nodeName, - isAfterPseudoElement, - isBeforePseudoElement - } = grip.preview; - - if (isAfterPseudoElement || isBeforePseudoElement) { - return `::${isAfterPseudoElement ? "after" : "before"}`; - } - - let label = nodeName; - - if (attributes.id) { - label += `#${attributes.id}`; - } - - if (attributes.class) { - label += attributes.class - .trim() - .split(/\s+/) - .map(cls => `.${cls}`) - .join(""); - } - - return label; -} - module.exports = FlexItemSelector; diff --git a/devtools/client/inspector/flexbox/components/Flexbox.js b/devtools/client/inspector/flexbox/components/Flexbox.js index 075aa6a1bfbd..d7a4a152cc60 100644 --- a/devtools/client/inspector/flexbox/components/Flexbox.js +++ b/devtools/client/inspector/flexbox/components/Flexbox.js @@ -9,9 +9,6 @@ const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { getStr } = require("devtools/client/inspector/layout/utils/l10n"); -loader.lazyGetter(this, "FlexContainer", function() { - return createFactory(require("./FlexContainer")); -}); loader.lazyGetter(this, "FlexContainerProperties", function() { return createFactory(require("./FlexContainerProperties")); }); @@ -21,6 +18,9 @@ loader.lazyGetter(this, "FlexItemList", function() { loader.lazyGetter(this, "FlexItemSizingProperties", function() { return createFactory(require("./FlexItemSizingProperties")); }); +loader.lazyGetter(this, "Header", function() { + return createFactory(require("./Header")); +}); const Types = require("../types"); @@ -48,7 +48,7 @@ class Flexbox extends PureComponent { flexItemShown, } = flexbox; - if (flexItemShown) { + if (flexItemShown || !flexItems.length) { return null; } @@ -97,7 +97,7 @@ class Flexbox extends PureComponent { return ( dom.div({ id: "layout-flexbox-container" }, - FlexContainer({ + Header({ flexbox, getSwatchColorPickerTooltip, onHideBoxModelHighlighter, diff --git a/devtools/client/inspector/flexbox/components/Header.js b/devtools/client/inspector/flexbox/components/Header.js new file mode 100644 index 000000000000..cf02913e197e --- /dev/null +++ b/devtools/client/inspector/flexbox/components/Header.js @@ -0,0 +1,128 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +"use strict"; + +const { createFactory, PureComponent } = require("devtools/client/shared/vendor/react"); +const dom = require("devtools/client/shared/vendor/react-dom-factories"); +const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); + +const FlexContainer = createFactory(require("./FlexContainer")); +const FlexItemSelector = createFactory(require("./FlexItemSelector")); + +const Types = require("../types"); + +class Header extends PureComponent { + static get propTypes() { + return { + flexbox: PropTypes.shape(Types.flexbox).isRequired, + getSwatchColorPickerTooltip: PropTypes.func.isRequired, + onHideBoxModelHighlighter: PropTypes.func.isRequired, + onSetFlexboxOverlayColor: PropTypes.func.isRequired, + onShowBoxModelHighlighterForNode: PropTypes.func.isRequired, + onToggleFlexboxHighlighter: PropTypes.func.isRequired, + onToggleFlexItemShown: PropTypes.func.isRequired, + setSelectedNode: PropTypes.func.isRequired, + }; + } + + constructor(props) { + super(props); + this.onFlexboxCheckboxClick = this.onFlexboxCheckboxClick.bind(this); + } + + onFlexboxCheckboxClick() { + const { + flexbox, + onToggleFlexboxHighlighter, + } = this.props; + + onToggleFlexboxHighlighter(flexbox.nodeFront); + } + + renderFlexContainer() { + if (this.props.flexbox.flexItemShown) { + return null; + } + + const { + flexbox, + getSwatchColorPickerTooltip, + onHideBoxModelHighlighter, + onSetFlexboxOverlayColor, + onShowBoxModelHighlighterForNode, + setSelectedNode, + } = this.props; + + return FlexContainer({ + flexbox, + getSwatchColorPickerTooltip, + onHideBoxModelHighlighter, + onSetFlexboxOverlayColor, + onShowBoxModelHighlighterForNode, + setSelectedNode, + }); + } + + renderFlexItemSelector() { + if (!this.props.flexbox.flexItemShown) { + return null; + } + + const { + flexbox, + onToggleFlexItemShown, + } = this.props; + const { + flexItems, + flexItemShown, + } = flexbox; + + return FlexItemSelector({ + flexItem: flexItems.find(item => item.nodeFront.actorID === flexItemShown), + flexItems, + onToggleFlexItemShown, + }); + } + + render() { + const { + flexbox, + onToggleFlexItemShown, + } = this.props; + const { + flexItemShown, + highlighted, + } = flexbox; + + return ( + dom.div({ className: "flex-header devtools-monospace" }, + flexItemShown ? + dom.button({ + className: "flex-header-button-prev devtools-button", + onClick: () => onToggleFlexItemShown(), + }) + : + null, + dom.div( + { + className: "flex-header-content" + + (flexItemShown ? " flex-item-shown" : "") + }, + this.renderFlexContainer(), + this.renderFlexItemSelector() + ), + dom.div({ className: "devtools-separator" }), + dom.input({ + className: "devtools-checkbox-toggle", + checked: highlighted, + onChange: this.onFlexboxCheckboxClick, + type: "checkbox", + }) + ) + ); + } +} + +module.exports = Header; diff --git a/devtools/client/inspector/flexbox/components/moz.build b/devtools/client/inspector/flexbox/components/moz.build index 4b3568e9f68b..7cf5e569cff1 100644 --- a/devtools/client/inspector/flexbox/components/moz.build +++ b/devtools/client/inspector/flexbox/components/moz.build @@ -12,4 +12,5 @@ DevToolsModules( 'FlexItemList.js', 'FlexItemSelector.js', 'FlexItemSizingProperties.js', + 'Header.js', ) diff --git a/devtools/client/inspector/flexbox/flexbox.js b/devtools/client/inspector/flexbox/flexbox.js index 92b86a3f6720..94739a33d498 100644 --- a/devtools/client/inspector/flexbox/flexbox.js +++ b/devtools/client/inspector/flexbox/flexbox.js @@ -24,6 +24,7 @@ class FlexboxInspector { constructor(inspector, window) { this.document = window.document; this.inspector = inspector; + this.selection = inspector.selection; this.store = inspector.store; this.walker = inspector.walker; @@ -85,7 +86,7 @@ class FlexboxInspector { this.highlighters.off("flexbox-highlighter-shown", this.onHighlighterShown); } - this.inspector.selection.off("new-node-front", this.onUpdatePanel); + this.selection.off("new-node-front", this.onUpdatePanel); this.inspector.sidebar.off("select", this.onSidebarSelect); this.inspector.off("new-root", this.onUpdatePanel); @@ -96,6 +97,7 @@ class FlexboxInspector { this.hasGetCurrentFlexbox = null; this.inspector = null; this.layoutInspector = null; + this.selection = null; this.store = null; this.walker = null; } @@ -180,14 +182,14 @@ class FlexboxInspector { async onReflow() { if (!this.isPanelVisible() || !this.store || - !this.inspector.selection.nodeFront || + !this.selection.nodeFront || !this.hasGetCurrentFlexbox) { return; } try { const flexboxFront = await this.layoutInspector.getCurrentFlexbox( - this.inspector.selection.nodeFront); + this.selection.nodeFront); // Clear the flexbox panel if there is no flex container for the current node // selection. @@ -243,14 +245,14 @@ class FlexboxInspector { onSidebarSelect() { if (!this.isPanelVisible()) { this.inspector.reflowTracker.untrackReflows(this, this.onReflow); - this.inspector.selection.off("new-node-front", this.onUpdatePanel); this.inspector.off("new-root", this.onUpdatePanel); + this.selection.off("new-node-front", this.onUpdatePanel); return; } this.inspector.reflowTracker.trackReflows(this, this.onReflow); - this.inspector.selection.on("new-node-front", this.onUpdatePanel); this.inspector.on("new-root", this.onUpdatePanel); + this.selection.on("new-node-front", this.onUpdatePanel); this.update(); } @@ -270,16 +272,21 @@ class FlexboxInspector { } /** - * Handler for a change in the input checkbox in the FlexItem component. - * Toggles on/off the flex item highlighter for the provided flex item element. + * Handler for a change in the input checkbox in the FlexItem and Header component. + * Toggles on/off the flex item highlighter for the provided flex item element and + * changes the selection to the given node. * - * @param {NodeFront} node + * @param {NodeFront|null} node * The NodeFront of the flex item element for which the flex item is toggled * on/off for. */ onToggleFlexItemShown(node) { this.highlighters.toggleFlexItemHighlighter(node); this.store.dispatch(toggleFlexItemShown(node)); + + if (node) { + this.selection.setNodeFront(node); + } } /** @@ -307,7 +314,7 @@ class FlexboxInspector { // selected. if (!this.inspector || !this.store || - !this.inspector.selection.nodeFront || + !this.selection.nodeFront || !this.hasGetCurrentFlexbox) { return; } @@ -316,7 +323,7 @@ class FlexboxInspector { // Fetch the current flexbox if no flexbox front was passed into this update. if (!flexboxFront) { flexboxFront = await this.layoutInspector.getCurrentFlexbox( - this.inspector.selection.nodeFront); + this.selection.nodeFront); } // Clear the flexbox panel if there is no flex container for the current node @@ -335,17 +342,25 @@ class FlexboxInspector { ["containerEl"]); } - // Fetch the flex items for the given flex container and the flex item NodeFronts. - const flexItems = []; + // Fetch the flex items for the given flex container. const flexItemFronts = await flexboxFront.getFlexItems(); + const flexItems = []; + let flexItemShown = null; for (const flexItemFront of flexItemFronts) { + // Fetch the NodeFront of the flex items. let itemNodeFront = flexItemFront.nodeFront; if (!itemNodeFront) { itemNodeFront = await this.walker.getNodeFromActor(flexItemFront.actorID, ["element"]); } + // If the current selected node is a flex item, display its flex item sizing + // properties. + if (!flexItemShown && itemNodeFront === this.selection.nodeFront) { + flexItemShown = itemNodeFront.actorID; + } + flexItems.push({ actorID: flexItemFront.actorID, flexItemSizing: flexItemFront.flexItemSizing, @@ -363,16 +378,6 @@ class FlexboxInspector { const customColors = await this.getCustomFlexboxColors(); const color = customColors[hostname] ? customColors[hostname] : FLEXBOX_COLOR; - const { flexbox } = this.store.getState(); - let { flexItemShown } = flexbox; - - // Check if the flex item shown still exists in the list of flex items, otherwise - // set the flex item shown to null. - if (flexItemShown && - !flexItemFronts.find(item => item.nodeFront.actorID === flexItemShown)) { - flexItemShown = null; - } - this.store.dispatch(updateFlexbox({ actorID: flexboxFront.actorID, color, diff --git a/devtools/client/inspector/flexbox/reducers/flexbox.js b/devtools/client/inspector/flexbox/reducers/flexbox.js index 167f83b08a6b..e81498e24020 100644 --- a/devtools/client/inspector/flexbox/reducers/flexbox.js +++ b/devtools/client/inspector/flexbox/reducers/flexbox.js @@ -36,11 +36,16 @@ const reducers = { }, [TOGGLE_FLEX_ITEM_SHOWN](flexbox, { nodeFront }) { - const { flexItems } = flexbox; - const flexItemShown = flexItems.find(item => item.nodeFront === nodeFront); + let flexItemShown = null; + + // Get the NodeFront actor ID of the flex item. + if (nodeFront) { + const flexItem = flexbox.flexItems.find(item => item.nodeFront === nodeFront); + flexItemShown = flexItem.nodeFront.actorID; + } return Object.assign({}, flexbox, { - flexItemShown: flexItemShown ? flexItemShown.nodeFront.actorID : null, + flexItemShown, }); }, diff --git a/devtools/client/inspector/grids/components/GridItem.js b/devtools/client/inspector/grids/components/GridItem.js index 1cc363c40c76..fa9e55a52045 100644 --- a/devtools/client/inspector/grids/components/GridItem.js +++ b/devtools/client/inspector/grids/components/GridItem.js @@ -9,7 +9,6 @@ const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { translateNodeFrontToGrip } = require("devtools/client/inspector/shared/utils"); -// Reps const { REPS, MODE } = require("devtools/client/shared/components/reps/reps"); const { Rep } = REPS; const ElementNode = REPS.ElementNode; diff --git a/devtools/client/inspector/layout/components/LayoutApp.js b/devtools/client/inspector/layout/components/LayoutApp.js index 475e0d013db5..460c8a7dfe66 100644 --- a/devtools/client/inspector/layout/components/LayoutApp.js +++ b/devtools/client/inspector/layout/components/LayoutApp.js @@ -9,8 +9,13 @@ const { createFactory, PureComponent } = require("devtools/client/shared/vendor/ const dom = require("devtools/client/shared/vendor/react-dom-factories"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { connect } = require("devtools/client/shared/vendor/react-redux"); +const { + getSelectorFromGrip, + translateNodeFrontToGrip, +} = require("devtools/client/inspector/shared/utils"); const { LocalizationHelper } = require("devtools/shared/l10n"); +const Accordion = createFactory(require("./Accordion")); const BoxModel = createFactory(require("devtools/client/inspector/boxmodel/components/BoxModel")); const Flexbox = createFactory(require("devtools/client/inspector/flexbox/components/Flexbox")); const Grid = createFactory(require("devtools/client/inspector/grids/components/Grid")); @@ -19,8 +24,6 @@ const BoxModelTypes = require("devtools/client/inspector/boxmodel/types"); const FlexboxTypes = require("devtools/client/inspector/flexbox/types"); const GridTypes = require("devtools/client/inspector/grids/types"); -const Accordion = createFactory(require("./Accordion")); - const BOXMODEL_STRINGS_URI = "devtools/client/locales/boxmodel.properties"; const BOXMODEL_L10N = new LocalizationHelper(BOXMODEL_STRINGS_URI); @@ -59,6 +62,21 @@ class LayoutApp extends PureComponent { }; } + getFlexboxHeader() { + const { flexbox } = this.props; + + if (!flexbox.actorID) { + // No flex container or flex item selected. + return LAYOUT_L10N.getStr("flexbox.header"); + } else if (!flexbox.flexItemShown) { + // No flex item selected. + return LAYOUT_L10N.getStr("flexbox.flexContainer"); + } + + const grip = translateNodeFrontToGrip(flexbox.nodeFront); + return LAYOUT_L10N.getFormatStr("flexbox.flexItemOf", getSelectorFromGrip(grip)); + } + render() { let items = [ { @@ -88,7 +106,7 @@ class LayoutApp extends PureComponent { { component: Flexbox, componentProps: this.props, - header: LAYOUT_L10N.getStr("flexbox.header"), + header: this.getFlexboxHeader(), opened: Services.prefs.getBoolPref(FLEXBOX_OPENED_PREF), onToggled: () => { const opened = Services.prefs.getBoolPref(FLEXBOX_OPENED_PREF); diff --git a/devtools/client/inspector/shared/utils.js b/devtools/client/inspector/shared/utils.js index af9827990fa3..3fd5e8661101 100644 --- a/devtools/client/inspector/shared/utils.js +++ b/devtools/client/inspector/shared/utils.js @@ -109,6 +109,43 @@ function createChild(parent, tagName, attributes = {}) { return elt; } +/** + * Returns a selector of the Element Rep from the grip. This is based on the + * getElements() function in our devtools-reps component for a ElementNode. + * + * @param {Object} grip + * Grip-like object that can be used with Reps. + * @return {String} selector of the element node. + */ +function getSelectorFromGrip(grip) { + const { + attributes, + nodeName, + isAfterPseudoElement, + isBeforePseudoElement + } = grip.preview; + + if (isAfterPseudoElement || isBeforePseudoElement) { + return `::${isAfterPseudoElement ? "after" : "before"}`; + } + + let selector = nodeName; + + if (attributes.id) { + selector += `#${attributes.id}`; + } + + if (attributes.class) { + selector += attributes.class + .trim() + .split(/\s+/) + .map(cls => `.${cls}`) + .join(""); + } + + return selector; +} + /** * Log the provided error to the console and return a rejected Promise for * this error. @@ -160,6 +197,7 @@ exports.advanceValidate = advanceValidate; exports.appendText = appendText; exports.blurOnMultipleProperties = blurOnMultipleProperties; exports.createChild = createChild; +exports.getSelectorFromGrip = getSelectorFromGrip; exports.promiseWarn = promiseWarn; exports.throttle = throttle; exports.translateNodeFrontToGrip = translateNodeFrontToGrip; diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 1dbadf48cf3e..22b1bc7fb95a 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -107,6 +107,7 @@ devtools.jar: skin/tooltips.css (themes/tooltips.css) skin/images/accessibility.svg (themes/images/accessibility.svg) skin/images/add.svg (themes/images/add.svg) + skin/images/arrowhead-left.svg (themes/images/arrowhead-left.svg) skin/images/arrowhead-down.svg (themes/images/arrowhead-down.svg) skin/images/arrowhead-up.svg (themes/images/arrowhead-up.svg) skin/images/breadcrumbs-divider.svg (themes/images/breadcrumbs-divider.svg) diff --git a/devtools/client/locales/en-US/debugger.properties b/devtools/client/locales/en-US/debugger.properties index 0a8601ab3881..3f67bc6029c4 100644 --- a/devtools/client/locales/en-US/debugger.properties +++ b/devtools/client/locales/en-US/debugger.properties @@ -19,9 +19,10 @@ collapsePanes=Collapse panes copyToClipboard.label=Copy to clipboard copyToClipboard.accesskey=C -# LOCALIZATION NOTE (copySource): This is the text that appears in the +# LOCALIZATION NOTE (copySource.label): This is the text that appears in the # context menu to copy the selected source of file open. copySource=Copy +copySource.label=Copy source text copySource.accesskey=y # LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the @@ -261,6 +262,10 @@ sourceSearch.search.key2=CmdOrCtrl+F # the source search input bar sourceSearch.search.placeholder=Search in file… +# LOCALIZATION NOTE (sourceSearch.search.placeholder2): placeholder text in +# the source search input bar +sourceSearch.search.placeholder2=Find in file… + # LOCALIZATION NOTE (sourceSearch.search.again.key2): Key shortcut to highlight # the next occurrence of the last search triggered from a source search # Do not localize "CmdOrCtrl+G", or change the format of the string. These are @@ -305,6 +310,10 @@ searchPanelGlobal=Search in all files (%S) # filter panel popup for the function search operation. searchPanelFunction=Search for function definition (%S) +# LOCALIZATION NOTE (searchPanelFunction2): This is the text that appears in the +# filter panel popup for the function search operation. +searchPanelFunction2=Find function definition (%S) + # LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the # filter panel popup for the token search operation. searchPanelToken=Find in this file (%S) @@ -496,6 +505,7 @@ expressions.placeholder=Add watch expression expressions.errorMsg=Invalid expression… expressions.label=Add watch expression expressions.accesskey=e +expressions.key=CmdOrCtrl+Shift+E # LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item # for closing the selected tab below the mouse. @@ -617,11 +627,21 @@ watchExpressions.refreshButton=Refresh # a mac we use the unicode character. welcome.search=%S to search for sources +# LOCALIZATION NOTE (welcome.search2): The center pane welcome panel's +# search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on +# a mac we use the unicode character. +welcome.search2=%S Go to file + # LOCALIZATION NOTE (welcome.findInFiles): The center pane welcome panel's # search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on # a mac we use the unicode character. welcome.findInFiles=%S to find in files +# LOCALIZATION NOTE (welcome.findInFiles2): The center pane welcome panel's +# search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on +# a mac we use the unicode character. +welcome.findInFiles2=%S Find in files + # LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome # panel. %S is replaced by the keyboard shortcut to search for functions. welcome.searchFunction=%S to search for functions in file @@ -630,6 +650,10 @@ welcome.searchFunction=%S to search for functions in file # prompt for searching for files. sourceSearch.search=Search sources… +# LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search +# prompt for searching for files. +sourceSearch.search2=Go to file… + # LOCALIZATION NOTE (sourceSearch.noResults2): The center pane Source Search # message when the query did not match any of the sources. sourceSearch.noResults2=No results found @@ -904,6 +928,10 @@ shortcuts.stepOut=Step Out # keyboard shortcut action for source file search shortcuts.fileSearch=Source File Search +# LOCALIZATION NOTE (shortcuts.fileSearch2): text describing +# keyboard shortcut action for source file search +shortcuts.fileSearch2=Go to file + # LOCALIZATION NOTE (shortcuts.gotoLine): text describing # keyboard shortcut for jumping to a specific line shortcuts.gotoLine=Go to line @@ -912,14 +940,26 @@ shortcuts.gotoLine=Go to line # keyboard shortcut action for searching again shortcuts.searchAgain=Search Again +# LOCALIZATION NOTE (shortcuts.searchAgain2): text describing +# keyboard shortcut action for searching again +shortcuts.searchAgain2=Find next + # LOCALIZATION NOTE (shortcuts.projectSearch): text describing # keyboard shortcut action for full project search shortcuts.projectSearch=Full Project Search +# LOCALIZATION NOTE (shortcuts.projectSearch2): text describing +# keyboard shortcut action for full project search +shortcuts.projectSearch2=Find in files + # LOCALIZATION NOTE (shortcuts.functionSearch): text describing # keyboard shortcut action for function search shortcuts.functionSearch=Function Search +# LOCALIZATION NOTE (shortcuts.functionSearch2): text describing +# keyboard shortcut action for function search +shortcuts.functionSearch2=Find function + # LOCALIZATION NOTE (shortcuts.buttonName): text describing # keyboard shortcut button text shortcuts.buttonName=Keyboard shortcuts diff --git a/devtools/client/locales/en-US/layout.properties b/devtools/client/locales/en-US/layout.properties index a300b6fa6d68..0ec7f073e386 100644 --- a/devtools/client/locales/en-US/layout.properties +++ b/devtools/client/locales/en-US/layout.properties @@ -5,9 +5,18 @@ # LOCALIZATION NOTE This file contains the Layout Inspector strings. # The Layout Inspector is a panel accessible in the Inspector sidebar. -# LOCALIZATION NOTE (flexbox.header): The accordion header for the Flexbox pane. +# LOCALIZATION NOTE (flexbox.header): The accordion header for the Flexbox panel when +# no flex container or item is selected. flexbox.header=Flexbox +# LOCALIZATION (flexbox.flexContainer): The accordion header for the Flexbox panel +# when a flex container is selected. +flexbox.flexContainer=Flex Container + +# LOCALIZATION NOTE) (flexbox.flexItemOf): The accordion header for the Flexbox panel +# when a flex item is selected. %s represents the flex container selector. +flexbox.flexItemOf=Flex Item of %s + # LOCALIZATION NOTE (flexbox.noFlexboxeOnThisPage): In the case where there are no CSS # flex containers to display. flexbox.noFlexboxeOnThisPage=Select a Flex container or item to continue. @@ -29,22 +38,22 @@ layout.cannotShowGridOutline=Cannot show outline for this grid layout.cannotShowGridOutline.title=The selected grid’s outline cannot effectively fit inside the layout panel for it to be usable. # LOCALIZATION NOTE (layout.displayAreaNames): Label of the display area names setting -# option in the CSS Grid pane. +# option in the CSS Grid panel. layout.displayAreaNames=Display area names # LOCALIZATION NOTE (layout.displayLineNumbers): Label of the display line numbers -# setting option in the CSS Grid pane. +# setting option in the CSS Grid panel. layout.displayLineNumbers=Display line numbers # LOCALIZATION NOTE (layout.extendLinesInfinitely): Label of the extend lines -# infinitely setting option in the CSS Grid pane. +# infinitely setting option in the CSS Grid panel. layout.extendLinesInfinitely=Extend lines infinitely -# LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid pane. +# LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid panel. layout.header=Grid # LOCALIZATION NOTE (layout.gridDisplaySettings): The header for the grid display -# settings container in the CSS Grid pane. +# settings container in the CSS Grid panel. layout.gridDisplaySettings=Grid Display Settings # LOCALIZATION NOTE (layout.noGridsOnThisPage): In the case where there are no CSS grid @@ -52,7 +61,7 @@ layout.gridDisplaySettings=Grid Display Settings layout.noGridsOnThisPage=CSS Grid is not in use on this page # LOCALIZATION NOTE (layout.overlayMultipleGrids): The header for the list of grid -# container elements that can be highlighted in the CSS Grid pane. +# container elements that can be highlighted in the CSS Grid panel. layout.overlayMultipleGrids=Overlay Multiple Grids # LOCALIZATION NOTE (layout.overlayGrid): Alternate header for the list of grid container diff --git a/devtools/client/preferences/devtools-client.js b/devtools/client/preferences/devtools-client.js index 7737d67c9a32..113f13a21c5b 100644 --- a/devtools/client/preferences/devtools-client.js +++ b/devtools/client/preferences/devtools-client.js @@ -67,14 +67,14 @@ pref("devtools.inspector.fonthighlighter.enabled", true); pref("devtools.inspector.changes.enabled", false); // Flexbox preferences -// Enable the Flexbox highlighter in Nightly +// Enable the Flexbox highlighter and inspector panel in Nightly #if defined(NIGHTLY_BUILD) pref("devtools.inspector.flexboxHighlighter.enabled", true); +pref("devtools.flexboxinspector.enabled", true); #else pref("devtools.inspector.flexboxHighlighter.enabled", false); -#endif -// Enable the Flexbox Inspector panel pref("devtools.flexboxinspector.enabled", false); +#endif // Grid highlighter preferences pref("devtools.gridinspector.gridOutlineMaxColumns", 50); diff --git a/devtools/client/shared/components/reps/reps.css b/devtools/client/shared/components/reps/reps.css index dd561e8a9b2d..fed9474c3109 100644 --- a/devtools/client/shared/components/reps/reps.css +++ b/devtools/client/shared/components/reps/reps.css @@ -221,6 +221,7 @@ html[dir="rtl"] .tree-node img.arrow { padding: 0 2px; } +.objectBox-accessible.clickable, .objectBox-node.clickable { cursor: pointer; } @@ -246,6 +247,7 @@ html[dir="rtl"] .tree-node img.arrow { color: var(--comment-node-color); } +.accessible-role, .tag-name { color: var(--object-color); } @@ -322,8 +324,9 @@ html[dir="rtl"] .tree-node img.arrow { } /******************************************************************************/ -/* Open DOMNode in inspector button */ +/* Open DOMNode in inspector or Accessible in accessibility inspector button */ +button.open-accessibility-inspector, button.open-inspector { mask: url("chrome://devtools/skin/images/devtools-reps/open-inspector.svg") no-repeat; display: inline-block; @@ -334,8 +337,10 @@ button.open-inspector { cursor: pointer; } +.objectBox-accessible:hover .open-accessibility-inspector, .objectBox-node:hover .open-inspector, .objectBox-textNode:hover .open-inspector, +.open-accessibility-inspector:hover, .open-inspector:hover { background-color: var(--theme-highlight-blue); } diff --git a/devtools/client/shared/components/reps/reps.js b/devtools/client/shared/components/reps/reps.js index 7e04ec28fd0c..b4988e913e11 100644 --- a/devtools/client/shared/components/reps/reps.js +++ b/devtools/client/shared/components/reps/reps.js @@ -655,6 +655,7 @@ const NaNRep = __webpack_require__(3679); const Accessor = __webpack_require__(3680); // DOM types (grips) +const Accessible = __webpack_require__(3787); const Attribute = __webpack_require__(3681); const DateTime = __webpack_require__(3682); const Document = __webpack_require__(3683); @@ -679,7 +680,7 @@ const Grip = __webpack_require__(3656); // List of all registered template. // XXX there should be a way for extensions to register a new // or modify an existing rep. -const reps = [RegExp, StyleSheet, Event, DateTime, CommentNode, ElementNode, TextNode, Attribute, Func, PromiseRep, ArrayRep, Document, DocumentType, Window, ObjectWithText, ObjectWithURL, ErrorRep, GripArray, GripMap, GripMapEntry, Grip, Undefined, Null, StringRep, Number, SymbolRep, InfinityRep, NaNRep, Accessor, Obj]; +const reps = [RegExp, StyleSheet, Event, DateTime, CommentNode, Accessible, ElementNode, TextNode, Attribute, Func, PromiseRep, ArrayRep, Document, DocumentType, Window, ObjectWithText, ObjectWithURL, ErrorRep, GripArray, GripMap, GripMapEntry, Grip, Undefined, Null, StringRep, Number, SymbolRep, InfinityRep, NaNRep, Accessor, Obj]; /** * Generic rep that is used for rendering native JS types or an object. @@ -730,6 +731,7 @@ function getRep(object, defaultRep = Grip, noGrip = false) { module.exports = { Rep, REPS: { + Accessible, Accessor, ArrayRep, Attribute, @@ -969,8 +971,7 @@ function getLinkifiedElements(text, cropLimit, openLink) { if (currentIndex !== text.length) { let nonUrlText = text.slice(currentIndex, text.length); if (currentIndex < endCropIndex) { - const cutIndex = endCropIndex - currentIndex; - nonUrlText = nonUrlText.substring(cutIndex); + nonUrlText = getCroppedString(nonUrlText, currentIndex, startCropIndex, endCropIndex); } items.push(nonUrlText); } @@ -6944,6 +6945,128 @@ module.exports = reducer; module.exports = __webpack_require__(3655); +/***/ }), + +/***/ 3787: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at . */ + +// ReactJS +const PropTypes = __webpack_require__(3642); +const { button, span } = __webpack_require__(3643); + +// Utils +const { isGrip, wrapRender } = __webpack_require__(3644); +const { rep: StringRep } = __webpack_require__(3648); + +/** + * Renders Accessible object. + */ +Accessible.propTypes = { + object: PropTypes.object.isRequired, + inspectIconTitle: PropTypes.string, + nameMaxLength: PropTypes.number, + onAccessibleClick: PropTypes.func, + onAccessibleMouseOver: PropTypes.func, + onAccessibleMouseOut: PropTypes.func, + onInspectIconClick: PropTypes.func, + separatorText: PropTypes.string +}; + +function Accessible(props) { + const { + object, + inspectIconTitle, + nameMaxLength, + onAccessibleClick, + onAccessibleMouseOver, + onAccessibleMouseOut, + onInspectIconClick, + separatorText + } = props; + const elements = getElements(object, nameMaxLength, separatorText); + const isInTree = object.preview && object.preview.isConnected === true; + const baseConfig = { + "data-link-actor-id": object.actor, + className: "objectBox objectBox-accessible" + }; + + let inspectIcon; + if (isInTree) { + if (onAccessibleClick) { + Object.assign(baseConfig, { + onClick: _ => onAccessibleClick(object), + className: `${baseConfig.className} clickable` + }); + } + + if (onAccessibleMouseOver) { + Object.assign(baseConfig, { + onMouseOver: _ => onAccessibleMouseOver(object) + }); + } + + if (onAccessibleMouseOut) { + Object.assign(baseConfig, { + onMouseOut: onAccessibleMouseOut + }); + } + + if (onInspectIconClick) { + inspectIcon = button({ + className: "open-accessibility-inspector", + title: inspectIconTitle, + onClick: e => { + if (onAccessibleClick) { + e.stopPropagation(); + } + + onInspectIconClick(object, e); + } + }); + } + } + + return span(baseConfig, ...elements, inspectIcon); +} + +function getElements(grip, nameMaxLength, separatorText = ": ") { + const { name, role } = grip.preview; + const elements = []; + + elements.push(span({ className: "accessible-role" }, role)); + if (name) { + elements.push(span({ className: "separator" }, separatorText), StringRep({ + className: "accessible-name", + object: name, + cropLimit: nameMaxLength + })); + } + + return elements; +} + +// Registration +function supportsObject(object, noGrip = false) { + if (noGrip === true || !isGrip(object)) { + return false; + } + + return object.preview && object.typeName && object.typeName === "accessible"; +} + +// Exports from this module +module.exports = { + rep: wrapRender(Accessible), + supportsObject +}; + /***/ }) /******/ }); diff --git a/devtools/client/shared/source-map/index.js b/devtools/client/shared/source-map/index.js index 635421b8500e..4bc70f38df4b 100644 --- a/devtools/client/shared/source-map/index.js +++ b/devtools/client/shared/source-map/index.js @@ -622,8 +622,8 @@ function WorkerDispatcher() { * file, You can obtain one at . */ WorkerDispatcher.prototype = { - start(url) { - this.worker = new Worker(url); + start(url, win = window) { + this.worker = new win.Worker(url); this.worker.onerror = () => { console.error(`Error in worker ${url}`); }; diff --git a/devtools/client/shared/source-map/worker.js b/devtools/client/shared/source-map/worker.js index 58d97accd95d..243b8c910813 100644 --- a/devtools/client/shared/source-map/worker.js +++ b/devtools/client/shared/source-map/worker.js @@ -557,8 +557,8 @@ function WorkerDispatcher() { * file, You can obtain one at . */ WorkerDispatcher.prototype = { - start(url) { - this.worker = new Worker(url); + start(url, win = window) { + this.worker = new win.Worker(url); this.worker.onerror = () => { console.error(`Error in worker ${url}`); }; @@ -1987,11 +1987,10 @@ const { getOriginalSourceText, getLocationScopes, hasMappedSource, + clearSourceMaps, applySourceMap } = __webpack_require__(3710); -const { clearSourceMaps } = __webpack_require__(3704); - const { getOriginalStackFrames } = __webpack_require__(3783); const { @@ -2040,7 +2039,7 @@ const { fetchSourceMap } = __webpack_require__(3718); const { getSourceMap, setSourceMap, - clearSourceMaps + clearSourceMaps: clearSourceMapsRequests } = __webpack_require__(3704); const { originalToGeneratedId, @@ -2049,6 +2048,7 @@ const { isOriginalId, getContentType } = __webpack_require__(3652); +const { clearWasmXScopes } = __webpack_require__(3788); async function getOriginalURLs(generatedSource) { const map = await fetchSourceMap(generatedSource); @@ -2294,6 +2294,11 @@ function applySourceMap(generatedId, url, code, mappings) { setSourceMap(generatedId, Promise.resolve(map)); } +function clearSourceMaps() { + clearSourceMapsRequests(); + clearWasmXScopes(); +} + module.exports = { getOriginalURLs, getOriginalRanges, @@ -4351,6 +4356,11 @@ async function _resolveAndFetch(generatedSource) { let map = new SourceMapConsumer(fetched.content, baseURL); if (generatedSource.isWasm) { map = new WasmRemap(map); + // Check if experimental scope info exists. + if (fetched.content.includes("x-scopes")) { + const parsedJSON = JSON.parse(fetched.content); + map.xScopes = parsedJSON["x-scopes"]; + } } return map; @@ -4514,14 +4524,27 @@ module.exports = __webpack_require__(3709); "use strict"; +const { getWasmXScopes } = __webpack_require__(3788); + // Returns expanded stack frames details based on the generated location. // The function return null if not information was found. +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at . */ + async function getOriginalStackFrames(generatedLocation) { - // Reserved for experemental source maps formats. - return null; -} /* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at . */ + const wasmXScopes = await getWasmXScopes(generatedLocation.sourceId); + if (!wasmXScopes) { + return null; + } + + const scopes = wasmXScopes.search(generatedLocation); + if (scopes.length === 0) { + console.warn("Something wrong with debug data: none original frames found"); + return null; + } + return scopes; +} module.exports = { getOriginalStackFrames @@ -4549,7 +4572,7 @@ function convertDwarf(wasm, instance) { const wasmPtr = alloc_mem(wasm.byteLength); new Uint8Array(memory.buffer, wasmPtr, wasm.byteLength).set(new Uint8Array(wasm)); const resultPtr = alloc_mem(12); - const enableXScopes = false; + const enableXScopes = true; convert_dwarf(wasmPtr, wasm.byteLength, resultPtr, resultPtr + 4, enableXScopes); free_mem(wasmPtr); const resultView = new DataView(memory.buffer, resultPtr, 12); @@ -4580,6 +4603,160 @@ module.exports = { convertToJSON }; +/***/ }), + +/***/ 3788: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +const { getSourceMap } = __webpack_require__(3704); /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at . */ + +/* eslint camelcase: 0*/ + +const { generatedToOriginalId } = __webpack_require__(3652); + +const xScopes = new Map(); + +function indexLinkingNames(items) { + const result = new Map(); + let queue = [...items]; + while (queue.length > 0) { + const item = queue.shift(); + if ("linkage_name" in item) { + result.set(item.linkage_name, item); + } + if ("children" in item) { + queue = [...queue, ...item.children]; + } + } + return result; +} + +async function getXScopes(sourceId) { + if (xScopes.has(sourceId)) { + return xScopes.get(sourceId); + } + const map = await getSourceMap(sourceId); + if (!map || !map.xScopes) { + xScopes.set(sourceId, null); + return null; + } + const { code_section_offset, debug_info } = map.xScopes; + const xScope = { + code_section_offset, + debug_info, + idIndex: indexLinkingNames(debug_info), + sources: map.sources + }; + xScopes.set(sourceId, xScope); + return xScope; +} + +function isInRange(item, pc) { + if ("ranges" in item) { + return item.ranges.some(r => r[0] <= pc && pc < r[1]); + } + if ("high_pc" in item) { + return item.low_pc <= pc && pc < item.high_pc; + } + return false; +} + +function filterScopes(items, pc, lastItem, index) { + if (!items) { + return []; + } + return items.reduce((result, item) => { + switch (item.tag) { + case "compile_unit": + if (isInRange(item, pc)) { + result = [...result, ...filterScopes(item.children, pc, lastItem, index)]; + } + break; + case "namespace": + case "structure_type": + case "union_type": + result = [...result, ...filterScopes(item.children, pc, lastItem, index)]; + break; + case "subprogram": + if (isInRange(item, pc)) { + const s = { + id: item.linkage_name, + name: item.name + }; + result = [...result, s, ...filterScopes(item.children, pc, s, index)]; + } + break; + case "inlined_subroutine": + if (isInRange(item, pc)) { + const linkedItem = index.get(item.abstract_origin); + const s = { + id: item.abstract_origin, + name: linkedItem ? linkedItem.name : void 0 + }; + if (lastItem) { + lastItem.file = item.call_file; + lastItem.line = item.call_line; + } + result = [...result, s, ...filterScopes(item.children, pc, s, index)]; + } + break; + } + return result; + }, []); +} + +class XScope { + + constructor(xScopeData) { + this.xScope = xScopeData; + } + + search(generatedLocation) { + const { code_section_offset, debug_info, sources, idIndex } = this.xScope; + const pc = generatedLocation.line - (code_section_offset || 0); + const scopes = filterScopes(debug_info, pc, null, idIndex); + scopes.reverse(); + + return scopes.map(i => { + if (!("file" in i)) { + return { + displayName: i.name || "" + }; + } + const sourceId = generatedToOriginalId(generatedLocation.sourceId, sources[i.file || 0]); + return { + displayName: i.name || "", + location: { + line: i.line || 0, + sourceId + } + }; + }); + } +} + +async function getWasmXScopes(sourceId) { + const xScopeData = await getXScopes(sourceId); + if (!xScopeData) { + return null; + } + return new XScope(xScopeData); +} + +function clearWasmXScopes() { + xScopes.clear(); +} + +module.exports = { + getWasmXScopes, + clearWasmXScopes +}; + /***/ }) /******/ }); diff --git a/devtools/client/themes/images/arrowhead-left.svg b/devtools/client/themes/images/arrowhead-left.svg new file mode 100644 index 000000000000..80ef9db24121 --- /dev/null +++ b/devtools/client/themes/images/arrowhead-left.svg @@ -0,0 +1,6 @@ + + + + diff --git a/devtools/client/themes/layout.css b/devtools/client/themes/layout.css index d6a6ce51828c..f6586574e356 100644 --- a/devtools/client/themes/layout.css +++ b/devtools/client/themes/layout.css @@ -2,14 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -:root { - --flex-item-selector-wrapper-border-color: var(--theme-content-color3); -} - -:root.theme-dark { - --flex-item-selector-wrapper-border-color: var(--theme-content-color1); -} - #layout-container { height: 100%; width: 100%; @@ -97,10 +89,34 @@ flex-direction: column; } -.flex-container { +/** + * Header + */ + +.flex-header { + display: flex; + align-items: center; + height: 32px; border-bottom: 1px solid var(--theme-splitter-color); - padding: 5px 0; + padding: 0 3px; +} + +.flex-header-button-prev::before { + background-image: url("chrome://devtools/skin/images/arrowhead-left.svg"); + background-size: 16px; +} + +.flex-header-content { + flex: 1; + padding-top: 2px; padding-inline-start: 20px; + -moz-user-select: none; +} + +.flex-header-content.flex-item-shown { + display: flex; + justify-content: center; + padding: 0; } /** @@ -124,24 +140,6 @@ * Flex Item Selector */ -.flex-item-selector-wrapper { - margin-inline-start: 25px; - position: relative; -} - -.flex-item-selector-wrapper::before { - position: absolute; - left: -12px; - top: 3px; - content: ''; - display: block; - border-left: 0.5px solid var(--flex-item-selector-wrapper-border-color); - height: 0.8em; - border-bottom: 0.5px solid var(--flex-item-selector-wrapper-border-color); - width: 10px; -} - - #flex-item-selector { background-position: right 4px center; padding-left: 0; diff --git a/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js index 3dd309b1bda0..169e544ad5d0 100644 --- a/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js +++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js @@ -19,14 +19,14 @@ const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" + "test-closure-optimized-out.html"; add_task(async function() { + const breakpointLine = 18; const hud = await openNewTabAndConsole(TEST_URI); await openDebugger(); const toolbox = gDevTools.getToolbox(hud.target); const dbg = createDebuggerContext(toolbox); - await addBreakpoint(dbg, "test-closure-optimized-out.html", 18); - await waitForThreadEvents(dbg, "resumed"); + await addBreakpoint(dbg, "test-closure-optimized-out.html", breakpointLine); // Cause the debuggee to pause await pauseDebugger(dbg); @@ -50,7 +50,7 @@ add_task(async function() { info("Remove the breakpoint"); const source = findSource(dbg, "test-closure-optimized-out.html"); - await removeBreakpoint(dbg, source.id, 18); + await removeBreakpoint(dbg, source.id, breakpointLine); }); async function pauseDebugger(dbg) { diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index a2a9ccfeb4d1..b3a28797917a 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -51,6 +51,7 @@ #include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/ServiceWorkerInterceptController.h" #include "mozilla/dom/ServiceWorkerUtils.h" +#include "mozilla/dom/SessionStorageManager.h" #include "mozilla/dom/TabChild.h" #include "mozilla/dom/TabGroup.h" #include "mozilla/dom/ToJSValue.h" @@ -2467,8 +2468,7 @@ nsDocShell::TopSessionStorageManager() } if (!mSessionStorageManager) { - mSessionStorageManager = - do_CreateInstance("@mozilla.org/dom/sessionStorage-manager;1"); + mSessionStorageManager = new SessionStorageManager(); } return mSessionStorageManager; diff --git a/dom/base/nsContentCID.h b/dom/base/nsContentCID.h index aab6d6c3ba59..2288acf481b0 100644 --- a/dom/base/nsContentCID.h +++ b/dom/base/nsContentCID.h @@ -21,21 +21,6 @@ #define NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID \ { 0xfc886801, 0xe768, 0x11d4, { 0x98, 0x85, 0x0, 0xc0, 0x4f, 0xa0, 0xcf, 0x4b } } -#define NS_HTMLDOCUMENT_CID \ -{ /* 5d0fcdd0-4daa-11d2-b328-00805f8a3859 */ \ - 0x5d0fcdd0, 0x4daa, 0x11d2, \ - {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59}} - -#define NS_XMLDOCUMENT_CID \ -{ /* a6cf9063-15b3-11d2-932e-00805f8add32 */ \ - 0xa6cf9063, 0x15b3, 0x11d2, \ - {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}} - -#define NS_IMAGEDOCUMENT_CID \ -{ /* e11a6080-4daa-11d2-b328-00805f8a3859 */ \ - 0xe11a6080, 0x4daa, 0x11d2, \ - {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59}} - // {e7ba1480-1dea-11d3-830f-00104bed045e} #define NS_TEXT_ENCODER_CID \ { 0xe7ba1480, 0x1dea, 0x11d3, {0x83, 0x0f, 0x00, 0x10, 0x4b, 0xed, 0x04, 0x5e} } @@ -117,20 +102,6 @@ #define NS_XULTREEBUILDER_CID \ { 0x1abdcc96, 0x1dd2, 0x11b2, { 0xb5, 0x20, 0xf8, 0xf5, 0x9c, 0xdd, 0x67, 0xbc } } -// {541AFCB2-A9A3-11d2-8EC5-00805F29F370} -#define NS_XULDOCUMENT_CID \ -{ 0x541afcb2, 0xa9a3, 0x11d2, { 0x8e, 0xc5, 0x0, 0x80, 0x5f, 0x29, 0xf3, 0x70 } } - -#define NS_SVGDOCUMENT_CID \ -{ /* b7f44954-1dd1-11b2-8c2e-c2feab4186bc */ \ - 0xb7f44954, 0x11d1, 0x11b2, \ - {0x8c, 0x2e, 0xc2, 0xfe, 0xab, 0x41, 0x86, 0xbc}} - -// {d899a152-9412-46b2-b651-2e71c5c2f05f} -#define NS_VIDEODOCUMENT_CID \ -{ 0xd899a152, 0x9412, 0x46b2, \ - { 0xb6, 0x51, 0x2e, 0x71, 0xc5, 0xc2, 0xf0, 0x5f } } - #define NS_EVENTLISTENERSERVICE_CID \ { /* baa34652-f1f1-4185-b224-244ee82a413a */ \ 0xbaa34652, 0xf1f1, 0x4185, \ @@ -159,10 +130,6 @@ #define NS_CHILDPROCESSMESSAGEMANAGER_CONTRACTID \ "@mozilla.org/childprocessmessagemanager;1" -// {f96f5ec9-755b-447e-b1f3-717d1a84bb41} -#define NS_PLUGINDOCUMENT_CID \ -{ 0xf96f5ec9, 0x755b, 0x447e, { 0xb1, 0xf3, 0x71, 0x7d, 0x1a, 0x84, 0xbb, 0x41 } } - // {08c6cc8b-cfb0-421d-b1f7-683ff2989681} #define THIRDPARTYUTIL_CID \ {0x08c6cc8b, 0xcfb0, 0x421d, {0xb1, 0xf7, 0x68, 0x3f, 0xf2, 0x98, 0x96, 0x81}} diff --git a/dom/file/FileReader.cpp b/dom/file/FileReader.cpp index 01d6f048456c..e6451bb48c74 100644 --- a/dom/file/FileReader.cpp +++ b/dom/file/FileReader.cpp @@ -554,6 +554,21 @@ FileReader::ClearProgressEventTimer() } } +void +FileReader::FreeFileData() +{ + if (mFileData) { + if (mDataFormat == FILE_AS_ARRAYBUFFER) { + js_free(mFileData); + } else { + free(mFileData); + } + mFileData = nullptr; + } + + mDataLen = 0; +} + void FileReader::FreeDataAndDispatchSuccess() { diff --git a/dom/file/FileReader.h b/dom/file/FileReader.h index aec5460a844b..b8ce98a4c947 100644 --- a/dom/file/FileReader.h +++ b/dom/file/FileReader.h @@ -164,12 +164,7 @@ private: void OnLoadEndArrayBuffer(); - void FreeFileData() - { - free(mFileData); - mFileData = nullptr; - mDataLen = 0; - } + void FreeFileData(); nsresult IncreaseBusyCounter(); void DecreaseBusyCounter(); diff --git a/dom/interfaces/storage/nsIDOMStorageManager.idl b/dom/interfaces/storage/nsIDOMStorageManager.idl index 56f94d2d37cb..fb3d3f96efe4 100644 --- a/dom/interfaces/storage/nsIDOMStorageManager.idl +++ b/dom/interfaces/storage/nsIDOMStorageManager.idl @@ -12,8 +12,7 @@ webidl Storage; /** * General purpose interface that has two implementations, for localStorage - * resp. sessionStorage with "@mozilla.org/dom/localStorage-manager;1" resp. - * "@mozilla.org/dom/sessionStorage-manager;1" contract IDs. + * with "@mozilla.org/dom/localStorage-manager;1". */ [scriptable, uuid(a20c742e-3ed1-44fb-b897-4080a75b1662)] interface nsIDOMStorageManager : nsISupports diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 6dad980bf8f0..3d5f093ccab1 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -617,6 +617,8 @@ ContentParent::PreallocateProcess() eNotRecordingOrReplaying, /* aRecordingFile = */ EmptyString()); + PreallocatedProcessManager::AddBlocker(process); + if (!process->LaunchSubprocess(PROCESS_PRIORITY_PREALLOC)) { return nullptr; } @@ -882,7 +884,6 @@ ContentParent::GetNewOrUsedBrowserProcess(Element* aFrameElement, PreallocatedProcessManager::AddBlocker(p); if (!p->LaunchSubprocess(aPriority)) { - PreallocatedProcessManager::RemoveBlocker(p); return nullptr; } @@ -1758,10 +1759,6 @@ ContentParent::ActorDestroy(ActorDestroyReason why) // finish waiting in the xpcom-shutdown/profile-before-change observer. mIPCOpen = false; - // RemoveBlocker is idempotent, and this may have been destroyed - // after launch but before RecvFirstIdle. - PreallocatedProcessManager::RemoveBlocker(this); - if (mHangMonitorActor) { ProcessHangMonitor::RemoveProcess(mHangMonitorActor); mHangMonitorActor = nullptr; diff --git a/dom/ipc/PreallocatedProcessManager.cpp b/dom/ipc/PreallocatedProcessManager.cpp index 1435537ddccb..e70d6cf60635 100644 --- a/dom/ipc/PreallocatedProcessManager.cpp +++ b/dom/ipc/PreallocatedProcessManager.cpp @@ -212,9 +212,7 @@ void PreallocatedProcessManagerImpl::RemoveBlocker(ContentParent* aParent) { uint64_t childID = aParent->ChildID(); - // This does not assert that the entry existed so that removal is - // idempotent; this makes it easier to handle error cases and - // preallocated processes themselves (which aren't blockers). + MOZ_ASSERT(mBlockers.Contains(childID)); mBlockers.RemoveEntry(childID); if (!mPreallocatedProcess && mBlockers.IsEmpty()) { AllocateAfterDelay(); diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 518a661b9f21..e24f3be7b8a0 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -55,7 +55,7 @@ skip-if = os == 'linux' && debug # Bug 1389983 [test_getUserMedia_audioConstraints.html] skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms [test_getUserMedia_audioConstraints_concurrentIframes.html] -skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms +skip-if = os == 'mac' || os == 'win' || toolkit == 'android' || (os == 'linux' && debug) # Bug 1404995, no loopback devices on some platforms # Bug 1481101 [test_getUserMedia_audioConstraints_concurrentStreams.html] skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms [test_getUserMedia_basicAudio_loopback.html] diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild index ef87fb6eb34a..2207005fa854 100644 --- a/dom/plugins/test/testplugin/testplugin.mozbuild +++ b/dom/plugins/test/testplugin/testplugin.mozbuild @@ -42,7 +42,7 @@ NO_PGO = True if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': RCFILE = 'nptest.rc' RESFILE = 'nptest.res' - DEFFILE = SRCDIR + '/nptest.def' + DEFFILE = 'nptest.def' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']: OS_LIBS += ['-framework Carbon'] diff --git a/dom/security/FramingChecker.cpp b/dom/security/FramingChecker.cpp index 7478fafc2cab..56901f3ae4c1 100644 --- a/dom/security/FramingChecker.cpp +++ b/dom/security/FramingChecker.cpp @@ -15,6 +15,7 @@ #include "nsNetUtil.h" #include "nsQueryObject.h" #include "mozilla/dom/nsCSPUtils.h" +#include "mozilla/NullPrincipal.h" using namespace mozilla; @@ -255,12 +256,14 @@ FramingChecker::CheckFrameOptions(nsIChannel* aChannel, nsCOMPtr webNav(do_QueryObject(aDocShell)); if (webNav) { nsCOMPtr loadInfo = httpChannel->GetLoadInfo(); - nsCOMPtr triggeringPrincipal = loadInfo - ? loadInfo->TriggeringPrincipal() - : nsContentUtils::GetSystemPrincipal(); + MOZ_ASSERT(loadInfo); + + RefPtr principal = + NullPrincipal::CreateWithInheritedAttributes( + loadInfo->TriggeringPrincipal()); webNav->LoadURI(NS_LITERAL_STRING("about:blank"), 0, nullptr, nullptr, nullptr, - triggeringPrincipal); + principal); } } return false; diff --git a/dom/security/test/csp/test_ignore_xfo.html b/dom/security/test/csp/test_ignore_xfo.html index fb3aadc6c285..9838d7ecfdbf 100644 --- a/dom/security/test/csp/test_ignore_xfo.html +++ b/dom/security/test/csp/test_ignore_xfo.html @@ -33,7 +33,7 @@ function checkFinished() { // 1) test XFO with CSP var csp_testframe = document.getElementById("csp_testframe"); csp_testframe.onload = function() { - var msg = csp_testframe.contentWindow.document.getElementById("cspmessage"); + var msg = csp_testframe.contentDocument.getElementById("cspmessage"); is(msg.innerHTML, "Ignoring XFO because of CSP", "Loading frame with with XFO and CSP"); checkFinished(); } @@ -45,8 +45,7 @@ csp_testframe.src = "file_ignore_xfo.html"; // 2) test XFO with CSP_RO var csp_ro_testframe = document.getElementById("csp_ro_testframe"); csp_ro_testframe.onload = function() { - var msg = csp_ro_testframe.contentWindow.document.getElementById("cspmessage"); - is(msg, null, "Blocking frame with with XFO and CSP_RO"); + is(csp_ro_testframe.contentDocument, null, "Blocking frame with with XFO and CSP_RO"); checkFinished(); } csp_ro_testframe.onerror = function() { diff --git a/dom/storage/moz.build b/dom/storage/moz.build index 962e5bda1cd3..9ee2852c8a9b 100644 --- a/dom/storage/moz.build +++ b/dom/storage/moz.build @@ -15,6 +15,7 @@ EXPORTS.mozilla.dom += [ 'StorageActivityService.h', 'StorageIPC.h', 'StorageNotifierService.h', + 'StorageObserver.h', 'StorageUtils.h', ] diff --git a/dom/svg/test/mochitest.ini b/dom/svg/test/mochitest.ini index 2de070171d42..d32c2efef5f5 100644 --- a/dom/svg/test/mochitest.ini +++ b/dom/svg/test/mochitest.ini @@ -101,5 +101,6 @@ support-files = tearoff_with_cc_helper.html support-files = use-with-hsts-helper.html use-with-hsts-helper.html^headers^ [test_valueAsString.xhtml] [test_valueLeaks.xhtml] +[test_viewBox.html] [test_viewport.html] diff --git a/dom/svg/test/test_viewBox.html b/dom/svg/test/test_viewBox.html new file mode 100644 index 000000000000..1981eb9fc449 --- /dev/null +++ b/dom/svg/test/test_viewBox.html @@ -0,0 +1,87 @@ + + + + + Test for Bug 1396642 + + + + +Mozilla Bug 1396642 +

+ + +
+ +
+
+
+ + diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp index 12eb661d09f8..53f615db8a35 100644 --- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp +++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp @@ -38,8 +38,6 @@ using namespace mozilla; using namespace mozilla::dom; -static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); - /** * Output Handler Factories */ @@ -1108,9 +1106,10 @@ txMozillaXSLTProcessor::reportError(nsresult aResult, void txMozillaXSLTProcessor::notifyError() { - nsCOMPtr document = do_CreateInstance(kXMLDocumentCID); - if (!document) { - return; + nsCOMPtr document; + { + nsresult rv = NS_NewXMLDocument(getter_AddRefs(document)); + NS_ENSURE_SUCCESS_VOID(rv); } URIUtils::ResetWithSource(document, mSource); diff --git a/gfx/angle/targets/libEGL/moz.build b/gfx/angle/targets/libEGL/moz.build index 4cfbea1ab601..7dc47d165b6f 100644 --- a/gfx/angle/targets/libEGL/moz.build +++ b/gfx/angle/targets/libEGL/moz.build @@ -153,6 +153,6 @@ OS_LIBS += [ # '/WX', #] -DEFFILE = SRCDIR + '/../../checkout/src/libEGL/libEGL.def' +DEFFILE = '../../checkout/src/libEGL/libEGL.def' RCFILE = '../../checkout/src/libEGL/libEGL.rc' GeckoSharedLibrary('libEGL', linkage=None) diff --git a/gfx/angle/targets/libGLESv2/moz.build b/gfx/angle/targets/libGLESv2/moz.build index 9e25a6cdf20c..bc4fded68124 100644 --- a/gfx/angle/targets/libGLESv2/moz.build +++ b/gfx/angle/targets/libGLESv2/moz.build @@ -171,6 +171,6 @@ OS_LIBS += [ # '/WX', #] -DEFFILE = SRCDIR + '/../../checkout/src/libGLESv2/libGLESv2_autogen.def' +DEFFILE = '../../checkout/src/libGLESv2/libGLESv2_autogen.def' RCFILE = '../../checkout/src/libGLESv2/libGLESv2.rc' GeckoSharedLibrary('libGLESv2', linkage=None) diff --git a/gfx/angle/update-angle.py b/gfx/angle/update-angle.py old mode 100644 new mode 100755 index a5e21375ffe6..68eb5320062d --- a/gfx/angle/update-angle.py +++ b/gfx/angle/update-angle.py @@ -509,7 +509,7 @@ def export_target(root): total_used_files.add(def_path) def_rel_path = list(fixup_paths([def_path]))[0] - extras['DEFFILE'] = "SRCDIR + '/{}'".format(def_rel_path) + extras['DEFFILE'] = "'{}'".format(def_rel_path) os_libs = list(map( lambda x: x[:-len('.lib')], set(accum_desc.get('libs', [])) )) diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h index 0f24388dcebe..26724fe036e3 100644 --- a/gfx/src/nsITheme.h +++ b/gfx/src/nsITheme.h @@ -41,6 +41,10 @@ class IpcResourceUpdateQueue; #define NS_ITHEME_IID \ { 0x7329f760, 0x08cb, 0x450f, \ { 0x82, 0x25, 0xda, 0xe7, 0x29, 0x09, 0x6d, 0xec } } +// {0ae05515-cf7a-45a8-9e02-6556de7685b1} +#define NS_THEMERENDERER_CID \ +{ 0x0ae05515, 0xcf7a, 0x45a8, \ + { 0x9e, 0x02, 0x65, 0x56, 0xde, 0x76, 0x85, 0xb1 } } /** * nsITheme is a service that provides platform-specific native @@ -229,6 +233,6 @@ public: NS_DEFINE_STATIC_IID_ACCESSOR(nsITheme, NS_ITHEME_IID) // Creator function -extern already_AddRefed NS_NewNativeTheme(); +extern nsresult NS_NewNativeTheme(nsISupports *aOuter, REFNSIID aIID, void **aResult); #endif diff --git a/gfx/webrender/src/batch.rs b/gfx/webrender/src/batch.rs index be0f2658af50..4864d4404274 100644 --- a/gfx/webrender/src/batch.rs +++ b/gfx/webrender/src/batch.rs @@ -1777,10 +1777,10 @@ impl ClipBatcher { transforms: &mut TransformPalette, ) { for i in 0 .. clip_node_range.count { - let (clip_node, flags) = clip_store.get_node_from_range(&clip_node_range, i); + let (clip_node, flags, spatial_node_index) = clip_store.get_node_from_range(&clip_node_range, i); let clip_transform_id = transforms.get_id( - clip_node.spatial_node_index, + spatial_node_index, ROOT_SPATIAL_NODE_INDEX, clip_scroll_tree, ); diff --git a/gfx/webrender/src/border.rs b/gfx/webrender/src/border.rs index 11360a65818b..c47ad6610523 100644 --- a/gfx/webrender/src/border.rs +++ b/gfx/webrender/src/border.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use api::{BorderRadius, BorderSide, BorderStyle, BorderWidths, ColorF}; -use api::{ColorU, DeviceRect, DeviceSize, LayoutSizeAu, LayoutPrimitiveInfo, LayoutToDeviceScale}; +use api::{BorderRadius, BorderSide, BorderStyle, ColorF, ColorU, DeviceRect, DeviceSize}; +use api::{LayoutSizeAu, LayoutSideOffsets, LayoutPrimitiveInfo, LayoutToDeviceScale}; use api::{DeviceVector2D, DevicePoint, DeviceIntSize, LayoutRect, LayoutSize, NormalBorder}; use app_units::Au; use ellipse::Ellipse; @@ -75,8 +75,8 @@ pub struct BorderWidthsAu { pub bottom: Au, } -impl From for BorderWidthsAu { - fn from(widths: BorderWidths) -> Self { +impl From for BorderWidthsAu { + fn from(widths: LayoutSideOffsets) -> Self { BorderWidthsAu { left: Au::from_f32_px(widths.left), top: Au::from_f32_px(widths.top), @@ -117,7 +117,7 @@ pub struct BorderCacheKey { } impl BorderCacheKey { - pub fn new(border: &NormalBorder, widths: &BorderWidths) -> Self { + pub fn new(border: &NormalBorder, widths: &LayoutSideOffsets) -> Self { BorderCacheKey { left: border.left.into(), top: border.top.into(), @@ -125,7 +125,7 @@ impl BorderCacheKey { bottom: border.bottom.into(), widths: (*widths).into(), radius: border.radius.into(), - scale: Au::from_f32_px(0.0), + scale: Au(0), } } } @@ -180,7 +180,7 @@ impl<'a> DisplayListFlattener<'a> { &mut self, info: &LayoutPrimitiveInfo, border: &NormalBorder, - widths: &BorderWidths, + widths: &LayoutSideOffsets, clip_and_scroll: ScrollNodeAndClipChain, ) { let mut border = *border; @@ -528,10 +528,63 @@ pub struct BorderSegmentInfo { widths: DeviceSize, } +bitflags! { + /// Whether we depend on the available size for the border (effectively in + /// the local rect of the primitive), and in which direction. + /// + /// Note that this relies on the corners being only dependent on the border + /// widths and radius. + /// + /// This is not just a single boolean to allow instance caching for border + /// boxes where one of the directions differ but not the one on the affected + /// border is. + /// + /// This allows sharing instances for stuff like paragraphs of different + /// heights separated by horizontal borders. + pub struct AvailableSizeDependence : u8 { + /// There's a dependence on the vertical direction, that is, at least + /// one of the right or left edges is dashed or dotted. + const VERTICAL = 1 << 0; + /// Same but for the horizontal direction. + const HORIZONTAL = 1 << 1; + } +} + +/// This is the data that describes a single border with (up to) four sides and +/// four corners. +/// +/// This object gets created for each border primitive at least once. Note, +/// however, that the instances this produces via `build_instances()` can and +/// will be shared by multiple borders, as long as they share the same cache +/// key. +/// +/// Segments, however, also get build once per primitive. +/// +/// So the important invariant to preserve when going through this code is that +/// the result of `build_instances()` would remain invariant for a given cache +/// key. +/// +/// That means, then, that `border_segments` can't depend at all on something +/// that isn't on the key like the available_size, while the brush segments can +/// (and will, since we skip painting empty segments caused by things like edges +/// getting constrained by huge border-radius). +/// +/// Note that the cache key is not only `BorderCacheKey`, but also a +/// `size` from `RenderTaskCacheKey`, which will always be zero unless +/// `available_size_dependence` is non-empty, which is effectively just dashed +/// and dotted borders for now, since the spacing between the dash and dots +/// changes depending on that size. #[derive(Debug)] pub struct BorderRenderTaskInfo { pub border_segments: Vec, pub size: DeviceIntSize, + pub available_size_dependence: AvailableSizeDependence, +} + +#[derive(PartialEq, Eq)] +enum DependsOnAvailableSize { + No, + Yes, } /// Information needed to place and draw a border edge. @@ -543,6 +596,8 @@ struct EdgeInfo { local_size: f32, /// Size in device pixels needed in the render task. device_size: f32, + /// Whether this edge depends on the available size. + depends_on_available_size: bool, } impl EdgeInfo { @@ -550,11 +605,13 @@ impl EdgeInfo { local_offset: f32, local_size: f32, device_size: f32, - ) -> EdgeInfo { - EdgeInfo { + depends_on_avail_size: DependsOnAvailableSize, + ) -> Self { + Self { local_offset, local_size, device_size, + depends_on_available_size: depends_on_avail_size == DependsOnAvailableSize::Yes, } } } @@ -594,7 +651,7 @@ fn get_edge_info( ) -> EdgeInfo { // To avoid division by zero below. if side_width <= 0.0 { - return EdgeInfo::new(0.0, 0.0, 0.0); + return EdgeInfo::new(0.0, 0.0, 0.0, DependsOnAvailableSize::No); } match style { @@ -603,12 +660,12 @@ fn get_edge_info( let (half_dash, _num_half_dashes) = compute_half_dash(side_width, avail_size); let device_size = (2.0 * 2.0 * half_dash * scale).round(); - EdgeInfo::new(0., avail_size, device_size) + EdgeInfo::new(0., avail_size, device_size, DependsOnAvailableSize::Yes) } BorderStyle::Dotted => { let dot_and_space_size = 2.0 * side_width; if avail_size < dot_and_space_size * 0.75 { - return EdgeInfo::new(0.0, 0.0, 0.0); + return EdgeInfo::new(0.0, 0.0, 0.0, DependsOnAvailableSize::Yes); } let approx_dot_count = avail_size / dot_and_space_size; let dot_count = approx_dot_count.floor().max(1.0); @@ -616,10 +673,10 @@ fn get_edge_info( let extra_space = avail_size - used_size; let device_size = dot_and_space_size * scale; let offset = (extra_space * 0.5).round(); - EdgeInfo::new(offset, used_size, device_size) + EdgeInfo::new(offset, used_size, device_size, DependsOnAvailableSize::Yes) } _ => { - EdgeInfo::new(0.0, avail_size, 8.0) + EdgeInfo::new(0.0, avail_size, 8.0, DependsOnAvailableSize::No) } } } @@ -628,7 +685,7 @@ impl BorderRenderTaskInfo { pub fn new( rect: &LayoutRect, border: &NormalBorder, - widths: &BorderWidths, + widths: &LayoutSideOffsets, scale: LayoutToDeviceScale, brush_segments: &mut Vec, ) -> Option { @@ -704,6 +761,7 @@ impl BorderRenderTaskInfo { rect.size.height - local_size_tr.height - local_size_br.height, scale.0, ); + let inner_height = left_edge_info.device_size.max(right_edge_info.device_size).ceil(); let size = DeviceSize::new( @@ -715,6 +773,19 @@ impl BorderRenderTaskInfo { return None; } + let mut size_dependence = AvailableSizeDependence::empty(); + if top_edge_info.depends_on_available_size || + bottom_edge_info.depends_on_available_size + { + size_dependence.insert(AvailableSizeDependence::HORIZONTAL); + } + + if left_edge_info.depends_on_available_size || + right_edge_info.depends_on_available_size + { + size_dependence.insert(AvailableSizeDependence::VERTICAL); + } + add_edge_segment( LayoutRect::from_floats( rect.origin.x, @@ -894,9 +965,33 @@ impl BorderRenderTaskInfo { Some(BorderRenderTaskInfo { border_segments, size: size.to_i32(), + available_size_dependence: size_dependence, }) } + /// Returns the cache key size for this task, based on our available size + /// dependence computed earlier. + #[inline] + pub fn cache_key_size( + &self, + local_size: &LayoutSize, + scale: LayoutToDeviceScale, + ) -> DeviceIntSize { + let mut size = DeviceIntSize::zero(); + if self.available_size_dependence.is_empty() { + return size; + } + + let device_size = (*local_size * scale).to_i32(); + if self.available_size_dependence.contains(AvailableSizeDependence::VERTICAL) { + size.height = device_size.height; + } + if self.available_size_dependence.contains(AvailableSizeDependence::HORIZONTAL) { + size.width = device_size.width; + } + size + } + pub fn build_instances(&self, border: &NormalBorder) -> Vec { let mut instances = Vec::new(); @@ -948,7 +1043,7 @@ impl BorderRenderTaskInfo { /// blurrier. pub fn get_max_scale( radii: &BorderRadius, - widths: &BorderWidths + widths: &LayoutSideOffsets ) -> LayoutToDeviceScale { let r = radii.top_left.width .max(radii.top_left.height) @@ -974,6 +1069,10 @@ fn add_brush_segment( edge_flags: EdgeAaSegmentMask, brush_segments: &mut Vec, ) { + if image_rect.size.width <= 0. || image_rect.size.width <= 0. { + return; + } + brush_segments.push( BrushSegment::new( image_rect, diff --git a/gfx/webrender/src/clip.rs b/gfx/webrender/src/clip.rs index a970eb502151..34b42e179dfb 100644 --- a/gfx/webrender/src/clip.rs +++ b/gfx/webrender/src/clip.rs @@ -102,21 +102,11 @@ enum ClipResult { Partial, } -// A clip item range represents one or more ClipItem structs. -// They are stored in a contiguous array inside the ClipStore, -// and identified by an (offset, count). -#[derive(Debug, Copy, Clone)] -pub struct ClipItemRange { - pub index: ClipNodeIndex, - pub count: u32, -} - // A clip node is a single clip source, along with some // positioning information and implementation details // that control where the GPU data for this clip source // can be found. pub struct ClipNode { - pub spatial_node_index: SpatialNodeIndex, pub item: ClipItem, pub gpu_cache_handle: GpuCacheHandle, } @@ -132,7 +122,7 @@ bitflags! { // Identifier for a clip chain. Clip chains are stored // in a contiguous array in the clip store. They are // identified by a simple index into that array. -#[derive(Clone, Copy, Debug, Eq, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)] pub struct ClipChainId(pub u32); // The root of each clip chain is the NONE id. The @@ -147,7 +137,8 @@ impl ClipChainId { // and a link to a parent clip chain node, or ClipChainId::NONE. #[derive(Clone)] pub struct ClipChainNode { - pub clip_item_range: ClipItemRange, + pub clip_node_index: ClipNodeIndex, + pub spatial_node_index: SpatialNodeIndex, pub parent_clip_chain_id: ClipChainId, } @@ -166,21 +157,29 @@ pub struct ClipNodeIndex(pub u32); #[derive(Clone, Copy, Debug, PartialEq, Hash, Eq)] #[cfg_attr(feature = "capture", derive(Serialize))] #[cfg_attr(feature = "replay", derive(Deserialize))] -pub struct ClipNodeInstance(pub u32); +pub struct ClipNodeInstance { + index_and_flags: u32, + spatial_node_index: u32, +} impl ClipNodeInstance { - fn new(index: ClipNodeIndex, flags: ClipNodeFlags) -> ClipNodeInstance { - ClipNodeInstance( - (index.0 & 0x00ffffff) | ((flags.bits() as u32) << 24) - ) + fn new( + index: ClipNodeIndex, + flags: ClipNodeFlags, + spatial_node_index: SpatialNodeIndex, + ) -> ClipNodeInstance { + ClipNodeInstance { + index_and_flags: (index.0 & 0x00ffffff) | ((flags.bits() as u32) << 24), + spatial_node_index: spatial_node_index.0 as u32, + } } fn flags(&self) -> ClipNodeFlags { - ClipNodeFlags::from_bits_truncate((self.0 >> 24) as u8) + ClipNodeFlags::from_bits_truncate((self.index_and_flags >> 24) as u8) } fn index(&self) -> usize { - (self.0 & 0x00ffffff) as usize + (self.index_and_flags & 0x00ffffff) as usize } } @@ -211,6 +210,7 @@ enum ClipSpaceConversion { struct ClipNodeInfo { conversion: ClipSpaceConversion, node_index: ClipNodeIndex, + spatial_node_index: SpatialNodeIndex, has_non_root_coord_system: bool, } @@ -349,56 +349,55 @@ impl ClipStore { } } - pub fn add_clip_items( - &mut self, - clip_items: Vec, - spatial_node_index: SpatialNodeIndex, - ) -> ClipItemRange { - debug_assert!(!clip_items.is_empty()); - - let range = ClipItemRange { - index: ClipNodeIndex(self.clip_nodes.len() as u32), - count: clip_items.len() as u32, - }; - - let nodes = clip_items - .into_iter() - .map(|item| { - ClipNode { - item, - spatial_node_index, - gpu_cache_handle: GpuCacheHandle::new(), - } - }); - - self.clip_nodes.extend(nodes); - range - } - pub fn get_clip_chain(&self, clip_chain_id: ClipChainId) -> &ClipChainNode { &self.clip_chain_nodes[clip_chain_id.0 as usize] } - pub fn add_clip_chain( + pub fn add_clip_chain_node_index( &mut self, - clip_item_range: ClipItemRange, + clip_node_index: ClipNodeIndex, + spatial_node_index: SpatialNodeIndex, parent_clip_chain_id: ClipChainId, ) -> ClipChainId { let id = ClipChainId(self.clip_chain_nodes.len() as u32); self.clip_chain_nodes.push(ClipChainNode { - clip_item_range, + clip_node_index, + spatial_node_index, parent_clip_chain_id, }); id } + pub fn add_clip_chain_node( + &mut self, + item: ClipItem, + spatial_node_index: SpatialNodeIndex, + parent_clip_chain_id: ClipChainId, + ) -> ClipChainId { + let clip_node_index = ClipNodeIndex(self.clip_nodes.len() as u32); + self.clip_nodes.push(ClipNode { + item, + gpu_cache_handle: GpuCacheHandle::new(), + }); + + self.add_clip_chain_node_index( + clip_node_index, + spatial_node_index, + parent_clip_chain_id, + ) + } + pub fn get_node_from_range( &self, node_range: &ClipNodeRange, index: u32, - ) -> (&ClipNode, ClipNodeFlags) { + ) -> (&ClipNode, ClipNodeFlags, SpatialNodeIndex) { let instance = self.clip_node_indices[(node_range.first + index) as usize]; - (&self.clip_nodes[instance.index()], instance.flags()) + ( + &self.clip_nodes[instance.index()], + instance.flags(), + SpatialNodeIndex(instance.spatial_node_index as usize), + ) } pub fn get_node_from_range_mut( @@ -457,32 +456,26 @@ impl ClipStore { // for each clip chain node while current_clip_chain_id != ClipChainId::NONE { let clip_chain_node = &self.clip_chain_nodes[current_clip_chain_id.0 as usize]; - let node_count = clip_chain_node.clip_item_range.count; - // for each clip node (clip source) in this clip chain node - for i in 0 .. node_count { - let clip_node_index = ClipNodeIndex(clip_chain_node.clip_item_range.index.0 + i); - let clip_node = &self.clip_nodes[clip_node_index.0 as usize]; - - // Check if any clip node index should actually be - // handled during compositing of a rasterization root. - match self.clip_node_collectors.iter_mut().find(|c| { - clip_node.spatial_node_index < c.raster_root - }) { - Some(collector) => { - collector.insert(clip_node_index); - } - None => { - if !add_clip_node_to_current_chain( - clip_node_index, - spatial_node_index, - &mut local_clip_rect, - &mut self.clip_node_info, - &self.clip_nodes, - clip_scroll_tree, - ) { - return None; - } + // Check if any clip node index should actually be + // handled during compositing of a rasterization root. + match self.clip_node_collectors.iter_mut().find(|c| { + clip_chain_node.spatial_node_index < c.raster_root + }) { + Some(collector) => { + collector.insert(current_clip_chain_id); + } + None => { + if !add_clip_node_to_current_chain( + clip_chain_node.clip_node_index, + clip_chain_node.spatial_node_index, + spatial_node_index, + &mut local_clip_rect, + &mut self.clip_node_info, + &self.clip_nodes, + clip_scroll_tree, + ) { + return None; } } } @@ -493,9 +486,15 @@ impl ClipStore { // Add any collected clips from primitives that should be // handled as part of this rasterization root. if let Some(clip_node_collector) = clip_node_collector { - for clip_node_index in &clip_node_collector.clips { + for clip_chain_id in &clip_node_collector.clips { + let (clip_node_index, clip_spatial_node_index) = { + let clip_chain_node = &self.clip_chain_nodes[clip_chain_id.0 as usize]; + (clip_chain_node.clip_node_index, clip_chain_node.spatial_node_index) + }; + if !add_clip_node_to_current_chain( - *clip_node_index, + clip_node_index, + clip_spatial_node_index, spatial_node_index, &mut local_clip_rect, &mut self.clip_node_info, @@ -597,8 +596,12 @@ impl ClipStore { }; // Store this in the index buffer for this clip chain instance. - self.clip_node_indices - .push(ClipNodeInstance::new(node_info.node_index, flags)); + let instance = ClipNodeInstance::new( + node_info.node_index, + flags, + node_info.spatial_node_index, + ); + self.clip_node_indices.push(instance); has_non_root_coord_system |= node_info.has_non_root_coord_system; } @@ -1119,7 +1122,7 @@ pub fn project_inner_rect( #[derive(Debug)] pub struct ClipNodeCollector { raster_root: SpatialNodeIndex, - clips: FastHashSet, + clips: FastHashSet, } impl ClipNodeCollector { @@ -1134,9 +1137,9 @@ impl ClipNodeCollector { pub fn insert( &mut self, - clip_node_index: ClipNodeIndex, + clip_chain_id: ClipChainId, ) { - self.clips.insert(clip_node_index); + self.clips.insert(clip_chain_id); } } @@ -1145,6 +1148,7 @@ impl ClipNodeCollector { // results in the entire primitive being culled out. fn add_clip_node_to_current_chain( clip_node_index: ClipNodeIndex, + clip_spatial_node_index: SpatialNodeIndex, spatial_node_index: SpatialNodeIndex, local_clip_rect: &mut LayoutRect, clip_node_info: &mut Vec, @@ -1152,12 +1156,12 @@ fn add_clip_node_to_current_chain( clip_scroll_tree: &ClipScrollTree, ) -> bool { let clip_node = &clip_nodes[clip_node_index.0 as usize]; - let clip_spatial_node = &clip_scroll_tree.spatial_nodes[clip_node.spatial_node_index.0 as usize]; + let clip_spatial_node = &clip_scroll_tree.spatial_nodes[clip_spatial_node_index.0]; let ref_spatial_node = &clip_scroll_tree.spatial_nodes[spatial_node_index.0]; // Determine the most efficient way to convert between coordinate // systems of the primitive and clip node. - let conversion = if spatial_node_index == clip_node.spatial_node_index { + let conversion = if spatial_node_index == clip_spatial_node_index { Some(ClipSpaceConversion::Local) } else if ref_spatial_node.coordinate_system_id == clip_spatial_node.coordinate_system_id { let scale_offset = ref_spatial_node @@ -1168,7 +1172,7 @@ fn add_clip_node_to_current_chain( Some(ClipSpaceConversion::ScaleOffset(scale_offset)) } else { let xf = clip_scroll_tree.get_relative_transform( - clip_node.spatial_node_index, + clip_spatial_node_index, ROOT_SPATIAL_NODE_INDEX, ); @@ -1211,6 +1215,7 @@ fn add_clip_node_to_current_chain( clip_node_info.push(ClipNodeInfo { conversion, node_index: clip_node_index, + spatial_node_index: clip_spatial_node_index, has_non_root_coord_system: clip_spatial_node.coordinate_system_id != CoordinateSystemId::root(), }) } diff --git a/gfx/webrender/src/clip_scroll_tree.rs b/gfx/webrender/src/clip_scroll_tree.rs index 6e2552019a40..6d85f1b8c935 100644 --- a/gfx/webrender/src/clip_scroll_tree.rs +++ b/gfx/webrender/src/clip_scroll_tree.rs @@ -63,13 +63,16 @@ pub struct ClipScrollTree { /// A list of transforms that establish new coordinate systems. /// Spatial nodes only establish a new coordinate system when /// they have a transform that is not a simple 2d translation. - pub coord_systems: Vec, + coord_systems: Vec, pub pending_scroll_offsets: FastHashMap, /// A set of pipelines which should be discarded the next time this /// tree is drained. pub pipelines_to_discard: FastHashSet, + + /// Temporary stack of nodes to update when traversing the tree. + nodes_to_update: Vec<(SpatialNodeIndex, TransformUpdateState)>, } #[derive(Clone)] @@ -101,6 +104,7 @@ impl ClipScrollTree { coord_systems: Vec::new(), pending_scroll_offsets: FastHashMap::default(), pipelines_to_discard: FastHashSet::default(), + nodes_to_update: Vec::new(), } } @@ -258,8 +262,8 @@ impl ClipScrollTree { self.coord_systems.clear(); self.coord_systems.push(CoordinateSystem::root()); - let root_reference_frame_index = self.root_reference_frame_index(); - let mut state = TransformUpdateState { + let root_node_index = self.root_reference_frame_index(); + let state = TransformUpdateState { parent_reference_frame_transform: LayoutVector2D::new(pan.x, pan.y).into(), parent_accumulated_scroll_offset: LayoutVector2D::zero(), nearest_scrolling_ancestor_offset: LayoutVector2D::zero(), @@ -268,52 +272,29 @@ impl ClipScrollTree { coordinate_system_relative_scale_offset: ScaleOffset::identity(), invertible: true, }; + debug_assert!(self.nodes_to_update.is_empty()); + self.nodes_to_update.push((root_node_index, state)); - self.update_node( - root_reference_frame_index, - &mut state, - &mut transform_palette, - scene_properties, - ); - - transform_palette - } - - fn update_node( - &mut self, - node_index: SpatialNodeIndex, - state: &mut TransformUpdateState, - transform_palette: &mut TransformPalette, - scene_properties: &SceneProperties, - ) { - // TODO(gw): This is an ugly borrow check workaround to clone these. - // Restructure this to avoid the clones! - let mut state = state.clone(); - let node_children = { + while let Some((node_index, mut state)) = self.nodes_to_update.pop() { let node = match self.spatial_nodes.get_mut(node_index.0) { Some(node) => node, - None => return, + None => continue, }; node.update(&mut state, &mut self.coord_systems, scene_properties); - node.push_gpu_data(transform_palette, node_index); + node.push_gpu_data(&mut transform_palette, node_index); - if node.children.is_empty() { - return; + if !node.children.is_empty() { + node.prepare_state_for_children(&mut state); + self.nodes_to_update.extend(node.children + .iter() + .rev() + .map(|child_index| (*child_index, state.clone())) + ); } - - node.prepare_state_for_children(&mut state); - node.children.clone() - }; - - for child_node_index in node_children { - self.update_node( - child_node_index, - &mut state, - transform_palette, - scene_properties, - ); } + + transform_palette } pub fn finalize_and_apply_pending_scroll_offsets(&mut self, old_states: ScrollStates) { diff --git a/gfx/webrender/src/display_list_flattener.rs b/gfx/webrender/src/display_list_flattener.rs index fb3d19ccabde..8ae90c61de90 100644 --- a/gfx/webrender/src/display_list_flattener.rs +++ b/gfx/webrender/src/display_list_flattener.rs @@ -32,7 +32,7 @@ use render_backend::{DocumentView}; use resource_cache::{FontInstanceMap, ImageRequest}; use scene::{Scene, ScenePipeline, StackingContextHelpers}; use spatial_node::{SpatialNodeType, StickyFrameInfo}; -use std::{f32, iter, mem}; +use std::{f32, mem}; use tiling::{CompositeOps, ScrollbarPrimitive}; use util::{MaxRect, RectHelpers}; @@ -43,24 +43,48 @@ static DEFAULT_SCROLLBAR_COLOR: ColorF = ColorF { a: 0.6, }; +#[derive(Debug, Copy, Clone)] +struct ClipNode { + id: ClipChainId, + count: usize, +} + +impl ClipNode { + fn new(id: ClipChainId, count: usize) -> ClipNode { + ClipNode { + id, + count, + } + } +} + /// A data structure that keeps track of mapping between API ClipIds and the indices used /// internally in the ClipScrollTree to avoid having to do HashMap lookups. ClipIdToIndexMapper is /// responsible for mapping both ClipId to ClipChainIndex and ClipId to SpatialNodeIndex. #[derive(Default)] pub struct ClipIdToIndexMapper { - clip_chain_map: FastHashMap, + clip_node_map: FastHashMap, spatial_node_map: FastHashMap, } impl ClipIdToIndexMapper { - pub fn add_clip_chain(&mut self, id: ClipId, index: ClipChainId) { - let _old_value = self.clip_chain_map.insert(id, index); + pub fn add_clip_chain( + &mut self, + id: ClipId, + index: ClipChainId, + count: usize, + ) { + let _old_value = self.clip_node_map.insert(id, ClipNode::new(index, count)); debug_assert!(_old_value.is_none()); } - pub fn map_to_parent_clip_chain(&mut self, id: ClipId, parent_id: &ClipId) { - let parent_chain_id = self.get_clip_chain_id(parent_id); - self.add_clip_chain(id, parent_chain_id); + pub fn map_to_parent_clip_chain( + &mut self, + id: ClipId, + parent_id: &ClipId, + ) { + let parent_node = self.clip_node_map[parent_id]; + self.add_clip_chain(id, parent_node.id, parent_node.count); } pub fn map_spatial_node(&mut self, id: ClipId, index: SpatialNodeIndex) { @@ -68,8 +92,12 @@ impl ClipIdToIndexMapper { debug_assert!(_old_value.is_none()); } + fn get_clip_node(&self, id: &ClipId) -> ClipNode { + self.clip_node_map[id] + } + pub fn get_clip_chain_id(&self, id: &ClipId) -> ClipChainId { - self.clip_chain_map[id] + self.clip_node_map[id].id } pub fn get_spatial_node_index(&self, id: ClipId) -> SpatialNodeIndex { @@ -674,33 +702,53 @@ impl<'a> DisplayListFlattener<'a> { // the parent clip chain node found above. For this API, the clip // id that is specified for an existing clip chain node is used to // get the index of the clip sources that define that clip node. - let mut clip_chain_id = parent_clip_chain_id; // For each specified clip id for item in self.get_clip_chain_items(pipeline_id, item.clip_chain_items()) { // Map the ClipId to an existing clip chain node. - let item_clip_chain_id = self + let item_clip_node = self .id_to_index_mapper - .get_clip_chain_id(&item); - // Get the id of the clip sources entry for that clip chain node. - let clip_item_range = self - .clip_store - .get_clip_chain(item_clip_chain_id) - .clip_item_range; - // Add a new clip chain node, which references the same clip sources, and - // parent it to the current parent. - clip_chain_id = self - .clip_store - .add_clip_chain(clip_item_range, parent_clip_chain_id); - // For the next clip node, use this new clip chain node as the parent, - // to form a linked list. - parent_clip_chain_id = clip_chain_id; + .get_clip_node(&item); + + let mut clip_node_clip_chain_id = item_clip_node.id; + + // Each 'clip node' (as defined by the WR API) can contain one or + // more clip items (e.g. rects, image masks, rounded rects). When + // each of these clip nodes is stored internally, they are stored + // as a clip chain (one clip item per node), eventually parented + // to the parent clip node. For a user defined clip chain, we will + // need to walk the linked list of clip chain nodes for each clip + // node, accumulating them into one clip chain that is then + // parented to the clip chain parent. + + for _ in 0 .. item_clip_node.count { + // Get the id of the clip sources entry for that clip chain node. + let (clip_node_index, spatial_node_index) = { + let clip_chain = self + .clip_store + .get_clip_chain(clip_node_clip_chain_id); + + clip_node_clip_chain_id = clip_chain.parent_clip_chain_id; + + (clip_chain.clip_node_index, clip_chain.spatial_node_index) + }; + + // Add a new clip chain node, which references the same clip sources, and + // parent it to the current parent. + clip_chain_id = self + .clip_store + .add_clip_chain_node_index( + clip_node_index, + spatial_node_index, + clip_chain_id, + ); + } } // Map the last entry in the clip chain to the supplied ClipId. This makes // this ClipId available as a source to other user defined clip chains. - self.id_to_index_mapper.add_clip_chain(ClipId::ClipChain(info.id), clip_chain_id); + self.id_to_index_mapper.add_clip_chain(ClipId::ClipChain(info.id), clip_chain_id, 0); }, SpecificDisplayItem::ScrollFrame(ref info) => { self.flatten_scroll_frame( @@ -750,16 +798,18 @@ impl<'a> DisplayListFlattener<'a> { if clip_items.is_empty() { parent_clip_chain_id } else { - // Add a range of clip sources. - let clip_item_range = self - .clip_store - .add_clip_items(clip_items, spatial_node_index); + let mut clip_chain_id = parent_clip_chain_id; - // Add clip chain node that references the clip source range. - self.clip_store.add_clip_chain( - clip_item_range, - parent_clip_chain_id, - ) + for item in clip_items { + clip_chain_id = self.clip_store + .add_clip_chain_node( + item, + spatial_node_index, + clip_chain_id, + ); + } + + clip_chain_id } } @@ -1177,7 +1227,7 @@ impl<'a> DisplayListFlattener<'a> { match parent_id { Some(ref parent_id) => self.id_to_index_mapper.map_to_parent_clip_chain(reference_frame_id, parent_id), - _ => self.id_to_index_mapper.add_clip_chain(reference_frame_id, ClipChainId::NONE), + _ => self.id_to_index_mapper.add_clip_chain(reference_frame_id, ClipChainId::NONE, 0), } index } @@ -1235,44 +1285,64 @@ impl<'a> DisplayListFlattener<'a> { // and the positioning node associated with those clip sources. // Map from parent ClipId to existing clip-chain. - let parent_clip_chain_index = self + let mut parent_clip_chain_index = self .id_to_index_mapper .get_clip_chain_id(&parent_id); // Map the ClipId for the positioning node to a spatial node index. let spatial_node = self.id_to_index_mapper.get_spatial_node_index(parent_id); - // Build the clip sources from the supplied region. - // TODO(gw): We should fix this up to take advantage of the recent - // work to avoid heap allocations where possible! - let clip_rect = iter::once(ClipItem::Rectangle(clip_region.main, ClipMode::Clip)); - let clip_image = clip_region.image_mask.map(ClipItem::Image); - let clips_complex = clip_region.complex_clips - .into_iter() - .map(|complex| ClipItem::new_rounded_rect( - complex.rect, - complex.radii, - complex.mode, - )); - let clips = clip_rect.chain(clip_image).chain(clips_complex).collect(); - - // Add those clip sources to the clip store. - let clip_item_range = self - .clip_store - .add_clip_items(clips, spatial_node); - // Add a mapping for this ClipId in case it's referenced as a positioning node. self.id_to_index_mapper .map_spatial_node(new_node_id, spatial_node); - // Add the new clip chain entry - let clip_chain_id = self + let mut clip_count = 0; + + // Build the clip sources from the supplied region. + parent_clip_chain_index = self .clip_store - .add_clip_chain(clip_item_range, parent_clip_chain_index); + .add_clip_chain_node( + ClipItem::Rectangle(clip_region.main, ClipMode::Clip), + spatial_node, + parent_clip_chain_index, + ); + clip_count += 1; + + if let Some(image_mask) = clip_region.image_mask { + parent_clip_chain_index = self + .clip_store + .add_clip_chain_node( + ClipItem::Image(image_mask), + spatial_node, + parent_clip_chain_index, + ); + clip_count += 1; + } + + for region in clip_region.complex_clips { + let clip_item = ClipItem::new_rounded_rect( + region.rect, + region.radii, + region.mode, + ); + + parent_clip_chain_index = self + .clip_store + .add_clip_chain_node( + clip_item, + spatial_node, + parent_clip_chain_index, + ); + clip_count += 1; + } // Map the supplied ClipId -> clip chain id. - self.id_to_index_mapper.add_clip_chain(new_node_id, clip_chain_id); + self.id_to_index_mapper.add_clip_chain( + new_node_id, + parent_clip_chain_index, + clip_count, + ); - clip_chain_id + parent_clip_chain_index } pub fn add_scroll_frame( diff --git a/gfx/webrender/src/gpu_cache.rs b/gfx/webrender/src/gpu_cache.rs index 38f75d23cc4d..ee2405c2beb7 100644 --- a/gfx/webrender/src/gpu_cache.rs +++ b/gfx/webrender/src/gpu_cache.rs @@ -232,6 +232,13 @@ pub enum GpuCacheUpdate { }, } +pub struct GpuDebugChunk { + pub address: GpuCacheAddress, + pub fresh: bool, + pub tag: u8, + pub size: u16, +} + #[must_use] #[cfg_attr(feature = "capture", derive(Serialize))] #[cfg_attr(feature = "replay", derive(Deserialize))] @@ -246,6 +253,9 @@ pub struct GpuCacheUpdateList { /// A flat list of GPU blocks that are pending upload /// to GPU memory. pub blocks: Vec, + /// Whole state GPU block metadata for debugging. + #[cfg_attr(feature = "serde", serde(skip))] + pub debug_chunks: Vec, } // Holds the free lists of fixed size blocks. Mostly @@ -535,6 +545,9 @@ pub struct GpuCache { /// Number of blocks requested this frame that don't /// need to be re-uploaded. saved_block_count: usize, + /// True if the Renderer expects to receive the metadata + /// about GPU blocks with on each update. + in_debug: bool, } impl GpuCache { @@ -543,6 +556,7 @@ impl GpuCache { frame_id: FrameId::new(0), texture: Texture::new(), saved_block_count: 0, + in_debug: false, } } @@ -643,11 +657,31 @@ impl GpuCache { GpuCacheUpdateList { frame_id: self.frame_id, height: self.texture.height, + debug_chunks: if self.in_debug { + self.texture.updates + .iter() + .map(|update| match *update { + GpuCacheUpdate::Copy { address, block_index, block_count } => GpuDebugChunk { + address, + fresh: self.frame_id == self.texture.blocks[block_index].last_access_time, + tag: 0, //TODO + size: block_count.min(0xFFFF) as u16, + } + }) + .collect() + } else { + Vec::new() + }, updates: mem::replace(&mut self.texture.updates, Vec::new()), blocks: mem::replace(&mut self.texture.pending_blocks, Vec::new()), } } + /// Enable GPU block debugging. + pub fn set_debug(&mut self, enable: bool) { + self.in_debug = enable; + } + /// Get the actual GPU address in the texture for a given slot ID. /// It's assumed at this point that the given slot has been requested /// and built for this frame. Attempting to get the address for a diff --git a/gfx/webrender/src/hit_test.rs b/gfx/webrender/src/hit_test.rs index f1a53d4896fb..8428bf35df44 100644 --- a/gfx/webrender/src/hit_test.rs +++ b/gfx/webrender/src/hit_test.rs @@ -27,9 +27,6 @@ pub struct HitTestSpatialNode { } pub struct HitTestClipNode { - /// The positioning node for this clip node. - spatial_node: SpatialNodeIndex, - /// A particular point must be inside all of these regions to be considered clipped in /// for the purposes of a hit test. region: HitTestRegion, @@ -47,7 +44,6 @@ impl HitTestClipNode { }; HitTestClipNode { - spatial_node: node.spatial_node_index, region, } } @@ -179,12 +175,14 @@ impl HitTester { return false; } - for i in 0 .. descriptor.clip_item_range.count { - let clip_node_index = ClipNodeIndex(descriptor.clip_item_range.index.0 + i); - if !self.is_point_clipped_in_for_clip_node(point, clip_node_index, test) { - test.set_in_clip_chain_cache(clip_chain_id, ClippedIn::NotClippedIn); - return false; - } + if !self.is_point_clipped_in_for_clip_node( + point, + descriptor.clip_node_index, + descriptor.spatial_node_index, + test, + ) { + test.set_in_clip_chain_cache(clip_chain_id, ClippedIn::NotClippedIn); + return false; } test.set_in_clip_chain_cache(clip_chain_id, ClippedIn::ClippedIn); @@ -195,6 +193,7 @@ impl HitTester { &self, point: WorldPoint, node_index: ClipNodeIndex, + spatial_node_index: SpatialNodeIndex, test: &mut HitTest ) -> bool { if let Some(clipped_in) = test.node_cache.get(&node_index) { @@ -203,7 +202,7 @@ impl HitTester { let node = &self.clip_nodes[node_index.0 as usize]; let transform = self - .spatial_nodes[node.spatial_node.0 as usize] + .spatial_nodes[spatial_node_index.0] .world_viewport_transform; let transformed_point = match transform .inverse() diff --git a/gfx/webrender/src/prim_store.rs b/gfx/webrender/src/prim_store.rs index 651b03d243f0..84c113b18102 100644 --- a/gfx/webrender/src/prim_store.rs +++ b/gfx/webrender/src/prim_store.rs @@ -5,9 +5,10 @@ use api::{AlphaType, BorderRadius, BuiltDisplayList, ClipMode, ColorF, PictureRect}; use api::{DeviceIntRect, DeviceIntSize, DevicePixelScale, ExtendMode, DeviceRect, PictureToRasterTransform}; use api::{FilterOp, GlyphInstance, GradientStop, ImageKey, ImageRendering, ItemRange, ItemTag, TileOffset}; -use api::{GlyphRasterSpace, LayoutPoint, LayoutRect, LayoutSize, LayoutToWorldTransform, LayoutVector2D}; -use api::{PremultipliedColorF, PropertyBinding, Shadow, YuvColorSpace, YuvFormat, DeviceIntSideOffsets, WorldPixel}; -use api::{BorderWidths, BoxShadowClipMode, LayoutToWorldScale, NormalBorder, WorldRect, PicturePixel, RasterPixel}; +use api::{GlyphRasterSpace, LayoutPoint, LayoutRect, LayoutSideOffsets, LayoutSize, LayoutToWorldTransform}; +use api::{LayoutVector2D, PremultipliedColorF, PropertyBinding, Shadow, YuvColorSpace, YuvFormat}; +use api::{DeviceIntSideOffsets, WorldPixel, BoxShadowClipMode, LayoutToWorldScale, NormalBorder, WorldRect}; +use api::{PicturePixel, RasterPixel}; use app_units::Au; use border::{BorderCacheKey, BorderRenderTaskInfo}; use clip_scroll_tree::{ClipScrollTree, CoordinateSystemId, SpatialNodeIndex}; @@ -350,7 +351,7 @@ pub enum BorderSource { cache_key: BorderCacheKey, task_info: Option, border: NormalBorder, - widths: BorderWidths, + widths: LayoutSideOffsets, }, } @@ -442,7 +443,7 @@ impl BrushKind { // Construct a brush that is a border with `border` style and `widths` // dimensions. - pub fn new_border(mut border: NormalBorder, widths: BorderWidths) -> BrushKind { + pub fn new_border(mut border: NormalBorder, widths: LayoutSideOffsets) -> BrushKind { // FIXME(emilio): Is this the best place to do this? border.normalize(&widths); @@ -522,14 +523,14 @@ pub struct BrushSegment { impl BrushSegment { pub fn new( - rect: LayoutRect, + local_rect: LayoutRect, may_need_clip_mask: bool, edge_flags: EdgeAaSegmentMask, extra_data: [f32; 4], brush_flags: BrushFlags, - ) -> BrushSegment { - BrushSegment { - local_rect: rect, + ) -> Self { + Self { + local_rect, clip_task_id: BrushSegmentTaskId::Opaque, may_need_clip_mask, edge_flags, @@ -2073,7 +2074,9 @@ fn write_brush_segment_description( // Segment the primitive on all the local-space clip sources that we can. let mut local_clip_count = 0; for i in 0 .. clip_chain.clips_range.count { - let (clip_node, flags) = frame_state.clip_store.get_node_from_range(&clip_chain.clips_range, i); + let (clip_node, flags, _) = frame_state + .clip_store + .get_node_from_range(&clip_chain.clips_range, i); // If this clip item is positioned by another positioning node, its relative position // could change during scrolling. This means that we would need to resegment. Instead @@ -2851,14 +2854,21 @@ impl Primitive { let max_scale = BorderRenderTaskInfo::get_max_scale(&border.radius, &widths); scale.0 = scale.0.min(max_scale.0); let scale_au = Au::from_f32_px(scale.0); + + // NOTE(emilio): This `needs_update` relies on the local rect for a + // given primitive being immutable. If that changes, this code + // should probably handle changes to it as well, retaining the old + // size in cache_key. let needs_update = scale_au != cache_key.scale; + let mut new_segments = Vec::new(); + let local_rect = &self.metadata.local_rect; if needs_update { cache_key.scale = scale_au; *task_info = BorderRenderTaskInfo::new( - &self.metadata.local_rect, + local_rect, border, widths, scale, @@ -2869,7 +2879,7 @@ impl Primitive { *handle = task_info.as_ref().map(|task_info| { frame_state.resource_cache.request_render_task( RenderTaskCacheKey { - size: DeviceIntSize::zero(), + size: task_info.cache_key_size(&local_rect.size, scale), kind: RenderTaskCacheKeyKind::Border(cache_key.clone()), }, frame_state.gpu_cache, diff --git a/gfx/webrender/src/render_backend.rs b/gfx/webrender/src/render_backend.rs index d32ca5d5f09b..e37345cfb70e 100644 --- a/gfx/webrender/src/render_backend.rs +++ b/gfx/webrender/src/render_backend.rs @@ -757,6 +757,10 @@ impl RenderBackend { // We don't want to forward this message to the renderer. return true; } + DebugCommand::EnableGpuCacheDebug(enable) => { + self.gpu_cache.set_debug(enable); + ResultMsg::DebugCommand(option) + } DebugCommand::FetchDocuments => { let json = self.get_docs_for_debugger(); ResultMsg::DebugOutput(DebugOutput::FetchDocuments(json)) @@ -817,6 +821,16 @@ impl RenderBackend { self.resource_cache.clear(mask); return true; } + DebugCommand::SimulateLongSceneBuild(time_ms) => { + self.scene_tx.send(SceneBuilderRequest::SimulateLongSceneBuild(time_ms)).unwrap(); + return true; + } + DebugCommand::SimulateLongLowPrioritySceneBuild(time_ms) => { + self.low_priority_scene_tx.send( + SceneBuilderRequest::SimulateLongLowPrioritySceneBuild(time_ms) + ).unwrap(); + return true; + } _ => ResultMsg::DebugCommand(option), }; self.result_tx.send(msg).unwrap(); diff --git a/gfx/webrender/src/renderer.rs b/gfx/webrender/src/renderer.rs index bd80063ffbd7..e5daed0345d6 100644 --- a/gfx/webrender/src/renderer.rs +++ b/gfx/webrender/src/renderer.rs @@ -27,11 +27,15 @@ use device::{ExternalTexture, FBOId, TextureSlot}; use device::{FileWatcherHandler, ShaderError, TextureFilter, VertexUsageHint, VAO, VBO, CustomVAO}; use device::{ProgramCache, ReadPixelsFormat}; -use euclid::{rect, Transform3D}; +#[cfg(feature = "debug_renderer")] +use euclid::rect; +use euclid::Transform3D; use frame_builder::{ChasePrimitive, FrameBuilderConfig}; use gleam::gl; use glyph_rasterizer::{GlyphFormat, GlyphRasterizer}; use gpu_cache::{GpuBlockData, GpuCacheUpdate, GpuCacheUpdateList}; +#[cfg(feature = "debug_renderer")] +use gpu_cache::GpuDebugChunk; #[cfg(feature = "pathfinder")] use gpu_glyph_renderer::GpuGlyphRenderer; use internal_types::{SourceTexture, ORTHO_FAR_PLANE, ORTHO_NEAR_PLANE, ResourceCacheError}; @@ -227,6 +231,7 @@ bitflags! { const NEW_FRAME_INDICATOR = 1 << 9; const NEW_SCENE_INDICATOR = 1 << 10; const SHOW_OVERDRAW = 1 << 11; + const GPU_CACHE_DBG = 1 << 12; } } @@ -242,7 +247,6 @@ fn flag_changed(before: DebugFlags, after: DebugFlags, select: DebugFlags) -> Op #[derive(Copy, Clone, Debug)] pub enum ShaderColorMode { FromRenderPassMode = 0, - Alpha = 1, SubpixelConstantTextColor = 2, SubpixelWithBgColorPass0 = 3, @@ -1359,6 +1363,8 @@ pub struct Renderer { transforms_texture: VertexDataTexture, render_task_texture: VertexDataTexture, gpu_cache_texture: CacheTexture, + #[cfg(feature = "debug_renderer")] + gpu_cache_debug_chunks: Vec, gpu_cache_frame_id: FrameId, gpu_cache_overflow: bool, @@ -1710,6 +1716,7 @@ impl Renderer { let lp_builder = LowPrioritySceneBuilder { rx: low_priority_scene_rx, tx: scene_tx.clone(), + simulate_slow_ms: 0, }; thread::Builder::new().name(lp_scene_thread_name.clone()).spawn(move || { @@ -1816,6 +1823,8 @@ impl Renderer { cpu_profiles: VecDeque::new(), gpu_profiles: VecDeque::new(), gpu_cache_texture, + #[cfg(feature = "debug_renderer")] + gpu_cache_debug_chunks: Vec::new(), gpu_cache_frame_id: FrameId::new(0), gpu_cache_overflow: false, texture_cache_upload_pbo, @@ -1914,7 +1923,11 @@ impl Renderer { self.pending_texture_updates.push(texture_update_list); self.backend_profile_counters = profile_counters; } - ResultMsg::UpdateGpuCache(list) => { + ResultMsg::UpdateGpuCache(mut list) => { + #[cfg(feature = "debug_renderer")] + { + self.gpu_cache_debug_chunks = mem::replace(&mut list.debug_chunks, Vec::new()); + } self.pending_gpu_cache_updates.push(list); } ResultMsg::UpdateResources { @@ -2150,6 +2163,9 @@ impl Renderer { DebugCommand::EnableRenderTargetDebug(enable) => { self.set_debug_flag(DebugFlags::RENDER_TARGET_DBG, enable); } + DebugCommand::EnableGpuCacheDebug(enable) => { + self.set_debug_flag(DebugFlags::GPU_CACHE_DBG, enable); + } DebugCommand::EnableGpuTimeQueries(enable) => { self.set_debug_flag(DebugFlags::GPU_TIME_QUERIES, enable); } @@ -2186,7 +2202,9 @@ impl Renderer { DebugCommand::LoadCapture(..) => { panic!("Capture commands are not welcome here! Did you build with 'capture' feature?") } - DebugCommand::ClearCaches(_) => {} + DebugCommand::ClearCaches(_) + | DebugCommand::SimulateLongSceneBuild(_) + | DebugCommand::SimulateLongLowPrioritySceneBuild(_) => {} DebugCommand::InvalidateGpuCache => { match self.gpu_cache_texture.bus { CacheBus::PixelBuffer { ref mut rows, .. } => { @@ -2477,6 +2495,7 @@ impl Renderer { height: gpu_cache_height, blocks: vec![[1f32; 4].into()], updates: Vec::new(), + debug_chunks: Vec::new(), }); } @@ -3457,6 +3476,7 @@ impl Renderer { height: self.gpu_cache_texture.get_height(), blocks: Vec::new(), updates: Vec::new(), + debug_chunks: Vec::new(), }; for deferred_resolve in deferred_resolves { @@ -3787,13 +3807,16 @@ impl Renderer { } self.texture_resolver.end_frame(); - if let Some(framebuffer_size) = framebuffer_size { - self.draw_render_target_debug(framebuffer_size); - self.draw_texture_cache_debug(framebuffer_size); - } #[cfg(feature = "debug_renderer")] - self.draw_epoch_debug(); + { + if let Some(framebuffer_size) = framebuffer_size { + self.draw_render_target_debug(framebuffer_size); + self.draw_texture_cache_debug(framebuffer_size); + self.draw_gpu_cache_debug(framebuffer_size); + } + self.draw_epoch_debug(); + } // Garbage collect any frame outputs that weren't used this frame. let device = &mut self.device; @@ -3852,6 +3875,7 @@ impl Renderer { write_profile(filename); } + #[cfg(feature = "debug_renderer")] fn draw_render_target_debug(&mut self, framebuffer_size: DeviceUintSize) { if !self.debug_flags.contains(DebugFlags::RENDER_TARGET_DBG) { return; @@ -3890,6 +3914,7 @@ impl Renderer { } } + #[cfg(feature = "debug_renderer")] fn draw_texture_cache_debug(&mut self, framebuffer_size: DeviceUintSize) { if !self.debug_flags.contains(DebugFlags::TEXTURE_CACHE_DBG) { return; @@ -3949,7 +3974,7 @@ impl Renderer { let debug_renderer = match self.debug.get_mut(&mut self.device) { Some(render) => render, - None => { return; } + None => return, }; let dy = debug_renderer.line_height(); @@ -3978,6 +4003,44 @@ impl Renderer { ); } + #[cfg(feature = "debug_renderer")] + fn draw_gpu_cache_debug(&mut self, framebuffer_size: DeviceUintSize) { + if !self.debug_flags.contains(DebugFlags::GPU_CACHE_DBG) { + return; + } + + let debug_renderer = match self.debug.get_mut(&mut self.device) { + Some(render) => render, + None => return, + }; + + let (x_off, y_off) = (30f32, 30f32); + //let x_end = framebuffer_size.width as f32 - x_off; + let y_end = framebuffer_size.height as f32 - y_off; + debug_renderer.add_quad( + x_off, + y_off, + x_off + MAX_VERTEX_TEXTURE_WIDTH as f32, + y_end, + ColorU::new(80, 80, 80, 80), + ColorU::new(80, 80, 80, 80), + ); + + for chunk in &self.gpu_cache_debug_chunks { + let color = match chunk.tag { + _ => ColorU::new(250, 0, 0, 200), + }; + debug_renderer.add_quad( + x_off + chunk.address.u as f32, + y_off + chunk.address.v as f32, + x_off + chunk.address.u as f32 + chunk.size as f32, + y_off + chunk.address.v as f32 + 1.0, + color, + color, + ); + } + } + /// Pass-through to `Device::read_pixels_into`, used by Gecko's WR bindings. pub fn read_pixels_into(&mut self, rect: DeviceUintRect, format: ReadPixelsFormat, output: &mut [u8]) { self.device.read_pixels_into(rect, format, output); diff --git a/gfx/webrender/src/scene_builder.rs b/gfx/webrender/src/scene_builder.rs index f94d5565f4bd..b1ab424d2263 100644 --- a/gfx/webrender/src/scene_builder.rs +++ b/gfx/webrender/src/scene_builder.rs @@ -19,6 +19,8 @@ use std::sync::mpsc::{channel, Receiver, Sender}; use std::mem::replace; use time::precise_time_ns; use util::drain_filter; +use std::thread; +use std::time::Duration; /// Represents the work associated to a transaction before scene building. pub struct Transaction { @@ -113,6 +115,8 @@ pub enum SceneBuilderRequest { WakeUp, Flush(MsgSender<()>), SetFrameBuilderConfig(FrameBuilderConfig), + SimulateLongSceneBuild(u32), + SimulateLongLowPrioritySceneBuild(u32), Stop, #[cfg(feature = "replay")] LoadScenes(Vec), @@ -141,6 +145,7 @@ pub struct SceneBuilder { config: FrameBuilderConfig, hooks: Option>, picture_id_generator: PictureIdGenerator, + simulate_slow_ms: u32, } impl SceneBuilder { @@ -160,6 +165,7 @@ impl SceneBuilder { config, hooks, picture_id_generator: PictureIdGenerator::new(), + simulate_slow_ms: 0, }, in_tx, out_rx, @@ -199,6 +205,10 @@ impl SceneBuilder { // get the Stop when the RenderBackend loop is exiting. break; } + Ok(SceneBuilderRequest::SimulateLongSceneBuild(time_ms)) => { + self.simulate_slow_ms = time_ms + } + Ok(SceneBuilderRequest::SimulateLongLowPrioritySceneBuild(_)) => {} Err(_) => { break; } @@ -335,6 +345,10 @@ impl SceneBuilder { |n| { n.notify(); }, ); + if self.simulate_slow_ms > 0 { + thread::sleep(Duration::from_millis(self.simulate_slow_ms as u64)); + } + Box::new(BuiltTransaction { document_id: txn.document_id, build_frame: txn.build_frame || built_scene.is_some(), @@ -408,6 +422,7 @@ impl SceneBuilder { pub struct LowPrioritySceneBuilder { pub rx: Receiver, pub tx: Sender, + pub simulate_slow_ms: u32, } impl LowPrioritySceneBuilder { @@ -425,6 +440,9 @@ impl LowPrioritySceneBuilder { self.tx.send(SceneBuilderRequest::Stop).unwrap(); break; } + Ok(SceneBuilderRequest::SimulateLongLowPrioritySceneBuild(time_ms)) => { + self.simulate_slow_ms = time_ms; + } Ok(other) => { self.tx.send(other).unwrap(); } @@ -443,6 +461,10 @@ impl LowPrioritySceneBuilder { ); txn.rasterized_blobs.append(&mut more_rasterized_blobs); + if self.simulate_slow_ms > 0 { + thread::sleep(Duration::from_millis(self.simulate_slow_ms as u64)); + } + txn } } diff --git a/gfx/webrender_api/src/api.rs b/gfx/webrender_api/src/api.rs index 09956b9f3287..5ec7f406b5ff 100644 --- a/gfx/webrender_api/src/api.rs +++ b/gfx/webrender_api/src/api.rs @@ -608,6 +608,8 @@ pub enum DebugCommand { EnableTextureCacheDebug(bool), /// Display intermediate render targets on screen. EnableRenderTargetDebug(bool), + /// Display the contents of GPU cache. + EnableGpuCacheDebug(bool), /// Display GPU timing results. EnableGpuTimeQueries(bool), /// Display GPU overdraw results @@ -638,6 +640,12 @@ pub enum DebugCommand { ClearCaches(ClearCache), /// Invalidate GPU cache, forcing the update from the CPU mirror. InvalidateGpuCache, + /// Causes the scene builder to pause for a given amount of miliseconds each time it + /// processes a transaction. + SimulateLongSceneBuild(u32), + /// Causes the low priority scene builder to pause for a given amount of miliseconds + /// each time it processes a transaction. + SimulateLongLowPrioritySceneBuild(u32), } #[derive(Clone, Deserialize, Serialize)] diff --git a/gfx/webrender_api/src/display_item.rs b/gfx/webrender_api/src/display_item.rs index 4cfe09ec3ce4..0d6348647221 100644 --- a/gfx/webrender_api/src/display_item.rs +++ b/gfx/webrender_api/src/display_item.rs @@ -8,6 +8,7 @@ use euclid::{SideOffsets2D, TypedRect}; use std::ops::Not; use {ColorF, FontInstanceKey, GlyphOptions, ImageKey, LayoutPixel, LayoutPoint}; use {LayoutRect, LayoutSize, LayoutTransform, LayoutVector2D, PipelineId, PropertyBinding}; +use LayoutSideOffsets; // NOTE: some of these structs have an "IMPLICIT" comment. @@ -277,7 +278,7 @@ impl NormalBorder { /// Normalizes a border so that we don't render disallowed stuff, like inset /// borders that are less than two pixels wide. #[inline] - pub fn normalize(&mut self, widths: &BorderWidths) { + pub fn normalize(&mut self, widths: &LayoutSideOffsets) { #[inline] fn renders_small_border_solid(style: BorderStyle) -> bool { match style { @@ -364,7 +365,7 @@ pub enum BorderDetails { #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)] pub struct BorderDisplayItem { - pub widths: BorderWidths, + pub widths: LayoutSideOffsets, pub details: BorderDetails, } @@ -384,15 +385,6 @@ pub struct BorderRadius { pub bottom_right: LayoutSize, } -#[repr(C)] -#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)] -pub struct BorderWidths { - pub left: f32, - pub top: f32, - pub right: f32, - pub bottom: f32, -} - #[repr(C)] #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)] pub struct BorderSide { diff --git a/gfx/webrender_api/src/display_list.rs b/gfx/webrender_api/src/display_list.rs index 9b5b35c857ad..dce99deaef43 100644 --- a/gfx/webrender_api/src/display_list.rs +++ b/gfx/webrender_api/src/display_list.rs @@ -13,18 +13,18 @@ use std::io::{Read, Write}; use std::marker::PhantomData; use std::{io, mem, ptr, slice}; use time::precise_time_ns; -use {AlphaType, BorderDetails, BorderDisplayItem, BorderRadius, BorderWidths, BoxShadowClipMode}; +use {AlphaType, BorderDetails, BorderDisplayItem, BorderRadius, BoxShadowClipMode}; use {BoxShadowDisplayItem, ClipAndScrollInfo, ClipChainId, ClipChainItem, ClipDisplayItem, ClipId}; use {ColorF, ComplexClipRegion, DisplayItem, ExtendMode, ExternalScrollId, FilterOp}; use {FontInstanceKey, GlyphInstance, GlyphOptions, GlyphRasterSpace, Gradient, GradientBuilder}; use {GradientDisplayItem, GradientStop, IframeDisplayItem, ImageDisplayItem, ImageKey, ImageMask}; -use {ImageRendering, LayoutPoint, LayoutPrimitiveInfo, LayoutRect, LayoutSize, LayoutTransform}; -use {LayoutVector2D, LineDisplayItem, LineOrientation, LineStyle, MixBlendMode, PipelineId}; -use {PropertyBinding, PushReferenceFrameDisplayListItem, PushStackingContextDisplayItem}; -use {RadialGradient, RadialGradientDisplayItem, RectangleDisplayItem, ReferenceFrame}; -use {ScrollFrameDisplayItem, ScrollSensitivity, Shadow, SpecificDisplayItem, StackingContext}; -use {StickyFrameDisplayItem, StickyOffsetBounds, TextDisplayItem, TransformStyle, YuvColorSpace}; -use {YuvData, YuvImageDisplayItem}; +use {ImageRendering, LayoutPoint, LayoutPrimitiveInfo, LayoutRect, LayoutSideOffsets, LayoutSize}; +use {LayoutTransform, LayoutVector2D, LineDisplayItem, LineOrientation, LineStyle, MixBlendMode}; +use {PipelineId, PropertyBinding, PushReferenceFrameDisplayListItem}; +use {PushStackingContextDisplayItem, RadialGradient, RadialGradientDisplayItem}; +use {RectangleDisplayItem, ReferenceFrame, ScrollFrameDisplayItem, ScrollSensitivity, Shadow}; +use {SpecificDisplayItem, StackingContext, StickyFrameDisplayItem, StickyOffsetBounds}; +use {TextDisplayItem, TransformStyle, YuvColorSpace, YuvData, YuvImageDisplayItem}; // We don't want to push a long text-run. If a text-run is too long, split it into several parts. // This needs to be set to (renderer::MAX_VERTEX_TEXTURE_WIDTH - VECS_PER_TEXT_RUN) * 2 @@ -1154,7 +1154,7 @@ impl DisplayListBuilder { pub fn push_border( &mut self, info: &LayoutPrimitiveInfo, - widths: BorderWidths, + widths: LayoutSideOffsets, details: BorderDetails, ) { let item = SpecificDisplayItem::Border(BorderDisplayItem { details, widths }); diff --git a/gfx/webrender_api/src/units.rs b/gfx/webrender_api/src/units.rs index 45ec7e84091c..c9c528c2cf0f 100644 --- a/gfx/webrender_api/src/units.rs +++ b/gfx/webrender_api/src/units.rs @@ -77,6 +77,7 @@ pub type LayoutPoint3D = TypedPoint3D; pub type LayoutVector2D = TypedVector2D; pub type LayoutVector3D = TypedVector3D; pub type LayoutSize = TypedSize2D; +pub type LayoutSideOffsets = TypedSideOffsets2D; /// Geometry in the document's coordinate space (logical pixels). #[derive(Hash, Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)] diff --git a/gfx/webrender_bindings/WebRenderAPI.cpp b/gfx/webrender_bindings/WebRenderAPI.cpp index 36ce0ce9b14b..b87e694c345e 100644 --- a/gfx/webrender_bindings/WebRenderAPI.cpp +++ b/gfx/webrender_bindings/WebRenderAPI.cpp @@ -1181,7 +1181,7 @@ void DisplayListBuilder::PushBorder(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const Range& aSides, const wr::BorderRadius& aRadius) { @@ -1197,7 +1197,7 @@ void DisplayListBuilder::PushBorderImage(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, wr::ImageKey aImage, const uint32_t aWidth, const uint32_t aHeight, @@ -1215,7 +1215,7 @@ void DisplayListBuilder::PushBorderGradient(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const uint32_t aWidth, const uint32_t aHeight, const wr::SideOffsets2D& aSlice, @@ -1236,7 +1236,7 @@ void DisplayListBuilder::PushBorderRadialGradient(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const wr::LayoutPoint& aCenter, const wr::LayoutSize& aRadius, const nsTArray& aStops, diff --git a/gfx/webrender_bindings/WebRenderAPI.h b/gfx/webrender_bindings/WebRenderAPI.h index 952efc87d89c..8dcb79c85c8b 100644 --- a/gfx/webrender_bindings/WebRenderAPI.h +++ b/gfx/webrender_bindings/WebRenderAPI.h @@ -422,14 +422,14 @@ public: void PushBorder(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const Range& aSides, const wr::BorderRadius& aRadius); void PushBorderImage(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, wr::ImageKey aImage, const uint32_t aWidth, const uint32_t aHeight, @@ -441,7 +441,7 @@ public: void PushBorderGradient(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const uint32_t aWidth, const uint32_t aHeight, const wr::SideOffsets2D& aSlice, @@ -454,7 +454,7 @@ public: void PushBorderRadialGradient(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip, bool aIsBackfaceVisible, - const wr::BorderWidths& aWidths, + const wr::LayoutSideOffsets& aWidths, const wr::LayoutPoint& aCenter, const wr::LayoutSize& aRadius, const nsTArray& aStops, diff --git a/gfx/webrender_bindings/WebRenderTypes.h b/gfx/webrender_bindings/WebRenderTypes.h index b10894b36b4a..8ce5dfd0bbda 100644 --- a/gfx/webrender_bindings/WebRenderTypes.h +++ b/gfx/webrender_bindings/WebRenderTypes.h @@ -486,9 +486,9 @@ static inline wr::BorderRadius ToBorderRadius(const mozilla::LayoutDeviceSize& t return br; } -static inline wr::BorderWidths ToBorderWidths(float top, float right, float bottom, float left) +static inline wr::LayoutSideOffsets ToBorderWidths(float top, float right, float bottom, float left) { - wr::BorderWidths bw; + wr::LayoutSideOffsets bw; bw.top = top; bw.right = right; bw.bottom = bottom; diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt index 33a2650af810..d8cf9d03941f 100644 --- a/gfx/webrender_bindings/revision.txt +++ b/gfx/webrender_bindings/revision.txt @@ -1 +1 @@ -da76f6aad61c1ba769566861ec41b42d511fa456 +6fa046c936b9d720726d27c3b0514ee66a305b69 diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs index b7193065cf5b..8e0d77e8e8e6 100644 --- a/gfx/webrender_bindings/src/bindings.rs +++ b/gfx/webrender_bindings/src/bindings.rs @@ -2158,7 +2158,7 @@ pub extern "C" fn wr_dp_push_border(state: &mut WrState, rect: LayoutRect, clip: LayoutRect, is_backface_visible: bool, - widths: BorderWidths, + widths: LayoutSideOffsets, top: BorderSide, right: BorderSide, bottom: BorderSide, @@ -2188,7 +2188,7 @@ pub extern "C" fn wr_dp_push_border_image(state: &mut WrState, rect: LayoutRect, clip: LayoutRect, is_backface_visible: bool, - widths: BorderWidths, + widths: LayoutSideOffsets, image: WrImageKey, width: u32, height: u32, @@ -2219,7 +2219,7 @@ pub extern "C" fn wr_dp_push_border_gradient(state: &mut WrState, rect: LayoutRect, clip: LayoutRect, is_backface_visible: bool, - widths: BorderWidths, + widths: LayoutSideOffsets, width: u32, height: u32, slice: SideOffsets2D, @@ -2265,7 +2265,7 @@ pub extern "C" fn wr_dp_push_border_radial_gradient(state: &mut WrState, rect: LayoutRect, clip: LayoutRect, is_backface_visible: bool, - widths: BorderWidths, + widths: LayoutSideOffsets, center: LayoutPoint, radius: LayoutSize, stops: *const GradientStop, diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h index 49b9b17049fd..d8079a85a225 100644 --- a/gfx/webrender_bindings/webrender_ffi_generated.h +++ b/gfx/webrender_bindings/webrender_ffi_generated.h @@ -659,20 +659,23 @@ struct TypedVector2D { using LayoutVector2D = TypedVector2D; -struct BorderWidths { - float left; - float top; - float right; - float bottom; +template +struct TypedSideOffsets2D { + T top; + T right; + T bottom; + T left; - bool operator==(const BorderWidths& aOther) const { - return left == aOther.left && - top == aOther.top && + bool operator==(const TypedSideOffsets2D& aOther) const { + return top == aOther.top && right == aOther.right && - bottom == aOther.bottom; + bottom == aOther.bottom && + left == aOther.left; } }; +using LayoutSideOffsets = TypedSideOffsets2D; + // Represents RGBA screen colors with floating point numbers. // // All components must be between 0.0 and 1.0. @@ -701,21 +704,6 @@ struct BorderSide { } }; -template -struct TypedSideOffsets2D { - T top; - T right; - T bottom; - T left; - - bool operator==(const TypedSideOffsets2D& aOther) const { - return top == aOther.top && - right == aOther.right && - bottom == aOther.bottom && - left == aOther.left; - } -}; - // The default side offset type with no unit. template using SideOffsets2D = TypedSideOffsets2D; @@ -1241,7 +1229,7 @@ void wr_dp_push_border(WrState *aState, LayoutRect aRect, LayoutRect aClip, bool aIsBackfaceVisible, - BorderWidths aWidths, + LayoutSideOffsets aWidths, BorderSide aTop, BorderSide aRight, BorderSide aBottom, @@ -1254,7 +1242,7 @@ void wr_dp_push_border_gradient(WrState *aState, LayoutRect aRect, LayoutRect aClip, bool aIsBackfaceVisible, - BorderWidths aWidths, + LayoutSideOffsets aWidths, uint32_t aWidth, uint32_t aHeight, SideOffsets2D aSlice, @@ -1271,7 +1259,7 @@ void wr_dp_push_border_image(WrState *aState, LayoutRect aRect, LayoutRect aClip, bool aIsBackfaceVisible, - BorderWidths aWidths, + LayoutSideOffsets aWidths, WrImageKey aImage, uint32_t aWidth, uint32_t aHeight, @@ -1286,7 +1274,7 @@ void wr_dp_push_border_radial_gradient(WrState *aState, LayoutRect aRect, LayoutRect aClip, bool aIsBackfaceVisible, - BorderWidths aWidths, + LayoutSideOffsets aWidths, LayoutPoint aCenter, LayoutSize aRadius, const GradientStop *aStops, diff --git a/gfx/wrench/src/main.rs b/gfx/wrench/src/main.rs index cea1bb9f345c..c50e6b89ba9e 100644 --- a/gfx/wrench/src/main.rs +++ b/gfx/wrench/src/main.rs @@ -622,6 +622,18 @@ fn render<'a>( wrench.renderer.toggle_debug_flags(DebugFlags::SHOW_OVERDRAW); do_render = true; } + VirtualKeyCode::G => { + // go through the API so that we reach the render backend + wrench.api.send_debug_cmd(DebugCommand::EnableGpuCacheDebug( + !wrench.renderer.get_debug_flags().contains(webrender::DebugFlags::GPU_CACHE_DBG) + )); + // force scene rebuild to see the full set of used GPU cache entries + let mut txn = Transaction::new(); + txn.set_root_pipeline(wrench.root_pipeline_id); + wrench.api.send_transaction(wrench.document_id, txn); + + do_frame = true; + } VirtualKeyCode::R => { wrench.set_page_zoom(ZoomFactor::new(1.0)); do_frame = true; diff --git a/gfx/wrench/src/wrench.rs b/gfx/wrench/src/wrench.rs index 7f9d788f1cc4..7db0741a51c3 100644 --- a/gfx/wrench/src/wrench.rs +++ b/gfx/wrench/src/wrench.rs @@ -553,6 +553,7 @@ impl Wrench { "I - Toggle showing texture caches", "B - Toggle showing alpha primitive rects", "V - Toggle showing overdraw", + "G - Toggle showing gpu cache updates", "S - Toggle compact profiler", "Q - Toggle GPU queries for time and samples", "M - Trigger memory pressure event", diff --git a/gfx/wrench/src/yaml_frame_reader.rs b/gfx/wrench/src/yaml_frame_reader.rs index d8b81f66aab9..4377481f290e 100644 --- a/gfx/wrench/src/yaml_frame_reader.rs +++ b/gfx/wrench/src/yaml_frame_reader.rs @@ -819,12 +819,7 @@ impl YamlFrameReader { .as_vec_f32() .expect("borders must have width(s)"); let widths = broadcast(&widths, 4); - let widths = BorderWidths { - top: widths[0], - left: widths[1], - bottom: widths[2], - right: widths[3], - }; + let widths = LayoutSideOffsets::new(widths[0], widths[3], widths[2], widths[1]); let border_details = if let Some(border_type) = item["border-type"].as_str() { match border_type { "normal" => { diff --git a/ipc/chromium/src/base/shared_memory.h b/ipc/chromium/src/base/shared_memory.h index 16e683bf761c..3dd4151933e3 100644 --- a/ipc/chromium/src/base/shared_memory.h +++ b/ipc/chromium/src/base/shared_memory.h @@ -127,6 +127,9 @@ class SharedMemory { bool close_self); #if defined(OS_WIN) + // If true indicates this came from an external source so needs extra checks + // before being mapped. + bool external_section_; HANDLE mapped_file_; #elif defined(OS_POSIX) int mapped_file_; diff --git a/ipc/chromium/src/base/shared_memory_win.cc b/ipc/chromium/src/base/shared_memory_win.cc index da0f9bc2154d..1eaad5e2f580 100644 --- a/ipc/chromium/src/base/shared_memory_win.cc +++ b/ipc/chromium/src/base/shared_memory_win.cc @@ -11,22 +11,68 @@ #include "base/string_util.h" #include "mozilla/ipc/ProtocolUtils.h" +namespace { +// NtQuerySection is an internal (but believed to be stable) API and the +// structures it uses are defined in nt_internals.h. +// So we have to define them ourselves. +typedef enum _SECTION_INFORMATION_CLASS { + SectionBasicInformation, +} SECTION_INFORMATION_CLASS; + +typedef struct _SECTION_BASIC_INFORMATION { + PVOID BaseAddress; + ULONG Attributes; + LARGE_INTEGER Size; +} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION; + +typedef ULONG(__stdcall* NtQuerySectionType)( + HANDLE SectionHandle, + SECTION_INFORMATION_CLASS SectionInformationClass, + PVOID SectionInformation, + ULONG SectionInformationLength, + PULONG ResultLength); + +// Checks if the section object is safe to map. At the moment this just means +// it's not an image section. +bool IsSectionSafeToMap(HANDLE handle) { + static NtQuerySectionType nt_query_section_func = + reinterpret_cast( + ::GetProcAddress(::GetModuleHandle(L"ntdll.dll"), "NtQuerySection")); + DCHECK(nt_query_section_func); + + // The handle must have SECTION_QUERY access for this to succeed. + SECTION_BASIC_INFORMATION basic_information = {}; + ULONG status = + nt_query_section_func(handle, SectionBasicInformation, &basic_information, + sizeof(basic_information), nullptr); + if (status) { + return false; + } + + return (basic_information.Attributes & SEC_IMAGE) != SEC_IMAGE; +} + +} // namespace (unnamed) + namespace base { SharedMemory::SharedMemory() - : mapped_file_(NULL), + : external_section_(false), + mapped_file_(NULL), memory_(NULL), read_only_(false), max_size_(0) { } SharedMemory::~SharedMemory() { + external_section_ = true; Close(); } bool SharedMemory::SetHandle(SharedMemoryHandle handle, bool read_only) { DCHECK(mapped_file_ == NULL); + external_section_ = true; mapped_file_ = handle; read_only_ = read_only; return true; @@ -58,8 +104,12 @@ bool SharedMemory::Map(size_t bytes) { if (mapped_file_ == NULL) return false; + if (external_section_ && !IsSectionSafeToMap(mapped_file_)) { + return false; + } + memory_ = MapViewOfFile(mapped_file_, - read_only_ ? FILE_MAP_READ : FILE_MAP_ALL_ACCESS, 0, 0, bytes); + read_only_ ? FILE_MAP_READ : FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, bytes); if (memory_ != NULL) { return true; } @@ -79,7 +129,7 @@ bool SharedMemory::ShareToProcessCommon(ProcessId processId, SharedMemoryHandle *new_handle, bool close_self) { *new_handle = 0; - DWORD access = STANDARD_RIGHTS_REQUIRED | FILE_MAP_READ; + DWORD access = FILE_MAP_READ | SECTION_QUERY; DWORD options = 0; HANDLE mapped_file = mapped_file_; HANDLE result; diff --git a/ipc/testshell/XPCShellEnvironment.cpp b/ipc/testshell/XPCShellEnvironment.cpp index c5c92ba90e98..893cb8d4d5ff 100644 --- a/ipc/testshell/XPCShellEnvironment.cpp +++ b/ipc/testshell/XPCShellEnvironment.cpp @@ -158,9 +158,10 @@ Load(JSContext *cx, JS_ReportErrorUTF8(cx, "cannot open file '%s' for reading", filename.get()); return false; } + JS::CompileOptions options(cx); - options.setUTF8(true) - .setFileAndLine(filename.get(), 1); + options.setFileAndLine(filename.get(), 1); + JS::Rooted script(cx); bool ok = JS::CompileUtf8File(cx, options, file, &script); fclose(file); @@ -301,8 +302,8 @@ XPCShellEnvironment::ProcessFile(JSContext *cx, ungetc(ch, file); JS::CompileOptions options(cx); - options.setUTF8(true) - .setFileAndLine(filename, 1); + options.setFileAndLine(filename, 1); + JS::Rooted script(cx); if (JS::CompileUtf8File(cx, options, file, &script)) (void)JS_ExecuteScript(cx, script, &result); @@ -338,7 +339,6 @@ XPCShellEnvironment::ProcessFile(JSContext *cx, JS::CompileOptions options(cx); options.setFileAndLine("typein", startline); - options.setUTF8(true); JS::Rooted script(cx); if (JS::CompileUtf8(cx, options, buffer, strlen(buffer), &script)) { diff --git a/js/public/CompilationAndEvaluation.h b/js/public/CompilationAndEvaluation.h index d122a310b8a5..f19022493809 100644 --- a/js/public/CompilationAndEvaluation.h +++ b/js/public/CompilationAndEvaluation.h @@ -147,32 +147,6 @@ extern JS_PUBLIC_API(bool) EvaluateLatin1(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, MutableHandle rval); -/** - * DEPRECATED - * - * Evaluate the provided data in the scope of the current global of |cx|, and - * return the completion value in |rval|. - * - * If |options.utf8|, the bytes are interpreted as UTF-8 data. If the data - * contains any malformed UTF-8, an error is reported. - * - * Otherwise they are interpreted as Latin-1, i.e. each byte directly - * corresponds to the same Unicode code point. - * - * Do not use this API. The JS::ReadOnlyCompileOptions::utf8 flag that - * indicates how to interpret |bytes| is currently being replaced by functions - * indicating an exact expected encoding. If you have byte data to compile, - * you should use either JS::EvaluateUtf8 or JS::EvaluateLatin1 as appropriate. - */ -inline bool -Evaluate(JSContext* cx, const ReadOnlyCompileOptions& options, - const char* bytes, size_t length, MutableHandle rval) -{ - return options.utf8 - ? EvaluateUtf8(cx, options, bytes, length, rval) - : EvaluateLatin1(cx, options, bytes, length, rval); -} - /** * Evaluate the UTF-8 contents of the file at the given path, and return the * completion value in |rval|. (The path itself is in the system encoding, not @@ -281,13 +255,13 @@ CompileFunction(JSContext* cx, AutoVector& envChain, SourceBufferHolder& srcBuf, MutableHandle fun); /** - * Same as above, but taking a const char * for the function body. + * Same as above, but taking UTF-8 encoded const char* for the function body. */ extern JS_PUBLIC_API(bool) -CompileFunction(JSContext* cx, AutoVector& envChain, - const ReadOnlyCompileOptions& options, - const char* name, unsigned nargs, const char* const* argnames, - const char* bytes, size_t length, MutableHandle fun); +CompileFunctionUtf8(JSContext* cx, AutoVector& envChain, + const ReadOnlyCompileOptions& options, + const char* name, unsigned nargs, const char* const* argnames, + const char* utf8, size_t length, MutableHandle fun); /* * Associate an element wrapper and attribute name with a previously compiled diff --git a/js/public/CompileOptions.h b/js/public/CompileOptions.h index 2b5b672175aa..f0392a81ae9d 100644 --- a/js/public/CompileOptions.h +++ b/js/public/CompileOptions.h @@ -106,7 +106,6 @@ class JS_PUBLIC_API(TransitiveCompileOptions) public: // POD options. - bool utf8 = false; bool selfHostingMode = false; bool canLazilyParse = true; bool strictOption = false; @@ -281,11 +280,6 @@ class JS_PUBLIC_API(OwningCompileOptions) final return *this; } - OwningCompileOptions& setUTF8(bool u) { - utf8 = u; - return *this; - } - OwningCompileOptions& setColumn(unsigned c) { column = c; return *this; @@ -461,11 +455,6 @@ class MOZ_STACK_CLASS JS_PUBLIC_API(CompileOptions) final return *this; } - CompileOptions& setUTF8(bool u) { - utf8 = u; - return *this; - } - CompileOptions& setColumn(unsigned c) { column = c; return *this; diff --git a/js/rust/build.rs b/js/rust/build.rs index 8adfae6e40d1..e91ac29fb339 100644 --- a/js/rust/build.rs +++ b/js/rust/build.rs @@ -273,7 +273,7 @@ const WHITELIST_FUNCTIONS: &'static [&'static str] = &[ "JS::CallOriginalPromiseThen", "JS::CallOriginalPromiseResolve", "JS::CallOriginalPromiseReject", - "JS::CompileFunction", + "JS::CompileFunctionUtf8", "JS::Construct", "JS::ContextOptionsRef", "JS_CopyPropertiesFrom", diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index 2f1d4df20f24..9eb398c69879 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -10919,6 +10919,10 @@ GeneralParser::importExpr(YieldHandling yieldHandling) MUST_MATCH_TOKEN_MOD(TokenKind::RightParen, TokenStream::Operand, JSMSG_PAREN_AFTER_ARGS); + if (!abortIfSyntaxParser()) { + return null(); + } + return handler.newCallImport(importHolder, arg); } else { error(JSMSG_UNEXPECTED_TOKEN_NO_EXPECT, TokenKindToDesc(next)); diff --git a/js/src/gdb/tests/test-asmjs.cpp b/js/src/gdb/tests/test-asmjs.cpp index 2014a874e6dd..ba817049aab8 100644 --- a/js/src/gdb/tests/test-asmjs.cpp +++ b/js/src/gdb/tests/test-asmjs.cpp @@ -29,11 +29,9 @@ FRAGMENT(asmjs, segfault) { CompileOptions opts(cx); opts.setFileAndLine(__FILE__, line0 + 1); opts.asmJSOption = JS::AsmJSOption::Enabled; - Rooted rval(cx); - bool ok; - ok = false; - ok = Evaluate(cx, opts, bytes, strlen(bytes), &rval); + Rooted rval(cx); + bool ok = JS::EvaluateUtf8(cx, opts, bytes, strlen(bytes), &rval); breakpoint(); diff --git a/js/src/gdb/tests/test-unwind.cpp b/js/src/gdb/tests/test-unwind.cpp index 9696322873c7..8436fa15f62b 100644 --- a/js/src/gdb/tests/test-unwind.cpp +++ b/js/src/gdb/tests/test-unwind.cpp @@ -52,8 +52,9 @@ FRAGMENT(unwind, simple) { JS::CompileOptions opts(cx); opts.setFileAndLine(__FILE__, line0 + 1); + JS::Rooted rval(cx); - JS::Evaluate(cx, opts, bytes, strlen(bytes), &rval); + JS::EvaluateUtf8(cx, opts, bytes, strlen(bytes), &rval); js::jit::JitOptions.baselineWarmUpThreshold = saveThreshold; } diff --git a/js/src/jit-test/tests/modules/dynamic-import-lazy.js b/js/src/jit-test/tests/modules/dynamic-import-lazy.js new file mode 100644 index 000000000000..f1b31b3608da --- /dev/null +++ b/js/src/jit-test/tests/modules/dynamic-import-lazy.js @@ -0,0 +1,6 @@ +// |jit-test| error: SyntaxError + +function lazyilyParsedFunction() +{ + return import("/module1.js"); +} diff --git a/js/src/jit-test/tests/wasm/regress/bug1491322.js b/js/src/jit-test/tests/wasm/regress/bug1491322.js new file mode 100644 index 000000000000..040a04860817 --- /dev/null +++ b/js/src/jit-test/tests/wasm/regress/bug1491322.js @@ -0,0 +1,34 @@ +var evalInFrame = (function(global) { + var dbgGlobal = newGlobal(); + var dbg = new dbgGlobal.Debugger(); + dbg.addDebuggee(global); +})(this); +const Module = WebAssembly.Module; +const Instance = WebAssembly.Instance; +var m = new Module(wasmTextToBinary(`(module + (table 3 anyfunc) + (import $foo "" "foo" (result i32)) + (import $bar "" "bar" (result i32)) + (func $baz (result i32) (i32.const 13)) + (elem (i32.const 0) $foo $bar $baz) + (export "tbl" table) +)`)); +var jsFun = () => 83; +var wasmFun = new Instance( + new Module( + wasmTextToBinary('(module (func (result i32) (i32.const 42)) (export "foo" 0))') + ) +).exports.foo; +var e1 = new Instance(m, { + "": { + foo: jsFun, + bar: wasmFun + } +}).exports; +var e2 = new Instance(m, { + "": { + foo: jsFun, + bar: jsFun + } +}).exports; +e2.tbl.get(0); diff --git a/js/src/jit/arm64/MacroAssembler-arm64.h b/js/src/jit/arm64/MacroAssembler-arm64.h index c93faf3b6828..61e80ed25eee 100644 --- a/js/src/jit/arm64/MacroAssembler-arm64.h +++ b/js/src/jit/arm64/MacroAssembler-arm64.h @@ -15,6 +15,15 @@ #include "jit/JitFrames.h" #include "jit/MoveResolver.h" +#ifdef _M_ARM64 +#ifdef move32 +#undef move32 +#endif +#ifdef move64 +#undef move64 +#endif +#endif + namespace js { namespace jit { diff --git a/js/src/jit/arm64/vixl/Assembler-vixl.h b/js/src/jit/arm64/vixl/Assembler-vixl.h index d1c414a0d38d..4ae004be9acb 100644 --- a/js/src/jit/arm64/vixl/Assembler-vixl.h +++ b/js/src/jit/arm64/vixl/Assembler-vixl.h @@ -38,6 +38,12 @@ #include "jit/shared/Disassembler-shared.h" #include "jit/shared/IonAssemblerBufferWithConstantPools.h" +#if defined(_M_ARM64) +#ifdef mvn +#undef mvn +#endif +#endif + namespace vixl { using js::jit::BufferOffset; diff --git a/js/src/jsapi-tests/testCallArgs.cpp b/js/src/jsapi-tests/testCallArgs.cpp index 740b6d46e3d5..013a099f77ad 100644 --- a/js/src/jsapi-tests/testCallArgs.cpp +++ b/js/src/jsapi-tests/testCallArgs.cpp @@ -25,7 +25,6 @@ BEGIN_TEST(testCallArgs_isConstructing_native) JS::CompileOptions opts(cx); opts.setFileAndLine(__FILE__, __LINE__ + 4); - opts.setUTF8(true); JS::RootedValue result(cx); static const char code[] = "new customNative();"; diff --git a/js/src/jsapi-tests/testChromeBuffer.cpp b/js/src/jsapi-tests/testChromeBuffer.cpp index 3e84542bff1d..08c753ba95aa 100644 --- a/js/src/jsapi-tests/testChromeBuffer.cpp +++ b/js/src/jsapi-tests/testChromeBuffer.cpp @@ -70,11 +70,13 @@ BEGIN_TEST(testChromeBuffer) JSAutoRealm ar(cx, trusted_glob); const char* paramName = "x"; const char* bytes = "return x ? 1 + trusted(x-1) : 0"; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "trusted", - 1, ¶mName, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "trusted", 1, ¶mName, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, trusted_glob, "trusted", fun, JSPROP_ENUMERATE)); trusted_fun.init(cx, JS_GetFunctionObject(fun)); } @@ -92,11 +94,13 @@ BEGIN_TEST(testChromeBuffer) " return -1; " " } " "} "; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "untrusted", 1, - ¶mName, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "untrusted", 1, ¶mName, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, global, "untrusted", fun, JSPROP_ENUMERATE)); JS::RootedValue rval(cx); @@ -112,6 +116,7 @@ BEGIN_TEST(testChromeBuffer) { { JSAutoRealm ar(cx, trusted_glob); + const char* paramName = "untrusted"; const char* bytes = "try { " " untrusted(); " @@ -123,11 +128,13 @@ BEGIN_TEST(testChromeBuffer) " return 'From trusted: ' + " " e.name + ': ' + e.message; " "} "; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "trusted", - 1, ¶mName, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "trusted", 1, ¶mName, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, trusted_glob, "trusted", fun, JSPROP_ENUMERATE)); trusted_fun = JS_GetFunctionObject(fun); } @@ -141,11 +148,13 @@ BEGIN_TEST(testChromeBuffer) "} catch (e) { " " return trusted(untrusted); " "} "; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "untrusted", 1, - ¶mName, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "untrusted", 1, ¶mName, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, global, "untrusted", fun, JSPROP_ENUMERATE)); JS::RootedValue rval(cx); @@ -158,12 +167,15 @@ BEGIN_TEST(testChromeBuffer) { { JSAutoRealm ar(cx, trusted_glob); + const char* bytes = "return 42"; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "trusted", - 0, nullptr, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "trusted", 0, nullptr, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, trusted_glob, "trusted", fun, JSPROP_ENUMERATE)); trusted_fun = JS_GetFunctionObject(fun); } @@ -177,11 +189,13 @@ BEGIN_TEST(testChromeBuffer) "} catch (e) { " " return f(); " "} "; + JS::CompileOptions options(cx); options.setFileAndLine("", 0); + JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "untrusted", 1, - ¶mName, bytes, strlen(bytes), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "untrusted", 1, ¶mName, + bytes, strlen(bytes), &fun)); CHECK(JS_DefineProperty(cx, global, "untrusted", fun, JSPROP_ENUMERATE)); JS::RootedValue arg(cx, JS::ObjectValue(*callTrusted)); diff --git a/js/src/jsapi-tests/testCloneScript.cpp b/js/src/jsapi-tests/testCloneScript.cpp index ecd7ce5827db..421234b8e8c0 100644 --- a/js/src/jsapi-tests/testCloneScript.cpp +++ b/js/src/jsapi-tests/testCloneScript.cpp @@ -27,7 +27,7 @@ BEGIN_TEST(test_cloneScript) CHECK(A); CHECK(B); - const char* source = + static const char source[] = "var i = 0;\n" "var sum = 0;\n" "while (i < 10) {\n" @@ -41,12 +41,14 @@ BEGIN_TEST(test_cloneScript) // compile for A { JSAutoRealm a(cx, A); - JS::RootedFunction fun(cx); + JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, 1); + + JS::RootedFunction fun(cx); JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "f", 0, nullptr, - source, strlen(source), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "f", 0, nullptr, + source, strlen(source), &fun)); CHECK(obj = JS_GetFunctionObject(fun)); } @@ -115,20 +117,22 @@ BEGIN_TEST(test_cloneScriptWithPrincipals) CHECK(B); const char* argnames[] = { "arg" }; - const char* source = "return function() { return arg; }"; + static const char source[] = "return function() { return arg; }"; JS::RootedObject obj(cx); // Compile in A { JSAutoRealm a(cx, A); + JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, 1); + JS::RootedFunction fun(cx); JS::AutoObjectVector emptyScopeChain(cx); - JS::CompileFunction(cx, emptyScopeChain, options, "f", - mozilla::ArrayLength(argnames), argnames, source, - strlen(source), &fun); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "f", + mozilla::ArrayLength(argnames), argnames, + source, strlen(source), &fun)); CHECK(fun); JSScript* script; diff --git a/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp b/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp index f0707d19df69..1691d3d44bac 100644 --- a/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp +++ b/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp @@ -40,9 +40,11 @@ BEGIN_TEST(testRedefineGlobalEval) CHECK(JS_GetProperty(cx, g, "Object", &v)); static const char data[] = "Object.defineProperty(this, 'eval', { configurable: false });"; + JS::CompileOptions opts(cx); - CHECK(JS::Evaluate(cx, opts.setFileAndLine(__FILE__, __LINE__), - data, mozilla::ArrayLength(data) - 1, &v)); + + CHECK(JS::EvaluateUtf8(cx, opts.setFileAndLine(__FILE__, __LINE__), + data, mozilla::ArrayLength(data) - 1, &v)); return true; } diff --git a/js/src/jsapi-tests/testFunctionBinding.cpp b/js/src/jsapi-tests/testFunctionBinding.cpp index 6e8351e7b205..62d553f1a3ab 100644 --- a/js/src/jsapi-tests/testFunctionBinding.cpp +++ b/js/src/jsapi-tests/testFunctionBinding.cpp @@ -24,8 +24,8 @@ BEGIN_TEST(test_functionBinding) // Named function shouldn't have it's binding. const char s1chars[] = "return (typeof s1) == 'undefined';"; JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "s1", 0, nullptr, s1chars, - strlen(s1chars), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "s1", 0, nullptr, + s1chars, strlen(s1chars), &fun)); CHECK(fun); JS::AutoValueVector args(cx); @@ -36,8 +36,8 @@ BEGIN_TEST(test_functionBinding) // Named function shouldn't have `anonymous` binding. const char s2chars[] = "return (typeof anonymous) == 'undefined';"; - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "s2", 0, nullptr, s2chars, - strlen(s2chars), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "s2", 0, nullptr, + s2chars, strlen(s2chars), &fun)); CHECK(fun); CHECK(JS::Call(cx, UndefinedHandleValue, fun, args, &rval)); @@ -46,8 +46,8 @@ BEGIN_TEST(test_functionBinding) // Anonymous function shouldn't have `anonymous` binding. const char s3chars[] = "return (typeof anonymous) == 'undefined';"; - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, nullptr, 0, nullptr, s3chars, - strlen(s3chars), &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, nullptr, 0, nullptr, + s3chars, strlen(s3chars), &fun)); CHECK(fun); CHECK(JS::Call(cx, UndefinedHandleValue, fun, args, &rval)); diff --git a/js/src/jsapi-tests/testGCCellPtr.cpp b/js/src/jsapi-tests/testGCCellPtr.cpp index b0076a297c1f..71ba5f306cc1 100644 --- a/js/src/jsapi-tests/testGCCellPtr.cpp +++ b/js/src/jsapi-tests/testGCCellPtr.cpp @@ -29,7 +29,6 @@ BEGIN_TEST(testGCCellPtr) const char* code = "function foo() { return 'bar'; }"; JS::CompileOptions opts(cx); - opts.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, opts, code, strlen(code), &script)); diff --git a/js/src/jsapi-tests/testGCOutOfMemory.cpp b/js/src/jsapi-tests/testGCOutOfMemory.cpp index 99990824434b..863ea6f30c16 100644 --- a/js/src/jsapi-tests/testGCOutOfMemory.cpp +++ b/js/src/jsapi-tests/testGCOutOfMemory.cpp @@ -21,7 +21,6 @@ BEGIN_TEST(testGCOutOfMemory) "})();"; JS::CompileOptions opts(cx); - opts.setUTF8(true); JS::RootedValue root(cx); bool ok = JS::EvaluateUtf8(cx, opts, source, strlen(source), &root); diff --git a/js/src/jsapi-tests/testPreserveJitCode.cpp b/js/src/jsapi-tests/testPreserveJitCode.cpp index f53694df4755..d807d42bf856 100644 --- a/js/src/jsapi-tests/testPreserveJitCode.cpp +++ b/js/src/jsapi-tests/testPreserveJitCode.cpp @@ -55,7 +55,7 @@ testPreserveJitCode(bool preserveJitCode, unsigned remainingIonScripts) CHECK_EQUAL(countIonScripts(global), 0u); - const char* source = + static const char source[] = "var i = 0;\n" "var sum = 0;\n" "while (i < 10) {\n" @@ -65,12 +65,13 @@ testPreserveJitCode(bool preserveJitCode, unsigned remainingIonScripts) "return sum;\n"; unsigned length = strlen(source); - JS::RootedFunction fun(cx); JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, 1); + + JS::RootedFunction fun(cx); JS::AutoObjectVector emptyScopeChain(cx); - CHECK(JS::CompileFunction(cx, emptyScopeChain, options, "f", 0, nullptr, - source, length, &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, options, "f", 0, nullptr, + source, length, &fun)); RootedValue value(cx); for (unsigned i = 0; i < 1500; ++i) { diff --git a/js/src/jsapi-tests/testPrivateGCThingValue.cpp b/js/src/jsapi-tests/testPrivateGCThingValue.cpp index 10d5120ca854..c40f10793bc0 100644 --- a/js/src/jsapi-tests/testPrivateGCThingValue.cpp +++ b/js/src/jsapi-tests/testPrivateGCThingValue.cpp @@ -47,7 +47,6 @@ BEGIN_TEST(testPrivateGCThingValue) JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, code, sizeof(code) - 1, &script)); diff --git a/js/src/jsapi-tests/testScriptInfo.cpp b/js/src/jsapi-tests/testScriptInfo.cpp index 642b3d4c4657..635355d611f9 100644 --- a/js/src/jsapi-tests/testScriptInfo.cpp +++ b/js/src/jsapi-tests/testScriptInfo.cpp @@ -30,7 +30,6 @@ BEGIN_TEST(testScriptInfo) JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, startLine); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, code, strlen(code), &script)); diff --git a/js/src/jsapi-tests/testScriptObject.cpp b/js/src/jsapi-tests/testScriptObject.cpp index 0f569ddbad65..db75bb2b50d1 100644 --- a/js/src/jsapi-tests/testScriptObject.cpp +++ b/js/src/jsapi-tests/testScriptObject.cpp @@ -44,7 +44,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript) { JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, code, code_size, &script)); @@ -57,7 +56,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScript_empty) { JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, "", 0, &script)); @@ -70,7 +68,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_CompileScriptForPrincipals) { JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, code, code_size, &script)); @@ -128,7 +125,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile) JS::CompileOptions options(cx); options.setFileAndLine(script_filename, 1); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8Path(cx, options, script_filename, &script)); @@ -147,7 +143,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFile_empty) JS::CompileOptions options(cx); options.setFileAndLine(script_filename, 1); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8Path(cx, options, script_filename, &script)); @@ -166,7 +161,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle) JS::CompileOptions options(cx); options.setFileAndLine("temporary file", 1); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8File(cx, options, script_stream, &script)); @@ -181,7 +175,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandle_empty) JS::CompileOptions options(cx); options.setFileAndLine("empty temporary file", 1); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8File(cx, options, script_stream, &script)); @@ -198,7 +191,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, bug438633_JS_CompileFileHandleForPrincip JS::CompileOptions options(cx); options.setFileAndLine("temporary file", 1); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8File(cx, options, script_stream, &script)); @@ -214,7 +206,6 @@ BEGIN_FIXTURE_TEST(ScriptObjectFixture, CloneAndExecuteScript) JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, "val", 3, &script)); diff --git a/js/src/jsapi-tests/testSourcePolicy.cpp b/js/src/jsapi-tests/testSourcePolicy.cpp index e56f14ca510a..32f30cf5cd67 100644 --- a/js/src/jsapi-tests/testSourcePolicy.cpp +++ b/js/src/jsapi-tests/testSourcePolicy.cpp @@ -8,7 +8,6 @@ BEGIN_TEST(testBug795104) { - JS::CompileOptions opts(cx); JS::RealmBehaviorsRef(cx->realm()).setDiscardSource(true); const size_t strLen = 60002; @@ -19,11 +18,13 @@ BEGIN_TEST(testBug795104) memset(s + 1, 'x', strLen - 2); s[strLen - 1] = '"'; + JS::CompileOptions opts(cx); + // We don't want an rval for our Evaluate call opts.setNoScriptRval(true); JS::RootedValue unused(cx); - CHECK(JS::Evaluate(cx, opts, s, strLen, &unused)); + CHECK(JS::EvaluateUtf8(cx, opts, s, strLen, &unused)); JS::RootedFunction fun(cx); JS::AutoObjectVector emptyScopeChain(cx); @@ -32,7 +33,7 @@ BEGIN_TEST(testBug795104) // mode, since it's not supported for functions. opts.setNoScriptRval(false); - CHECK(JS::CompileFunction(cx, emptyScopeChain, opts, "f", 0, nullptr, s, strLen, &fun)); + CHECK(JS::CompileFunctionUtf8(cx, emptyScopeChain, opts, "f", 0, nullptr, s, strLen, &fun)); CHECK(fun); JS_free(cx, s); diff --git a/js/src/jsapi-tests/testUbiNode.cpp b/js/src/jsapi-tests/testUbiNode.cpp index 90d299b3b71d..d37b7232d138 100644 --- a/js/src/jsapi-tests/testUbiNode.cpp +++ b/js/src/jsapi-tests/testUbiNode.cpp @@ -88,7 +88,6 @@ BEGIN_TEST(test_ubiNodeZone) CHECK(JS::ubi::Node(global2).zone() != global1->zone()); JS::CompileOptions options(cx); - options.setUTF8(true); // Create a string and a script in the original zone... RootedString string1(cx, JS_NewStringCopyZ(cx, "Simpson's Individual Stringettes!")); @@ -136,7 +135,6 @@ BEGIN_TEST(test_ubiNodeCompartment) CHECK(JS::ubi::Node(global2).realm() != global1->nonCCWRealm()); JS::CompileOptions options(cx); - options.setUTF8(true); // Create a script in the original realm... RootedScript script1(cx); diff --git a/js/src/jsapi-tests/testXDR.cpp b/js/src/jsapi-tests/testXDR.cpp index 93291c92bf07..78a4f17e737b 100644 --- a/js/src/jsapi-tests/testXDR.cpp +++ b/js/src/jsapi-tests/testXDR.cpp @@ -64,7 +64,6 @@ BEGIN_TEST(testXDR_bug506491) // compile JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, s, strlen(s), &script)); @@ -93,7 +92,6 @@ BEGIN_TEST(testXDR_bug516827) // compile an empty script JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, "", 0, &script)); @@ -119,7 +117,6 @@ BEGIN_TEST(testXDR_source) for (const char** s = samples; *s; s++) { JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); JS::RootedScript script(cx); CHECK(JS::CompileUtf8(cx, options, *s, strlen(*s), &script)); @@ -150,7 +147,6 @@ BEGIN_TEST(testXDR_sourceMap) for (const char** sm = sourceMaps; *sm; sm++) { JS::CompileOptions options(cx); options.setFileAndLine(__FILE__, __LINE__); - options.setUTF8(true); CHECK(JS::CompileUtf8(cx, options, "", 0, &script)); CHECK(script); diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp index 6d8c3050728e..333d353ca138 100644 --- a/js/src/jsapi-tests/tests.cpp +++ b/js/src/jsapi-tests/tests.cpp @@ -46,30 +46,33 @@ void JSAPITest::uninit() msgs.clear(); } -bool JSAPITest::exec(const char* bytes, const char* filename, int lineno) +bool JSAPITest::exec(const char* utf8, const char* filename, int lineno) { - JS::RootedValue v(cx); JS::CompileOptions opts(cx); opts.setFileAndLine(filename, lineno); - return JS::Evaluate(cx, opts, bytes, strlen(bytes), &v) || - fail(JSAPITestString(bytes), filename, lineno); + + JS::RootedValue v(cx); + return JS::EvaluateUtf8(cx, opts, utf8, strlen(utf8), &v) || + fail(JSAPITestString(utf8), filename, lineno); } -bool JSAPITest::execDontReport(const char* bytes, const char* filename, int lineno) +bool JSAPITest::execDontReport(const char* utf8, const char* filename, int lineno) { - JS::RootedValue v(cx); JS::CompileOptions opts(cx); opts.setFileAndLine(filename, lineno); - return JS::Evaluate(cx, opts, bytes, strlen(bytes), &v); + + JS::RootedValue v(cx); + return JS::EvaluateUtf8(cx, opts, utf8, strlen(utf8), &v); } -bool JSAPITest::evaluate(const char* bytes, const char* filename, int lineno, +bool JSAPITest::evaluate(const char* utf8, const char* filename, int lineno, JS::MutableHandleValue vp) { JS::CompileOptions opts(cx); opts.setFileAndLine(filename, lineno); - return JS::Evaluate(cx, opts, bytes, strlen(bytes), vp) || - fail(JSAPITestString(bytes), filename, lineno); + + return JS::EvaluateUtf8(cx, opts, utf8, strlen(utf8), vp) || + fail(JSAPITestString(utf8), filename, lineno); } bool JSAPITest::definePrint() diff --git a/js/src/jsapi-tests/tests.h b/js/src/jsapi-tests/tests.h index c9b6a633767e..27c6ef5fb956 100644 --- a/js/src/jsapi-tests/tests.h +++ b/js/src/jsapi-tests/tests.h @@ -95,14 +95,14 @@ class JSAPITest #define EXEC(s) do { if (!exec(s, __FILE__, __LINE__)) return false; } while (false) - bool exec(const char* bytes, const char* filename, int lineno); + bool exec(const char* utf8, const char* filename, int lineno); // Like exec(), but doesn't call fail() if JS::Evaluate returns false. - bool execDontReport(const char* bytes, const char* filename, int lineno); + bool execDontReport(const char* utf8, const char* filename, int lineno); #define EVAL(s, vp) do { if (!evaluate(s, __FILE__, __LINE__, vp)) return false; } while (false) - bool evaluate(const char* bytes, const char* filename, int lineno, JS::MutableHandleValue vp); + bool evaluate(const char* utf8, const char* filename, int lineno, JS::MutableHandleValue vp); JSAPITestString jsvalToSource(JS::HandleValue v) { if (JSString* str = JS_ValueToSource(cx, v)) { diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index f0f63c14484f..cfc74b7a8cda 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -3829,7 +3829,6 @@ void JS::TransitiveCompileOptions::copyPODTransitiveOptions(const TransitiveCompileOptions& rhs) { mutedErrors_ = rhs.mutedErrors_; - utf8 = rhs.utf8; selfHostingMode = rhs.selfHostingMode; canLazilyParse = rhs.canLazilyParse; strictOption = rhs.strictOption; diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index e179049796f3..6e9cc2ff4e62 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -872,7 +872,6 @@ RunFile(JSContext* cx, const char* filename, FILE* file, bool compileOnly) { CompileOptions options(cx); options.setIntroductionType("js shell file") - .setUTF8(true) .setFileAndLine(filename, 1) .setIsRunOnce(true) .setNoScriptRval(true); @@ -948,7 +947,7 @@ InitModuleLoader(JSContext* cx) options.strictOption = true; RootedValue rv(cx); - return Evaluate(cx, options, src.get(), srcLen, &rv); + return JS::EvaluateUtf8(cx, options, src.get(), srcLen, &rv); } static bool @@ -1205,7 +1204,6 @@ EvalUtf8AndPrint(JSContext* cx, const char* bytes, size_t length, // Eval. JS::CompileOptions options(cx); options.setIntroductionType("js shell interactive") - .setUTF8(true) .setIsRunOnce(true) .setFileAndLine("typein", lineno); @@ -1635,7 +1633,6 @@ LoadScript(JSContext* cx, unsigned argc, Value* vp, bool scriptRelative) CompileOptions opts(cx); opts.setIntroductionType("js shell load") - .setUTF8(true) .setIsRunOnce(true) .setNoScriptRval(true); @@ -3379,7 +3376,6 @@ DisassFile(JSContext* cx, unsigned argc, Value* vp) { CompileOptions options(cx); options.setIntroductionType("js shell disFile") - .setUTF8(true) .setFileAndLine(filename.get(), 1) .setIsRunOnce(true) .setNoScriptRval(true); @@ -9744,12 +9740,17 @@ ProcessArgs(JSContext* cx, OptionParser* op) filePaths.popFront(); } else if (ccArgno < fpArgno && ccArgno < mpArgno && ccArgno < baArgno) { const char* code = codeChunks.front(); - RootedValue rval(cx); + JS::CompileOptions opts(cx); opts.setFileAndLine("-e", 1); - if (!JS::Evaluate(cx, opts, code, strlen(code), &rval)) { + + // This might be upgradable to UTF-8, but for now keep assuming the + // worst. + RootedValue rval(cx); + if (!JS::EvaluateLatin1(cx, opts, code, strlen(code), &rval)) { return false; } + codeChunks.popFront(); if (sc->quitting) { break; diff --git a/js/src/vm/CompilationAndEvaluation.cpp b/js/src/vm/CompilationAndEvaluation.cpp index 46ea5cc93318..4d3609ca8168 100644 --- a/js/src/vm/CompilationAndEvaluation.cpp +++ b/js/src/vm/CompilationAndEvaluation.cpp @@ -59,8 +59,6 @@ static bool CompileLatin1(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, JS::MutableHandleScript script) { - MOZ_ASSERT(!options.utf8); - char16_t* chars = InflateString(cx, bytes, length); if (!chars) { return false; @@ -74,8 +72,6 @@ static bool CompileUtf8(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, JS::MutableHandleScript script) { - MOZ_ASSERT(options.utf8); - char16_t* chars = UTF8CharsToNewTwoByteCharsZ(cx, UTF8Chars(bytes, length), &length).get(); if (!chars) { return false; @@ -85,23 +81,6 @@ CompileUtf8(JSContext* cx, const ReadOnlyCompileOptions& options, return CompileSourceBuffer(cx, options, source, script); } -static bool -CompileFile(JSContext* cx, const ReadOnlyCompileOptions& options, - FILE* fp, JS::MutableHandleScript script) -{ - FileContents buffer(cx); - if (!ReadCompleteFile(cx, fp, buffer)) { - return false; - } - - return options.utf8 - ? ::CompileUtf8(cx, options, - reinterpret_cast(buffer.begin()), buffer.length(), script) - : ::CompileLatin1(cx, options, - reinterpret_cast(buffer.begin()), buffer.length(), - script); -} - bool JS::Compile(JSContext* cx, const ReadOnlyCompileOptions& options, SourceBufferHolder& srcBuf, JS::MutableHandleScript script) @@ -113,7 +92,6 @@ bool JS::CompileLatin1(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, JS::MutableHandleScript script) { - MOZ_ASSERT(!options.utf8); return ::CompileLatin1(cx, options, bytes, length, script); } @@ -121,7 +99,6 @@ bool JS::CompileUtf8(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, JS::MutableHandleScript script) { - MOZ_ASSERT(options.utf8); return ::CompileUtf8(cx, options, bytes, length, script); } @@ -129,19 +106,19 @@ bool JS::CompileUtf8File(JSContext* cx, const ReadOnlyCompileOptions& options, FILE* file, JS::MutableHandleScript script) { - MOZ_ASSERT(options.utf8, - "options.utf8 must be set when JS::CompileUtf8File is called"); - return CompileFile(cx, options, file, script); + FileContents buffer(cx); + if (!ReadCompleteFile(cx, file, buffer)) { + return false; + } + + return ::CompileUtf8(cx, options, + reinterpret_cast(buffer.begin()), buffer.length(), script); } bool JS::CompileUtf8Path(JSContext* cx, const ReadOnlyCompileOptions& optionsArg, const char* filename, JS::MutableHandleScript script) { - MOZ_ASSERT(optionsArg.utf8, - "this function only compiles UTF-8 source text in the file at " - "the given path"); - AutoFile file; if (!file.open(cx, filename)) { return false; @@ -166,11 +143,9 @@ JS::CompileLatin1ForNonSyntacticScope(JSContext* cx, const ReadOnlyCompileOption const char* bytes, size_t length, JS::MutableHandleScript script) { - MOZ_ASSERT(!optionsArg.utf8, - "this function only compiles Latin-1 source text"); - CompileOptions options(cx, optionsArg); options.setNonSyntacticScope(true); + return ::CompileLatin1(cx, options, bytes, length, script); } @@ -371,17 +346,12 @@ JS::CompileFunction(JSContext* cx, AutoObjectVector& envChain, } JS_PUBLIC_API(bool) -JS::CompileFunction(JSContext* cx, AutoObjectVector& envChain, - const ReadOnlyCompileOptions& options, - const char* name, unsigned nargs, const char* const* argnames, - const char* bytes, size_t length, MutableHandleFunction fun) +JS::CompileFunctionUtf8(JSContext* cx, AutoObjectVector& envChain, + const ReadOnlyCompileOptions& options, + const char* name, unsigned nargs, const char* const* argnames, + const char* bytes, size_t length, MutableHandleFunction fun) { - char16_t* chars; - if (options.utf8) { - chars = UTF8CharsToNewTwoByteCharsZ(cx, UTF8Chars(bytes, length), &length).get(); - } else { - chars = InflateString(cx, bytes, length); - } + char16_t* chars = UTF8CharsToNewTwoByteCharsZ(cx, UTF8Chars(bytes, length), &length).get(); if (!chars) { return false; } @@ -549,9 +519,6 @@ extern JS_PUBLIC_API(bool) JS::EvaluateUtf8(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, MutableHandle rval) { - MOZ_ASSERT(options.utf8, - "this function only compiles UTF-8 source text"); - char16_t* chars = UTF8CharsToNewTwoByteCharsZ(cx, UTF8Chars(bytes, length), &length).get(); if (!chars) { return false; @@ -566,9 +533,6 @@ extern JS_PUBLIC_API(bool) JS::EvaluateLatin1(JSContext* cx, const ReadOnlyCompileOptions& options, const char* bytes, size_t length, MutableHandle rval) { - MOZ_ASSERT(!options.utf8, - "this function only compiles Latin-1 source text"); - char16_t* chars = InflateString(cx, bytes, length); if (!chars) { return false; @@ -598,10 +562,6 @@ JS_PUBLIC_API(bool) JS::EvaluateUtf8Path(JSContext* cx, const ReadOnlyCompileOptions& optionsArg, const char* filename, MutableHandleValue rval) { - MOZ_ASSERT(optionsArg.utf8, - "this function only evaluates UTF-8 source text in the file at " - "the given path"); - FileContents buffer(cx); { AutoFile file; @@ -613,6 +573,6 @@ JS::EvaluateUtf8Path(JSContext* cx, const ReadOnlyCompileOptions& optionsArg, CompileOptions options(cx, optionsArg); options.setFileAndLine(filename, 1); - return Evaluate(cx, options, - reinterpret_cast(buffer.begin()), buffer.length(), rval); + return EvaluateUtf8(cx, options, + reinterpret_cast(buffer.begin()), buffer.length(), rval); } diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp index 587ea5a8ce73..a20574ef846c 100644 --- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -2983,11 +2983,6 @@ JSRuntime::initSelfHosting(JSContext* cx) */ AutoSelfHostingErrorReporter errorReporter(cx); - CompileOptions options(cx); - FillSelfHostingCompileOptions(options); - - RootedValue rv(cx); - uint32_t srcLen = GetRawScriptsSize(); const unsigned char* compressed = compressedSources; @@ -2999,7 +2994,11 @@ JSRuntime::initSelfHosting(JSContext* cx) return false; } - if (!Evaluate(cx, options, src.get(), srcLen, &rv)) { + CompileOptions options(cx); + FillSelfHostingCompileOptions(options); + + RootedValue rv(cx); + if (!EvaluateUtf8(cx, options, src.get(), srcLen, &rv)) { return false; } diff --git a/js/src/wasm/AsmJS.cpp b/js/src/wasm/AsmJS.cpp index 5efd559d6a6b..66b1da93ec12 100644 --- a/js/src/wasm/AsmJS.cpp +++ b/js/src/wasm/AsmJS.cpp @@ -1971,9 +1971,14 @@ class MOZ_STACK_CLASS JS_HAZ_ROOTED ModuleValidator index += funcImportMap_.count(); } - Maybe initExpr = Some(InitExpr(LitVal(uint32_t(0)))); - return env_.elemSegments - .emplaceBack(tableIndex, std::move(initExpr), std::move(elems)); + MutableElemSegment seg = js_new(); + if (!seg) { + return false; + } + seg->tableIndex = tableIndex; + seg->offsetIfActive = Some(InitExpr(LitVal(uint32_t(0)))); + seg->elemFuncIndices = std::move(elems); + return env_.elemSegments.append(std::move(seg)); } bool declareImport(PropertyName* name, FuncType&& sig, unsigned ffiIndex, uint32_t* importIndex) { FuncImportMap::AddPtr p = funcImportMap_.lookupForAdd(NamedSig::Lookup(name, sig)); diff --git a/js/src/wasm/WasmCode.cpp b/js/src/wasm/WasmCode.cpp index 5cac57dbf9e2..aa6d964d8a47 100644 --- a/js/src/wasm/WasmCode.cpp +++ b/js/src/wasm/WasmCode.cpp @@ -593,7 +593,8 @@ CacheableChars::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const size_t MetadataTier::serializedSize() const { - return SerializedPodVectorSize(codeRanges) + + return SerializedPodVectorSize(funcToCodeRange) + + SerializedPodVectorSize(codeRanges) + SerializedPodVectorSize(callSites) + trapSites.serializedSize() + SerializedVectorSize(funcImports) + @@ -603,7 +604,8 @@ MetadataTier::serializedSize() const size_t MetadataTier::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const { - return codeRanges.sizeOfExcludingThis(mallocSizeOf) + + return funcToCodeRange.sizeOfExcludingThis(mallocSizeOf) + + codeRanges.sizeOfExcludingThis(mallocSizeOf) + callSites.sizeOfExcludingThis(mallocSizeOf) + trapSites.sizeOfExcludingThis(mallocSizeOf) + SizeOfVectorExcludingThis(funcImports, mallocSizeOf) + @@ -613,25 +615,26 @@ MetadataTier::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const uint8_t* MetadataTier::serialize(uint8_t* cursor) const { - MOZ_ASSERT(debugTrapFarJumpOffsets.empty() && debugFuncToCodeRange.empty()); + cursor = SerializePodVector(cursor, funcToCodeRange); cursor = SerializePodVector(cursor, codeRanges); cursor = SerializePodVector(cursor, callSites); cursor = trapSites.serialize(cursor); cursor = SerializeVector(cursor, funcImports); cursor = SerializeVector(cursor, funcExports); + MOZ_ASSERT(debugTrapFarJumpOffsets.empty()); return cursor; } /* static */ const uint8_t* MetadataTier::deserialize(const uint8_t* cursor) { + (cursor = DeserializePodVector(cursor, &funcToCodeRange)) && (cursor = DeserializePodVector(cursor, &codeRanges)) && (cursor = DeserializePodVector(cursor, &callSites)) && (cursor = trapSites.deserialize(cursor)) && (cursor = DeserializeVector(cursor, &funcImports)) && (cursor = DeserializeVector(cursor, &funcExports)); - debugTrapFarJumpOffsets.clear(); - debugFuncToCodeRange.clear(); + MOZ_ASSERT(debugTrapFarJumpOffsets.empty()); return cursor; } @@ -740,8 +743,8 @@ LazyStubTier::createMany(HasGcTypes gcTypesConfigured, const Uint32Vector& funcE JitContext jitContext(&alloc); WasmMacroAssembler masm(alloc); - const CodeRangeVector& moduleRanges = codeTier.metadata().codeRanges; - const FuncExportVector& funcExports = codeTier.metadata().funcExports; + const MetadataTier& metadata = codeTier.metadata(); + const FuncExportVector& funcExports = metadata.funcExports; uint8_t* moduleSegmentBase = codeTier.segment().base(); CodeRangeVector codeRanges; @@ -749,8 +752,7 @@ LazyStubTier::createMany(HasGcTypes gcTypesConfigured, const Uint32Vector& funcE for (uint32_t funcExportIndex : funcExportIndices) { const FuncExport& fe = funcExports[funcExportIndex]; numExpectedRanges += fe.funcType().temporarilyUnsupportedAnyRef() ? 1 : 2; - void* calleePtr = moduleSegmentBase + - moduleRanges[fe.funcCodeRangeIndex()].funcNormalEntry(); + void* calleePtr = moduleSegmentBase + metadata.codeRange(fe).funcNormalEntry(); Maybe callee; callee.emplace(calleePtr, ImmPtr::NoCheckToken()); if (!GenerateEntryStubs(masm, funcExportIndex, fe, callee, /* asmjs */ false, @@ -931,6 +933,9 @@ LazyStubTier::addSizeOfMisc(MallocSizeOf mallocSizeOf, size_t* code, size_t* dat bool MetadataTier::clone(const MetadataTier& src) { + if (!funcToCodeRange.appendAll(src.funcToCodeRange)) { + return false; + } if (!codeRanges.appendAll(src.codeRanges)) { return false; } @@ -940,9 +945,6 @@ MetadataTier::clone(const MetadataTier& src) if (!debugTrapFarJumpOffsets.appendAll(src.debugTrapFarJumpOffsets)) { return false; } - if (!debugFuncToCodeRange.appendAll(src.debugFuncToCodeRange)) { - return false; - } for (Trap trap : MakeEnumeratedRange(Trap::Limit)) { if (!trapSites[trap].appendAll(src.trapSites[trap])) { @@ -1212,15 +1214,11 @@ JumpTables::init(CompileMode mode, const ModuleSegment& ms, const CodeRangeVecto return true; } -Code::Code(UniqueCodeTier tier1, const Metadata& metadata, - JumpTables&& maybeJumpTables, DataSegmentVector&& dataSegments, - ElemSegmentVector&& elemSegments) +Code::Code(UniqueCodeTier tier1, const Metadata& metadata, JumpTables&& maybeJumpTables) : tier1_(std::move(tier1)), metadata_(&metadata), profilingLabels_(mutexid::WasmCodeProfilingLabels, CacheableCharsVector()), - jumpTables_(std::move(maybeJumpTables)), - dataSegments_(std::move(dataSegments)), - elemSegments_(std::move(elemSegments)) + jumpTables_(std::move(maybeJumpTables)) {} bool @@ -1510,9 +1508,7 @@ Code::addSizeOfMiscIfNotSeen(MallocSizeOf mallocSizeOf, *data += mallocSizeOf(this) + metadata().sizeOfIncludingThisIfNotSeen(mallocSizeOf, seenMetadata) + profilingLabels_.lock()->sizeOfExcludingThis(mallocSizeOf) + - jumpTables_.sizeOfMiscExcludingThis() + - dataSegments_.sizeOfExcludingThis(mallocSizeOf) + - SizeOfVectorExcludingThis(elemSegments_, mallocSizeOf); + jumpTables_.sizeOfMiscExcludingThis(); for (auto t : tiers()) { codeTier(t).addSizeOfMisc(mallocSizeOf, code, data); @@ -1543,8 +1539,6 @@ size_t Code::serializedSize() const { return metadata().serializedSize() + - SerializedPodVectorSize(dataSegments_) + - SerializedVectorSize(elemSegments_) + codeTier(Tier::Serialized).serializedSize(); } @@ -1554,8 +1548,6 @@ Code::serialize(uint8_t* cursor, const LinkData& linkData) const MOZ_RELEASE_ASSERT(!metadata().debugEnabled); cursor = metadata().serialize(cursor); - cursor = SerializePodVector(cursor, dataSegments_); - cursor = SerializeVector(cursor, elemSegments_); cursor = codeTier(Tier::Serialized).serialize(cursor, linkData); return cursor; } @@ -1572,16 +1564,6 @@ Code::deserialize(const uint8_t* cursor, return nullptr; } - DataSegmentVector dataSegments; - cursor = DeserializePodVector(cursor, &dataSegments); - if (!cursor) - return nullptr; - - ElemSegmentVector elemSegments; - cursor = DeserializeVector(cursor, &elemSegments); - if (!cursor) - return nullptr; - UniqueCodeTier codeTier; cursor = CodeTier::deserialize(cursor, linkData, &codeTier); if (!cursor) { @@ -1593,10 +1575,7 @@ Code::deserialize(const uint8_t* cursor, return nullptr; } - MutableCode code = js_new(std::move(codeTier), metadata, - std::move(jumpTables), - std::move(dataSegments), - std::move(elemSegments)); + MutableCode code = js_new(std::move(codeTier), metadata, std::move(jumpTables)); if (!code || !code->initialize(bytecode, linkData)) { return nullptr; } diff --git a/js/src/wasm/WasmCode.h b/js/src/wasm/WasmCode.h index 762b9e94cb2e..063e1b24da4b 100644 --- a/js/src/wasm/WasmCode.h +++ b/js/src/wasm/WasmCode.h @@ -213,7 +213,6 @@ class FuncExport FuncType funcType_; MOZ_INIT_OUTSIDE_CTOR struct CacheablePod { uint32_t funcIndex_; - uint32_t funcCodeRangeIndex_; uint32_t eagerInterpEntryOffset_; // Machine code offset bool hasEagerStubs_; } pod; @@ -224,7 +223,6 @@ class FuncExport : funcType_(std::move(funcType)) { pod.funcIndex_ = funcIndex; - pod.funcCodeRangeIndex_ = UINT32_MAX; pod.eagerInterpEntryOffset_ = UINT32_MAX; pod.hasEagerStubs_ = hasEagerStubs; } @@ -233,10 +231,6 @@ class FuncExport MOZ_ASSERT(hasEagerStubs()); pod.eagerInterpEntryOffset_ = entryOffset; } - void initFuncCodeRangeIndex(uint32_t codeRangeIndex) { - MOZ_ASSERT(pod.funcCodeRangeIndex_ == UINT32_MAX); - pod.funcCodeRangeIndex_ = codeRangeIndex; - } bool hasEagerStubs() const { return pod.hasEagerStubs_; @@ -247,10 +241,6 @@ class FuncExport uint32_t funcIndex() const { return pod.funcIndex_; } - uint32_t funcCodeRangeIndex() const { - MOZ_ASSERT(pod.funcCodeRangeIndex_ != UINT32_MAX); - return pod.funcCodeRangeIndex_; - } uint32_t eagerInterpEntryOffset() const { MOZ_ASSERT(pod.eagerInterpEntryOffset_ != UINT32_MAX); MOZ_ASSERT(hasEagerStubs()); @@ -491,6 +481,7 @@ struct MetadataTier const Tier tier; + Uint32Vector funcToCodeRange; CodeRangeVector codeRanges; CallSiteVector callSites; TrapSiteVectorArray trapSites; @@ -499,11 +490,14 @@ struct MetadataTier // Debug information, not serialized. Uint32Vector debugTrapFarJumpOffsets; - Uint32Vector debugFuncToCodeRange; FuncExport& lookupFuncExport(uint32_t funcIndex, size_t* funcExportIndex = nullptr); const FuncExport& lookupFuncExport(uint32_t funcIndex, size_t* funcExportIndex = nullptr) const; + const CodeRange& codeRange(const FuncExport& funcExport) const { + return codeRanges[funcToCodeRange[funcExport.funcIndex()]]; + } + bool clone(const MetadataTier& src); WASM_DECLARE_SERIALIZABLE(MetadataTier); @@ -729,13 +723,11 @@ class Code : public ShareableBase SharedMetadata metadata_; ExclusiveData profilingLabels_; JumpTables jumpTables_; - const DataSegmentVector dataSegments_; - const ElemSegmentVector elemSegments_; public: - Code(UniqueCodeTier tier1, const Metadata& metadata, - JumpTables&& maybeJumpTables, DataSegmentVector&& dataSegments, - ElemSegmentVector&& elemSegments); + Code(UniqueCodeTier tier1, + const Metadata& metadata, + JumpTables&& maybeJumpTables); bool initialized() const { return tier1_->initialized(); } bool initialize(const ShareableBytes& bytecode, const LinkData& linkData); @@ -760,8 +752,6 @@ class Code : public ShareableBase const CodeTier& codeTier(Tier tier) const; const Metadata& metadata() const { return *metadata_; } - const DataSegmentVector& dataSegments() const { return dataSegments_; } - const ElemSegmentVector& elemSegments() const { return elemSegments_; } const ModuleSegment& segment(Tier iter) const { return codeTier(iter).segment(); diff --git a/js/src/wasm/WasmDebug.cpp b/js/src/wasm/WasmDebug.cpp index bd1b58a130ec..e9717524648d 100644 --- a/js/src/wasm/WasmDebug.cpp +++ b/js/src/wasm/WasmDebug.cpp @@ -171,7 +171,7 @@ bool DebugState::incrementStepModeCount(JSContext* cx, uint32_t funcIndex) { MOZ_ASSERT(debugEnabled()); - const CodeRange& codeRange = codeRanges(Tier::Debug)[debugFuncToCodeRangeIndex(funcIndex)]; + const CodeRange& codeRange = codeRanges(Tier::Debug)[funcToCodeRangeIndex(funcIndex)]; MOZ_ASSERT(codeRange.isFunction()); StepModeCounters::AddPtr p = stepModeCounters_.lookupForAdd(funcIndex); @@ -205,7 +205,7 @@ bool DebugState::decrementStepModeCount(FreeOp* fop, uint32_t funcIndex) { MOZ_ASSERT(debugEnabled()); - const CodeRange& codeRange = codeRanges(Tier::Debug)[debugFuncToCodeRangeIndex(funcIndex)]; + const CodeRange& codeRange = codeRanges(Tier::Debug)[funcToCodeRangeIndex(funcIndex)]; MOZ_ASSERT(codeRange.isFunction()); MOZ_ASSERT(!stepModeCounters_.empty()); @@ -402,7 +402,7 @@ DebugState::debugGetLocalTypes(uint32_t funcIndex, ValTypeVector* locals, size_t } // Decode local var types from wasm binary function body. - const CodeRange& range = codeRanges(Tier::Debug)[debugFuncToCodeRangeIndex(funcIndex)]; + const CodeRange& range = codeRanges(Tier::Debug)[funcToCodeRangeIndex(funcIndex)]; // In wasm, the Code points to the function start via funcLineOrBytecode. MOZ_ASSERT(!metadata().isAsmJS() && maybeBytecode_); size_t offsetInModule = range.funcLineOrBytecode(); diff --git a/js/src/wasm/WasmDebug.h b/js/src/wasm/WasmDebug.h index d2b458f311b1..8e35e9cc9cf5 100644 --- a/js/src/wasm/WasmDebug.h +++ b/js/src/wasm/WasmDebug.h @@ -124,8 +124,8 @@ class DebugState const CodeRangeVector& codeRanges(Tier t) const { return metadata(t).codeRanges; } const CallSiteVector& callSites(Tier t) const { return metadata(t).callSites; } - uint32_t debugFuncToCodeRangeIndex(uint32_t funcIndex) const { - return metadata(Tier::Debug).debugFuncToCodeRange[funcIndex]; + uint32_t funcToCodeRangeIndex(uint32_t funcIndex) const { + return metadata(Tier::Debug).funcToCodeRange[funcIndex]; } // about:memory reporting: diff --git a/js/src/wasm/WasmGenerator.cpp b/js/src/wasm/WasmGenerator.cpp index 63b40f26b38b..c1fe910d8129 100644 --- a/js/src/wasm/WasmGenerator.cpp +++ b/js/src/wasm/WasmGenerator.cpp @@ -202,10 +202,10 @@ ModuleGenerator::init(Metadata* maybeAsmJSMetadata) return false; } - // The funcToCodeRange_ maps function indices to code-range indices and all + // funcToCodeRange maps function indices to code-range indices and all // elements will be initialized by the time module generation is finished. - if (!funcToCodeRange_.appendN(BAD_CODE_RANGE, env_->funcTypes.length())) { + if (!metadataTier_->funcToCodeRange.appendN(BAD_CODE_RANGE, env_->funcTypes.length())) { return false; } @@ -327,12 +327,12 @@ ModuleGenerator::init(Metadata* maybeAsmJSMetadata) } } - for (ElemSegment& elems : env_->elemSegments) { - if (env_->tables[elems.tableIndex].external) { - if (!exportedFuncs.reserve(exportedFuncs.length() + elems.elemFuncIndices.length())) { + for (const ElemSegment* seg : env_->elemSegments) { + if (env_->tables[seg->tableIndex].external) { + if (!exportedFuncs.reserve(exportedFuncs.length() + seg->length())) { return false; } - for (uint32_t funcIndex : elems.elemFuncIndices) { + for (uint32_t funcIndex : seg->elemFuncIndices) { exportedFuncs.infallibleEmplaceBack(funcIndex, false); } } @@ -414,14 +414,14 @@ ModuleGenerator::init(Metadata* maybeAsmJSMetadata) bool ModuleGenerator::funcIsCompiled(uint32_t funcIndex) const { - return funcToCodeRange_[funcIndex] != BAD_CODE_RANGE; + return metadataTier_->funcToCodeRange[funcIndex] != BAD_CODE_RANGE; } const CodeRange& ModuleGenerator::funcCodeRange(uint32_t funcIndex) const { MOZ_ASSERT(funcIsCompiled(funcIndex)); - const CodeRange& cr = metadataTier_->codeRanges[funcToCodeRange_[funcIndex]]; + const CodeRange& cr = metadataTier_->codeRanges[metadataTier_->funcToCodeRange[funcIndex]]; MOZ_ASSERT(cr.isFunction()); return cr; } @@ -538,8 +538,8 @@ ModuleGenerator::noteCodeRange(uint32_t codeRangeIndex, const CodeRange& codeRan { switch (codeRange.kind()) { case CodeRange::Function: - MOZ_ASSERT(funcToCodeRange_[codeRange.funcIndex()] == BAD_CODE_RANGE); - funcToCodeRange_[codeRange.funcIndex()] = codeRangeIndex; + MOZ_ASSERT(metadataTier_->funcToCodeRange[codeRange.funcIndex()] == BAD_CODE_RANGE); + metadataTier_->funcToCodeRange[codeRange.funcIndex()] = codeRangeIndex; break; case CodeRange::InterpEntry: metadataTier_->lookupFuncExport(codeRange.funcIndex()) @@ -922,33 +922,15 @@ ModuleGenerator::finishMetadata(const ShareableBytes& bytecode) // These Vectors can get large and the excess capacity can be significant, // so realloc them down to size. + metadataTier_->funcToCodeRange.podResizeToFit(); metadataTier_->codeRanges.podResizeToFit(); metadataTier_->callSites.podResizeToFit(); metadataTier_->trapSites.podResizeToFit(); metadataTier_->debugTrapFarJumpOffsets.podResizeToFit(); - metadataTier_->debugFuncToCodeRange.podResizeToFit(); for (Trap trap : MakeEnumeratedRange(Trap::Limit)) { metadataTier_->trapSites[trap].podResizeToFit(); } - // Complete function exports and element segments with code range indices, - // now that every function has a code range. - - for (FuncExport& fe : metadataTier_->funcExports) { - fe.initFuncCodeRangeIndex(funcToCodeRange_[fe.funcIndex()]); - } - - for (ElemSegment& elems : env_->elemSegments) { - Uint32Vector& codeRangeIndices = elems.elemCodeRangeIndices(tier()); - MOZ_ASSERT(codeRangeIndices.empty()); - if (!codeRangeIndices.reserve(elems.elemFuncIndices.length())) { - return false; - } - for (uint32_t funcIndex : elems.elemFuncIndices) { - codeRangeIndices.infallibleAppend(funcToCodeRange_[funcIndex]); - } - } - // Copy over additional debug information. if (env_->debugEnabled()) { @@ -967,7 +949,6 @@ ModuleGenerator::finishMetadata(const ShareableBytes& bytecode) } metadata_->debugFuncReturnTypes[i] = env_->funcTypes[i]->ret(); } - metadataTier_->debugFuncToCodeRange = std::move(funcToCodeRange_); static_assert(sizeof(ModuleHash) <= sizeof(mozilla::SHA1Sum::Hash), "The ModuleHash size shall not exceed the SHA1 hash size."); @@ -993,7 +974,7 @@ ModuleGenerator::finish(const ShareableBytes& bytecode) } #ifdef DEBUG - for (uint32_t codeRangeIndex : funcToCodeRange_) { + for (uint32_t codeRangeIndex : metadataTier_->funcToCodeRange) { MOZ_ASSERT(codeRangeIndex != BAD_CODE_RANGE); } #endif @@ -1051,10 +1032,7 @@ ModuleGenerator::finishModule(const ShareableBytes& bytecode, UniqueLinkData* li return nullptr; } - MutableCode code = js_new(std::move(codeTier), *metadata_, - std::move(jumpTables), - std::move(env_->dataSegments), - std::move(env_->elemSegments)); + MutableCode code = js_new(std::move(codeTier), *metadata_, std::move(jumpTables)); if (!code || !code->initialize(bytecode, *linkData_)) { return nullptr; } @@ -1066,6 +1044,21 @@ ModuleGenerator::finishModule(const ShareableBytes& bytecode, UniqueLinkData* li } } + DataSegmentVector dataSegments; + if (!dataSegments.reserve(env_->dataSegments.length())) { + return nullptr; + } + for (DataSegmentEnv& srcSeg : env_->dataSegments) { + MutableDataSegment dstSeg = js_new(srcSeg); + if (!dstSeg) { + return nullptr; + } + if (!dstSeg->bytes.append(bytecode.begin() + srcSeg.bytecodeOffset, srcSeg.length)) { + return nullptr; + } + dataSegments.infallibleAppend(std::move(dstSeg)); + } + UniqueBytes debugUnlinkedCode; UniqueLinkData debugLinkData; if (env_->debugEnabled()) { @@ -1086,6 +1079,8 @@ ModuleGenerator::finishModule(const ShareableBytes& bytecode, UniqueLinkData* li std::move(env_->imports), std::move(env_->exports), std::move(structTypes), + std::move(dataSegments), + std::move(env_->elemSegments), bytecode, std::move(debugUnlinkedCode), std::move(debugLinkData))); @@ -1122,8 +1117,8 @@ ModuleGenerator::finishTier2(Module& module) return false; } - auto tier2 = js::MakeUnique(std::move(metadataTier_), std::move(moduleSegment)); - if (!tier2) { + auto code = js::MakeUnique(std::move(metadataTier_), std::move(moduleSegment)); + if (!code) { return false; } @@ -1133,7 +1128,7 @@ ModuleGenerator::finishTier2(Module& module) std::this_thread::sleep_for(std::chrono::milliseconds(500)); } - return module.finishTier2(*linkData_, std::move(tier2), std::move(*env_)); + return module.finishTier2(*linkData_, std::move(code)); } size_t diff --git a/js/src/wasm/WasmInstance.cpp b/js/src/wasm/WasmInstance.cpp index 1d2241e96086..9b26f6143b61 100644 --- a/js/src/wasm/WasmInstance.cpp +++ b/js/src/wasm/WasmInstance.cpp @@ -142,10 +142,10 @@ Instance::callImport(JSContext* cx, uint32_t funcImportIndex, unsigned argc, con } FuncImportTls& import = funcImportTls(fi); - RootedFunction importFun(cx, &import.obj->as()); + RootedFunction importFun(cx, import.fun); MOZ_ASSERT(cx->realm() == importFun->realm()); - RootedValue fval(cx, ObjectValue(*import.obj)); + RootedValue fval(cx, ObjectValue(*importFun)); RootedValue thisv(cx, UndefinedValue()); if (!Call(cx, fval, thisv, args, rval)) { return false; @@ -436,30 +436,20 @@ Instance::memCopy(Instance* instance, uint32_t dstByteOffset, uint32_t srcByteOf /* static */ int32_t Instance::memDrop(Instance* instance, uint32_t segIndex) { - DataSegmentInitVector& dataSegInitVec = instance->dataSegInitVec(); - size_t initVecLen = dataSegInitVec.length(); - MOZ_RELEASE_ASSERT(size_t(segIndex) < initVecLen, "ensured by validation"); + MOZ_RELEASE_ASSERT(size_t(segIndex) < instance->passiveDataSegments_.length(), + "ensured by validation"); - const DataSegmentVector& dataSegs = instance->code().dataSegments(); - MOZ_ASSERT(dataSegs.length() == initVecLen); - - UniquePtr& segInit = dataSegInitVec[segIndex]; - - // Check that the segment is available for passive use. - if (!segInit) { - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, + if (!instance->passiveDataSegments_[segIndex]) { + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_INVALID_PASSIVE_DATA_SEG); return -1; } - // If this is an active initializer, something is badly wrong. - const DataSegment& seg = dataSegs[segIndex]; - MOZ_RELEASE_ASSERT(!seg.offsetIfActive); + SharedDataSegment& segRefPtr = instance->passiveDataSegments_[segIndex]; + MOZ_RELEASE_ASSERT(!segRefPtr->active()); - // Free the initializer, and update the initializer vector accordingly. - // This makes the initializer unavailable for future usage. - segInit = nullptr; + // Drop this instance's reference to the DataSegment so it can be released. + segRefPtr = nullptr; return 0; } @@ -495,36 +485,26 @@ Instance::memFill(Instance* instance, uint32_t byteOffset, uint32_t value, uint3 Instance::memInit(Instance* instance, uint32_t dstOffset, uint32_t srcOffset, uint32_t len, uint32_t segIndex) { - const DataSegmentInitVector& dataSegInitVec = instance->dataSegInitVec(); - size_t initVecLen = dataSegInitVec.length(); - MOZ_RELEASE_ASSERT(size_t(segIndex) < initVecLen, "ensured by validation"); + MOZ_RELEASE_ASSERT(size_t(segIndex) < instance->passiveDataSegments_.length(), + "ensured by validation"); - const DataSegmentVector& dataSegs = instance->code().dataSegments(); - MOZ_ASSERT(dataSegs.length() == initVecLen); - - const UniquePtr& segInit = dataSegInitVec[segIndex]; - - // Check that the segment is available for passive use. - if (!segInit) { - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, + if (!instance->passiveDataSegments_[segIndex]) { + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_INVALID_PASSIVE_DATA_SEG); return -1; } - // If this is an active initializer, something is badly wrong. - const DataSegment& seg = dataSegs[segIndex]; - MOZ_RELEASE_ASSERT(!seg.offsetIfActive); + const DataSegment& seg = *instance->passiveDataSegments_[segIndex]; + MOZ_RELEASE_ASSERT(!seg.active()); - const uint32_t segLen = seg.length; - MOZ_ASSERT(segLen == segInit->length()); + const uint32_t segLen = seg.bytes.length(); WasmMemoryObject* mem = instance->memory(); const uint32_t memLen = mem->volatileMemoryLength(); // We are proposing to copy // - // segInit->begin()[ srcOffset .. srcOffset + len - 1 ] + // seg.bytes.begin()[ srcOffset .. srcOffset + len - 1 ] // to // memoryBase[ dstOffset .. dstOffset + len - 1 ] @@ -546,13 +526,12 @@ Instance::memInit(Instance* instance, uint32_t dstOffset, uint32_t srcOffset, ArrayBufferObjectMaybeShared& arrBuf = mem->buffer(); uint8_t* memoryBase = arrBuf.dataPointerEither().unwrap(); memcpy(memoryBase + dstOffset, - (const char*)segInit->begin() + srcOffset, len); + (const char*)seg.bytes.begin() + srcOffset, len); return 0; } } - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); return -1; } @@ -591,82 +570,102 @@ Instance::tableCopy(Instance* instance, uint32_t dstOffset, uint32_t srcOffset, } } - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); return -1; } /* static */ int32_t Instance::tableDrop(Instance* instance, uint32_t segIndex) { - ElemSegmentInitVector& elemSegInitVec = instance->elemSegInitVec(); - size_t initVecLen = elemSegInitVec.length(); - MOZ_RELEASE_ASSERT(size_t(segIndex) < initVecLen, "ensured by validation"); + MOZ_RELEASE_ASSERT(size_t(segIndex) < instance->passiveElemSegments_.length(), + "ensured by validation"); - const ElemSegmentVector& elemSegs = instance->code().elemSegments(); - MOZ_ASSERT(elemSegs.length() == initVecLen); - - UniquePtr& segInit = elemSegInitVec[segIndex]; - - // Check that the segment is available for passive use. - if (!segInit) { - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, - JSMSG_WASM_INVALID_PASSIVE_ELEM_SEG); - return -1; + if (!instance->passiveElemSegments_[segIndex]) { + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, + JSMSG_WASM_INVALID_PASSIVE_ELEM_SEG); + return -1; } - // If this is an active initializer, something is badly wrong. - const ElemSegment& seg = elemSegs[segIndex]; - MOZ_RELEASE_ASSERT(!seg.offsetIfActive); + SharedElemSegment& segRefPtr = instance->passiveElemSegments_[segIndex]; + MOZ_RELEASE_ASSERT(!segRefPtr->active()); - // Free the initializer, and update the initializer vector accordingly. - // This makes the initializer unavailable for future usage. - segInit = nullptr; + // Drop this instance's reference to the ElemSegment so it can be released. + segRefPtr = nullptr; return 0; } +void +Instance::initElems(const ElemSegment& seg, uint32_t dstOffset, uint32_t srcOffset, uint32_t len) +{ + Table& table = *tables_[seg.tableIndex]; + MOZ_ASSERT(dstOffset <= table.length()); + MOZ_ASSERT(len <= table.length() - dstOffset); + + Tier tier = code().bestTier(); + const MetadataTier& metadataTier = metadata(tier); + const FuncImportVector& funcImports = metadataTier.funcImports; + const CodeRangeVector& codeRanges = metadataTier.codeRanges; + const Uint32Vector& funcToCodeRange = metadataTier.funcToCodeRange; + const Uint32Vector& elemFuncIndices = seg.elemFuncIndices; + MOZ_ASSERT(srcOffset <= elemFuncIndices.length()); + MOZ_ASSERT(len <= elemFuncIndices.length() - srcOffset); + + uint8_t* codeBaseTier = codeBase(tier); + for (uint32_t i = 0; i < len; i++) { + uint32_t funcIndex = elemFuncIndices[srcOffset + i]; + if (funcIndex < funcImports.length()) { + FuncImportTls& import = funcImportTls(funcImports[funcIndex]); + JSFunction *fun = import.fun; + if (IsExportedWasmFunction(fun)) { + // This element is a wasm function imported from another + // instance. To preserve the === function identity required by + // the JS embedding spec, we must set the element to the + // imported function's underlying CodeRange.funcTableEntry and + // Instance so that future Table.get()s produce the same + // function object as was imported. + WasmInstanceObject* calleeInstanceObj = ExportedFunctionToInstanceObject(fun); + Instance& calleeInstance = calleeInstanceObj->instance(); + Tier calleeTier = calleeInstance.code().bestTier(); + const CodeRange& calleeCodeRange = + calleeInstanceObj->getExportedFunctionCodeRange(fun, calleeTier); + void* code = calleeInstance.codeBase(calleeTier) + calleeCodeRange.funcTableEntry(); + table.set(dstOffset + i, code, &calleeInstance); + continue; + } + } + void* code = codeBaseTier + codeRanges[funcToCodeRange[funcIndex]].funcTableEntry(); + table.set(dstOffset + i, code, this); + } +} + /* static */ int32_t Instance::tableInit(Instance* instance, uint32_t dstOffset, uint32_t srcOffset, uint32_t len, uint32_t segIndex) { - const ElemSegmentInitVector& elemSegInitVec = instance->elemSegInitVec(); - size_t initVecLen = elemSegInitVec.length(); - MOZ_RELEASE_ASSERT(size_t(segIndex) < initVecLen, "ensured by validation"); + MOZ_RELEASE_ASSERT(size_t(segIndex) < instance->passiveElemSegments_.length(), + "ensured by validation"); - const ElemSegmentVector& elemSegs = instance->code().elemSegments(); - MOZ_ASSERT(elemSegs.length() == initVecLen); - - const UniquePtr& segInit = elemSegInitVec[segIndex]; - - // Check that the segment is available for passive use. - if (!segInit) { - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, + if (!instance->passiveElemSegments_[segIndex]) { + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_INVALID_PASSIVE_ELEM_SEG); return -1; } - // If this is an active initializer, something is badly wrong. - const ElemSegment& seg = elemSegs[segIndex]; - MOZ_RELEASE_ASSERT(!seg.offsetIfActive); - - const uint32_t segLen = seg.elemFuncIndices.length(); - MOZ_ASSERT(segLen == segInit->length()); - - const SharedTable& table = instance->tables()[0]; - const uint32_t tableLen = table->length(); + const ElemSegment& seg = *instance->passiveElemSegments_[segIndex]; + MOZ_RELEASE_ASSERT(!seg.active()); + const Table& table = *instance->tables()[seg.tableIndex]; // We are proposing to copy // - // (*segInit)[ srcOffset .. srcOffset + len - 1 ] + // seg[ srcOffset .. srcOffset + len - 1 ] // to // tableBase[ dstOffset .. dstOffset + len - 1 ] if (len == 0) { // Even though the length is zero, we must check for valid offsets. - if (dstOffset < tableLen && srcOffset < segLen) + if (dstOffset < table.length() && srcOffset < seg.length()) { return 0; + } } else { // Here, we know that |len - 1| cannot underflow. CheckedU32 lenMinus1 = CheckedU32(len - 1); @@ -674,26 +673,15 @@ Instance::tableInit(Instance* instance, uint32_t dstOffset, uint32_t srcOffset, CheckedU32 highestSrcOffset = CheckedU32(srcOffset) + lenMinus1; if (highestDstOffset.isValid() && highestSrcOffset.isValid() && - highestDstOffset.value() < tableLen && - highestSrcOffset.value() < segLen) + highestDstOffset.value() < table.length() && + highestSrcOffset.value() < seg.length()) { - for (uint32_t i = 0; i < len; i++) { - WasmCallee callee = (*segInit)[srcOffset + i]; - MOZ_ASSERT(callee.entry); - MOZ_ASSERT(callee.instance); - // An "internal" table implicitly means that the instance - // pointer associated with each code entry point is the - // instance that owns the table. So we need to ensure we're - // not about to break that invariant. - MOZ_ASSERT_IF(!table->external(), callee.instance == instance); - table->set(dstOffset + i, callee.entry, callee.instance); - } + instance->initElems(seg, dstOffset, srcOffset, len); return 0; } } - JSContext* cx = TlsContext.get(); - JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); + JS_ReportErrorNumberASCII(TlsContext.get(), GetErrorMessage, nullptr, JSMSG_WASM_OUT_OF_BOUNDS); return -1; } @@ -747,11 +735,11 @@ Instance::Instance(JSContext* cx, #endif Tier callerTier = code_->bestTier(); - for (size_t i = 0; i < metadata(callerTier).funcImports.length(); i++) { HandleFunction f = funcImports[i]; const FuncImport& fi = metadata(callerTier).funcImports[i]; FuncImportTls& import = funcImportTls(fi); + import.fun = f; if (!isAsmJS() && IsExportedWasmFunction(f)) { WasmInstanceObject* calleeInstanceObj = ExportedFunctionToInstanceObject(f); Instance& calleeInstance = calleeInstanceObj->instance(); @@ -761,19 +749,16 @@ Instance::Instance(JSContext* cx, import.realm = f->realm(); import.code = calleeInstance.codeBase(calleeTier) + codeRange.funcNormalEntry(); import.baselineScript = nullptr; - import.obj = calleeInstanceObj; } else if (void* thunk = MaybeGetBuiltinThunk(f, fi.funcType())) { import.tls = tlsData(); import.realm = f->realm(); import.code = thunk; import.baselineScript = nullptr; - import.obj = f; } else { import.tls = tlsData(); import.realm = f->realm(); import.code = codeBase(callerTier) + fi.interpExitCodeOffset(); import.baselineScript = nullptr; - import.obj = f; } } @@ -842,8 +827,9 @@ Instance::Instance(JSContext* cx, } bool -Instance::init(JSContext* cx, const ShareableBytes* bytecode, - Handle funcImports) +Instance::init(JSContext* cx, + const DataSegmentVector& dataSegments, + const ElemSegmentVector& elemSegments) { if (memory_ && memory_->movingGrowable() && !memory_->addMovingGrowObserver(cx, object_)) { return false; @@ -878,60 +864,22 @@ Instance::init(JSContext* cx, const ShareableBytes* bytecode, preBarrierCode_ = jitRuntime->preBarrier(MIRType::Object); #endif - // Create a vector the same length as the data segment vector, holding a - // copy of the initialising data for passive segments and |nullptr| for - // active ones. - MOZ_ASSERT(dataSegInitVec_.empty()); - if (!dataSegInitVec_.reserve(code().dataSegments().length())) { - ReportOutOfMemory(cx); + if (!passiveDataSegments_.resize(dataSegments.length())) { return false; } - for (const DataSegment& seg : code().dataSegments()) { - UniquePtr dsi = nullptr; - if (!seg.offsetIfActive) { - // Passive initialiser. - dsi.reset(js_new()); - if (!dsi || !dsi->initLengthUninitialized(seg.length)) { - ReportOutOfMemory(cx); - return false; - } - MOZ_ASSERT(seg.bytecodeOffset <= bytecode->length()); - MOZ_ASSERT(seg.length <= bytecode->length() - seg.bytecodeOffset); - memcpy((char*)dsi->begin(), - (char*)bytecode->begin() + seg.bytecodeOffset, - seg.length); + for (size_t i = 0; i < dataSegments.length(); i++) { + if (!dataSegments[i]->active()) { + passiveDataSegments_[i] = dataSegments[i]; } - dataSegInitVec_.infallibleAppend(std::move(dsi)); } - // And similarly for the elem segment vector. - MOZ_ASSERT(elemSegInitVec_.empty()); - if (!elemSegInitVec_.reserve(code().elemSegments().length())) { - ReportOutOfMemory(cx); + if (!passiveElemSegments_.resize(elemSegments.length())) { return false; } - for (const ElemSegment& seg : code().elemSegments()) { - UniquePtr esi = nullptr; - if (!seg.offsetIfActive) { - // Passive initialiser. - esi.reset(js_new()); - if (!esi || !esi->initLengthUninitialized(seg.elemFuncIndices.length())) { - ReportOutOfMemory(cx); - return false; - } - - Tier tier = code().bestTier(); - const Table& table = *tables()[seg.tableIndex]; - - MOZ_ASSERT(seg.elemCodeRangeIndices(tier).length() == - seg.elemFuncIndices.length()); - - for (uint32_t i = 0; i < seg.elemCodeRangeIndices(tier).length(); i++) { - ComputeWasmCallee(code(), this, funcImports, i, table, seg, - &(*esi)[i]); - } + for (size_t i = 0; i < elemSegments.length(); i++) { + if (!elemSegments[i]->active()) { + passiveElemSegments_[i] = elemSegments[i]; } - elemSegInitVec_.infallibleAppend(std::move(esi)); } return true; @@ -1000,7 +948,7 @@ Instance::tracePrivate(JSTracer* trc) // OK to just do one tier here; though the tiers have different funcImports // tables, they share the tls object. for (const FuncImport& fi : metadata(code().stableTier()).funcImports) { - TraceNullableEdge(trc, &funcImportTls(fi).obj, "wasm import"); + TraceNullableEdge(trc, &funcImportTls(fi).fun, "wasm import"); } for (const SharedTable& table : tables_) { diff --git a/js/src/wasm/WasmInstance.h b/js/src/wasm/WasmInstance.h index b600ae01cc04..ae1d3de30de7 100644 --- a/js/src/wasm/WasmInstance.h +++ b/js/src/wasm/WasmInstance.h @@ -55,8 +55,8 @@ class Instance const UniqueTlsData tlsData_; GCPtrWasmMemoryObject memory_; SharedTableVector tables_; - DataSegmentInitVector dataSegInitVec_; - ElemSegmentInitVector elemSegInitVec_; + DataSegmentVector passiveDataSegments_; + ElemSegmentVector passiveElemSegments_; bool enterFrameTrapsEnabled_; // Internal helpers: @@ -83,8 +83,9 @@ class Instance HandleValVector globalImportValues, const WasmGlobalObjectVector& globalObjs); ~Instance(); - bool init(JSContext* cx, const ShareableBytes* bytecode, - Handle funcImports); + bool init(JSContext* cx, + const DataSegmentVector& dataSegments, + const ElemSegmentVector& elemSegments); void trace(JSTracer* trc); JS::Realm* realm() const { return realm_; } @@ -100,8 +101,6 @@ class Instance const Metadata& metadata() const { return code_->metadata(); } bool isAsmJS() const { return metadata().isAsmJS(); } const SharedTableVector& tables() const { return tables_; } - DataSegmentInitVector& dataSegInitVec() { return dataSegInitVec_; } - ElemSegmentInitVector& elemSegInitVec() { return elemSegInitVec_; } SharedMem memoryBase() const; WasmMemoryObject* memory() const; size_t memoryMappedSize() const; @@ -154,6 +153,11 @@ class Instance void onMovingGrowMemory(uint8_t* prevMemoryBase); void onMovingGrowTable(); + // Called to apply a single ElemSegment at a given offset, assuming + // that all bounds validation has already been performed. + + void initElems(const ElemSegment& seg, uint32_t dstOffset, uint32_t srcOffset, uint32_t len); + // Debug support: bool debugEnabled() const { return metadata().debugEnabled; } diff --git a/js/src/wasm/WasmJS.cpp b/js/src/wasm/WasmJS.cpp index 574b2e4e005b..01f20a0b6f6c 100644 --- a/js/src/wasm/WasmJS.cpp +++ b/js/src/wasm/WasmJS.cpp @@ -1157,6 +1157,8 @@ WasmInstanceObject::trace(JSTracer* trc, JSObject* obj) /* static */ WasmInstanceObject* WasmInstanceObject::create(JSContext* cx, SharedCode code, + const DataSegmentVector& dataSegments, + const ElemSegmentVector& elemSegments, UniqueDebugState debug, UniqueTlsData tlsData, HandleWasmMemoryObject memory, @@ -1165,7 +1167,6 @@ WasmInstanceObject::create(JSContext* cx, const GlobalDescVector& globals, HandleValVector globalImportValues, const WasmGlobalObjectVector& globalObjs, - const ShareableBytes* bytecode, HandleObject proto) { UniquePtr exports = js::MakeUnique(); @@ -1240,7 +1241,7 @@ WasmInstanceObject::create(JSContext* cx, obj->initReservedSlot(INSTANCE_SLOT, PrivateValue(instance)); MOZ_ASSERT(!obj->isNewborn()); - if (!instance->init(cx, bytecode, funcImports)) { + if (!instance->init(cx, dataSegments, elemSegments)) { return nullptr; } @@ -1487,12 +1488,12 @@ WasmInstanceObject::getExportedFunction(JSContext* cx, HandleWasmInstanceObject } const CodeRange& -WasmInstanceObject::getExportedFunctionCodeRange(HandleFunction fun, Tier tier) +WasmInstanceObject::getExportedFunctionCodeRange(JSFunction* fun, Tier tier) { uint32_t funcIndex = ExportedFunctionToFuncIndex(fun); MOZ_ASSERT(exports().lookup(funcIndex)->value() == fun); - const FuncExport& funcExport = instance().metadata(tier).lookupFuncExport(funcIndex); - return instance().metadata(tier).codeRanges[funcExport.funcCodeRangeIndex()]; + const MetadataTier& metadata = instance().metadata(tier); + return metadata.codeRange(metadata.lookupFuncExport(funcIndex)); } /* static */ WasmInstanceScope* @@ -2202,8 +2203,7 @@ WasmTableObject::setImpl(JSContext* cx, const CallArgs& args) Instance& instance = instanceObj->instance(); Tier tier = instance.code().bestTier(); const MetadataTier& metadata = instance.metadata(tier); - const FuncExport& funcExport = metadata.lookupFuncExport(funcIndex); - const CodeRange& codeRange = metadata.codeRanges[funcExport.funcCodeRangeIndex()]; + const CodeRange& codeRange = metadata.codeRange(metadata.lookupFuncExport(funcIndex)); void* code = instance.codeBase(tier) + codeRange.funcTableEntry(); table.set(index, code, &instance); } else { diff --git a/js/src/wasm/WasmJS.h b/js/src/wasm/WasmJS.h index 6e26dbf84f1c..c340f876d664 100644 --- a/js/src/wasm/WasmJS.h +++ b/js/src/wasm/WasmJS.h @@ -214,6 +214,8 @@ class WasmInstanceObject : public NativeObject static WasmInstanceObject* create(JSContext* cx, RefPtr code, + const wasm::DataSegmentVector& dataSegments, + const wasm::ElemSegmentVector& elemSegments, UniquePtr debug, wasm::UniqueTlsData tlsData, HandleWasmMemoryObject memory, @@ -222,7 +224,6 @@ class WasmInstanceObject : public NativeObject const wasm::GlobalDescVector& globals, wasm::HandleValVector globalImportValues, const WasmGlobalObjectVector& globalObjs, - const wasm::ShareableBytes* bytecode, HandleObject proto); void initExportsObj(JSObject& exportsObj); @@ -234,7 +235,7 @@ class WasmInstanceObject : public NativeObject uint32_t funcIndex, MutableHandleFunction fun); - const wasm::CodeRange& getExportedFunctionCodeRange(HandleFunction fun, wasm::Tier tier); + const wasm::CodeRange& getExportedFunctionCodeRange(JSFunction* fun, wasm::Tier tier); static WasmInstanceScope* getScope(JSContext* cx, HandleWasmInstanceObject instanceObj); static WasmFunctionScope* getFunctionScope(JSContext* cx, diff --git a/js/src/wasm/WasmModule.cpp b/js/src/wasm/WasmModule.cpp index f9585c058123..56d367d3d50d 100644 --- a/js/src/wasm/WasmModule.cpp +++ b/js/src/wasm/WasmModule.cpp @@ -81,20 +81,16 @@ Module::startTier2(const CompileArgs& args) } bool -Module::finishTier2(const LinkData& linkData, UniqueCodeTier tier2Arg, ModuleEnvironment&& env2) +Module::finishTier2(const LinkData& linkData2, UniqueCodeTier code2) { - MOZ_ASSERT(code().bestTier() == Tier::Baseline && tier2Arg->tier() == Tier::Ion); + MOZ_ASSERT(code().bestTier() == Tier::Baseline && code2->tier() == Tier::Ion); // Install the data in the data structures. They will not be visible // until commitTier2(). - if (!code().setTier2(std::move(tier2Arg), *bytecode_, linkData)) { + if (!code().setTier2(std::move(code2), *bytecode_, linkData2)) { return false; } - for (uint32_t i = 0; i < code().elemSegments().length(); i++) { - code().elemSegments()[i] - .setTier2(std::move(env2.elemSegments[i].elemCodeRangeIndices(Tier::Ion))); - } // Before we can make tier-2 live, we need to compile tier2 versions of any // extant tier1 lazy stubs (otherwise, tiering would break the assumption @@ -118,7 +114,6 @@ Module::finishTier2(const LinkData& linkData, UniqueCodeTier tier2Arg, ModuleEnv if (fe.hasEagerStubs()) { continue; } - MOZ_ASSERT(!env2.isAsmJS(), "only wasm functions are lazily exported"); if (!stubs1->hasStub(fe.funcIndex())) { continue; } @@ -176,6 +171,8 @@ Module::serializedSize(const LinkData& linkData) const SerializedVectorSize(imports_) + SerializedVectorSize(exports_) + SerializedVectorSize(structTypes_) + + SerializedVectorSize(dataSegments_) + + SerializedVectorSize(elemSegments_) + code_->serializedSize(); } @@ -191,6 +188,8 @@ Module::serialize(const LinkData& linkData, uint8_t* begin, size_t size) const cursor = SerializeVector(cursor, imports_); cursor = SerializeVector(cursor, exports_); cursor = SerializeVector(cursor, structTypes_); + cursor = SerializeVector(cursor, dataSegments_); + cursor = SerializeVector(cursor, elemSegments_); cursor = code_->serialize(cursor, linkData); MOZ_RELEASE_ASSERT(cursor == begin + size); } @@ -239,6 +238,18 @@ Module::deserialize(const uint8_t* begin, size_t size, Metadata* maybeMetadata) return nullptr; } + DataSegmentVector dataSegments; + cursor = DeserializeVector(cursor, &dataSegments); + if (!cursor) { + return nullptr; + } + + ElemSegmentVector elemSegments; + cursor = DeserializeVector(cursor, &elemSegments); + if (!cursor) { + return nullptr; + } + SharedCode code; cursor = Code::deserialize(cursor, *bytecode, linkData, *metadata, &code); if (!cursor) { @@ -252,6 +263,8 @@ Module::deserialize(const uint8_t* begin, size_t size, Metadata* maybeMetadata) std::move(imports), std::move(exports), std::move(structTypes), + std::move(dataSegments), + std::move(elemSegments), *bytecode); } @@ -352,13 +365,15 @@ Module::addSizeOfMisc(MallocSizeOf mallocSizeOf, SizeOfVectorExcludingThis(imports_, mallocSizeOf) + SizeOfVectorExcludingThis(exports_, mallocSizeOf) + SizeOfVectorExcludingThis(structTypes_, mallocSizeOf) + + SizeOfVectorExcludingThis(dataSegments_, mallocSizeOf) + + SizeOfVectorExcludingThis(elemSegments_, mallocSizeOf) + bytecode_->sizeOfIncludingThisIfNotSeen(mallocSizeOf, seenBytes); + if (debugUnlinkedCode_) { *data += debugUnlinkedCode_->sizeOfExcludingThis(mallocSizeOf); } } - // Extracting machine code as JS object. The result has the "code" property, as // a Uint8Array, and the "segments" property as array objects. The objects // contain offsets in the "code" array and basic information about a code @@ -463,37 +478,6 @@ EvaluateInitExpr(HandleValVector globalImportValues, InitExpr initExpr) MOZ_CRASH("bad initializer expression"); } -void -wasm::ComputeWasmCallee(const Code& code, const Instance* instance, - Handle funcImports, - uint32_t funcIndexIndex, const Table& table, - const ElemSegment& seg, WasmCallee* out) -{ - const Tier tier = code.bestTier(); - const CodeRangeVector& codeRanges = code.metadata(tier).codeRanges; - uint8_t* codeBase = code.segment(tier).base(); - - uint32_t funcIndex = seg.elemFuncIndices[funcIndexIndex]; - if (funcIndex < funcImports.length() && IsExportedWasmFunction(funcImports[funcIndex])) { - MOZ_ASSERT(!code.metadata().isAsmJS()); - MOZ_ASSERT(!table.isTypedFunction()); - - HandleFunction f = funcImports[funcIndex]; - WasmInstanceObject* exportInstanceObj = ExportedFunctionToInstanceObject(f); - Instance& exportInstance = exportInstanceObj->instance(); - Tier exportTier = exportInstance.code().bestTier(); - const CodeRange& cr = exportInstanceObj->getExportedFunctionCodeRange(f, exportTier); - *out = WasmCallee(&exportInstance, exportInstance.codeBase(exportTier) + - cr.funcTableEntry()); - } else { - const CodeRange& cr = codeRanges[seg.elemCodeRangeIndices(tier)[funcIndexIndex]]; - uint32_t entryOffset = table.isTypedFunction() - ? cr.funcNormalEntry() - : cr.funcTableEntry(); - *out = WasmCallee(instance, codeBase + entryOffset); - } -} - bool Module::initSegments(JSContext* cx, HandleWasmInstanceObject instanceObj, @@ -504,26 +488,17 @@ Module::initSegments(JSContext* cx, Instance& instance = instanceObj->instance(); const SharedTableVector& tables = instance.tables(); - Tier tier = code().bestTier(); - // Perform all error checks up front so that this function does not perform // partial initialization if an error is reported. - for (const ElemSegment& seg : code_->elemSegments()) { - // If this is a passive segment, there's nothing we can check at - // this point. We'll have to perform the relevant checks later, if - // and when the segment is used, that is, as an argument to the - // table.init or table.drop instructions. - if (!seg.offsetIfActive) + for (const ElemSegment* seg : elemSegments_) { + if (!seg->active()) continue; - // Otherwise it's an active segment, so we check it now. - uint32_t numElems = seg.elemCodeRangeIndices(tier).length(); + uint32_t tableLength = tables[seg->tableIndex]->length(); + uint32_t offset = EvaluateInitExpr(globalImportValues, seg->offset()); - uint32_t tableLength = tables[seg.tableIndex]->length(); - uint32_t offset = EvaluateInitExpr(globalImportValues, *seg.offsetIfActive); - - if (offset > tableLength || tableLength - offset < numElems) { + if (offset > tableLength || tableLength - offset < seg->length()) { JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr, JSMSG_WASM_BAD_FIT, "elem", "table"); return false; @@ -532,61 +507,45 @@ Module::initSegments(JSContext* cx, if (memoryObj) { uint32_t memoryLength = memoryObj->volatileMemoryLength(); - for (const DataSegment& seg : code_->dataSegments()) { - // As with element segments just above, skip passive ones for now. - if (!seg.offsetIfActive) + for (const DataSegment* seg : dataSegments_) { + if (!seg->active()) continue; - uint32_t offset = EvaluateInitExpr(globalImportValues, *seg.offsetIfActive); + uint32_t offset = EvaluateInitExpr(globalImportValues, seg->offset()); - if (offset > memoryLength || memoryLength - offset < seg.length) { + if (offset > memoryLength || memoryLength - offset < seg->bytes.length()) { JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr, JSMSG_WASM_BAD_FIT, "data", "memory"); return false; } } } else { - MOZ_ASSERT(code_->dataSegments().empty()); + MOZ_ASSERT(dataSegments_.empty()); } // Now that initialization can't fail partway through, write data/elem // segments into memories/tables. - for (const ElemSegment& seg : code_->elemSegments()) { - // Skip passive segments. Those may get applied later, under - // program control, per comments above. - if (!seg.offsetIfActive) - continue; - - // But apply active segments right now. - Table& table = *tables[seg.tableIndex]; - uint32_t offset = EvaluateInitExpr(globalImportValues, *seg.offsetIfActive); - - MOZ_ASSERT(seg.elemCodeRangeIndices(tier).length() == - seg.elemFuncIndices.length()); - - for (uint32_t i = 0; i < seg.elemCodeRangeIndices(tier).length(); i++) { - WasmCallee callee; - ComputeWasmCallee(code(), &instance, funcImports, i, table, seg, &callee); - table.set(offset + i, callee.entry, callee.instance); + for (const ElemSegment* seg : elemSegments_) { + if (seg->active()) { + uint32_t offset = EvaluateInitExpr(globalImportValues, seg->offset()); + instance.initElems(*seg, offset, 0, seg->length()); } } if (memoryObj) { uint8_t* memoryBase = memoryObj->buffer().dataPointerEither().unwrap(/* memcpy */); - for (const DataSegment& seg : code_->dataSegments()) { - MOZ_ASSERT(seg.bytecodeOffset <= bytecode_->length()); - MOZ_ASSERT(seg.length <= bytecode_->length() - seg.bytecodeOffset); - // Skip passive segments. Those may get applied later, under - // program control, per comments above. - if (!seg.offsetIfActive) + for (const DataSegment* seg : dataSegments_) { + if (!seg->active()) continue; // But apply active segments right now. - uint32_t offset = EvaluateInitExpr(globalImportValues, *seg.offsetIfActive); - memcpy(memoryBase + offset, bytecode_->begin() + seg.bytecodeOffset, seg.length); + uint32_t offset = EvaluateInitExpr(globalImportValues, seg->offset()); + memcpy(memoryBase + offset, seg->bytes.begin(), seg->bytes.length()); } + } else { + MOZ_ASSERT(dataSegments_.empty()); } return true; @@ -698,7 +657,7 @@ Module::instantiateMemory(JSContext* cx, MutableHandleWasmMemoryObject memory) c { if (!metadata().usesMemory()) { MOZ_ASSERT(!memory); - MOZ_ASSERT(code_->dataSegments().empty()); + MOZ_ASSERT(dataSegments_.empty()); return true; } @@ -889,6 +848,50 @@ Module::instantiateGlobals(JSContext* cx, HandleValVector globalImportValues, return true; } +SharedCode +Module::getDebugEnabledCode() const +{ + MOZ_ASSERT(metadata().debugEnabled); + MOZ_ASSERT(debugUnlinkedCode_); + MOZ_ASSERT(debugLinkData_); + + // The first time through, use the pre-linked code in the module but + // mark it as having been claimed. Subsequently, instantiate the copy of the + // code bytes that we keep around for debugging instead, because the + // debugger may patch the pre-linked code at any time. + if (debugCodeClaimed_.compareExchange(false, true)) { + return code_; + } + + Tier tier = Tier::Baseline; + auto segment = ModuleSegment::create(tier, *debugUnlinkedCode_, *debugLinkData_); + if (!segment) { + return nullptr; + } + + UniqueMetadataTier metadataTier = js::MakeUnique(tier); + if (!metadataTier || !metadataTier->clone(metadata(tier))) { + return nullptr; + } + + auto codeTier = js::MakeUnique(std::move(metadataTier), std::move(segment)); + if (!codeTier) { + return nullptr; + } + + JumpTables jumpTables; + if (!jumpTables.init(CompileMode::Once, codeTier->segment(), metadata(tier).codeRanges)) { + return nullptr; + } + + MutableCode debugCode = js_new(std::move(codeTier), metadata(), std::move(jumpTables)); + if (!debugCode || !debugCode->initialize(*bytecode_, *debugLinkData_)) { + return nullptr; + } + + return debugCode; +} + static bool GetFunctionExport(JSContext* cx, HandleWasmInstanceObject instanceObj, @@ -1018,80 +1021,15 @@ Module::instantiate(JSContext* cx, return false; } + // Debugging mutates code (for traps, stepping, etc) and thus may need to + // clone the code on each instantiation. + SharedCode code(code_); - if (metadata().debugEnabled) { - MOZ_ASSERT(debugUnlinkedCode_); - MOZ_ASSERT(debugLinkData_); - - // The first time through, use the pre-linked code in the module but - // mark it as busy. Subsequently, instantiate the copy of the code - // bytes that we keep around for debugging instead, because the debugger - // may patch the pre-linked code at any time. - if (!debugCodeClaimed_.compareExchange(false, true)) { - Tier tier = Tier::Baseline; - auto segment = ModuleSegment::create(tier, *debugUnlinkedCode_, *debugLinkData_); - if (!segment) { - ReportOutOfMemory(cx); - return false; - } - - UniqueMetadataTier metadataTier = js::MakeUnique(tier); - if (!metadataTier || !metadataTier->clone(metadata(tier))) { - return false; - } - - auto codeTier = js::MakeUnique(std::move(metadataTier), std::move(segment)); - if (!codeTier) { - return false; - } - - JumpTables jumpTables; - if (!jumpTables.init(CompileMode::Once, codeTier->segment(), metadata(tier).codeRanges)) { - return false; - } - - DataSegmentVector dataSegments; - if (!dataSegments.appendAll(code_->dataSegments())) - return false; - - ElemSegmentVector elemSegments; - for (const ElemSegment& seg : code_->elemSegments()) { - // This (debugging) code path is called only for tier 1. - MOZ_ASSERT(seg.elemCodeRangeIndices2_.empty()); - - // ElemSegment doesn't have a (fallible) copy constructor, - // so we have to clone it "by hand". - ElemSegment clone; - clone.tableIndex = seg.tableIndex; - clone.offsetIfActive = seg.offsetIfActive; - - MOZ_ASSERT(clone.elemFuncIndices.empty()); - if (!clone.elemFuncIndices.appendAll(seg.elemFuncIndices)) - return false; - - MOZ_ASSERT(clone.elemCodeRangeIndices1_.empty()); - if (!clone.elemCodeRangeIndices1_.appendAll(seg.elemCodeRangeIndices1_)) - return false; - - MOZ_ASSERT(clone.elemCodeRangeIndices2_.empty()); - if (!clone.elemCodeRangeIndices2_.appendAll(seg.elemCodeRangeIndices2_)) - return false; - - if (!elemSegments.append(std::move(clone))) - return false; - } - - MutableCode debugCode = js_new(std::move(codeTier), metadata(), - std::move(jumpTables), - std::move(dataSegments), - std::move(elemSegments)); - if (!debugCode || !debugCode->initialize(*bytecode_, *debugLinkData_)) { - ReportOutOfMemory(cx); - return false; - } - - code = debugCode; + code = getDebugEnabledCode(); + if (!code) { + ReportOutOfMemory(cx); + return false; } } @@ -1122,6 +1060,8 @@ Module::instantiate(JSContext* cx, instance.set(WasmInstanceObject::create(cx, code, + dataSegments_, + elemSegments_, std::move(debug), std::move(tlsData), memory, @@ -1130,7 +1070,6 @@ Module::instantiate(JSContext* cx, metadata().globals, globalImportValues, globalObjs, - bytecode_.get(), instanceProto)); if (!instance) { return false; diff --git a/js/src/wasm/WasmModule.h b/js/src/wasm/WasmModule.h index fb864a2a5726..03f963101ff4 100644 --- a/js/src/wasm/WasmModule.h +++ b/js/src/wasm/WasmModule.h @@ -52,6 +52,8 @@ class Module : public JS::WasmModule const ImportVector imports_; const ExportVector exports_; const StructTypeVector structTypes_; + const DataSegmentVector dataSegments_; + const ElemSegmentVector elemSegments_; const SharedBytes bytecode_; // These fields are only meaningful when code_->metadata().debugEnabled. @@ -83,6 +85,7 @@ class Module : public JS::WasmModule Handle funcImports, HandleWasmMemoryObject memory, HandleValVector globalImportValues) const; + SharedCode getDebugEnabledCode() const; class Tier2GeneratorTaskImpl; @@ -91,6 +94,8 @@ class Module : public JS::WasmModule ImportVector&& imports, ExportVector&& exports, StructTypeVector&& structTypes, + DataSegmentVector&& dataSegments, + ElemSegmentVector&& elemSegments, const ShareableBytes& bytecode, UniqueConstBytes debugUnlinkedCode = nullptr, UniqueLinkData debugLinkData = nullptr) @@ -98,6 +103,8 @@ class Module : public JS::WasmModule imports_(std::move(imports)), exports_(std::move(exports)), structTypes_(std::move(structTypes)), + dataSegments_(std::move(dataSegments)), + elemSegments_(std::move(elemSegments)), bytecode_(&bytecode), debugCodeClaimed_(false), debugUnlinkedCode_(std::move(debugUnlinkedCode)), @@ -134,7 +141,7 @@ class Module : public JS::WasmModule // be installed and made visible. void startTier2(const CompileArgs& args); - bool finishTier2(const LinkData& linkData, UniqueCodeTier tier2, ModuleEnvironment&& env2); + bool finishTier2(const LinkData& linkData2, UniqueCodeTier code2); void testingBlockOnTier2Complete() const; bool testingTier2Active() const { return testingTier2Active_; } @@ -166,15 +173,6 @@ class Module : public JS::WasmModule typedef RefPtr SharedModule; -// Compute the (entry point, instance pointer) pair for an entry in the -// function-indices vector of an element segment. |instance| must be the -// Instance* that will eventually own the resulting WasmCallee. -void -ComputeWasmCallee(const Code& code, const Instance* instance, - Handle funcImports, - uint32_t funcIndexIndex, const Table& table, - const ElemSegment& seg, WasmCallee* out); - // JS API implementations: SharedModule diff --git a/js/src/wasm/WasmSerialize.h b/js/src/wasm/WasmSerialize.h index b6846351f308..884662971ac4 100644 --- a/js/src/wasm/WasmSerialize.h +++ b/js/src/wasm/WasmSerialize.h @@ -19,6 +19,8 @@ #ifndef wasm_serialize_h #define wasm_serialize_h +#include + #include "js/Vector.h" namespace js { @@ -181,6 +183,36 @@ DeserializePodVectorChecked(const uint8_t* cursor, size_t* remain, mozilla::Vect return cursor; } +template +inline size_t +SerializableRefPtr::serializedSize() const +{ + return (*this)->serializedSize(); +} + +template +inline uint8_t* +SerializableRefPtr::serialize(uint8_t* cursor) const +{ + return (*this)->serialize(cursor); +} + +template +inline const uint8_t* +SerializableRefPtr::deserialize(const uint8_t* cursor) +{ + auto* t = js_new>(); + *this = t; + return t->deserialize(cursor); +} + +template +inline size_t +SerializableRefPtr::sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const +{ + return (*this)->sizeOfExcludingThis(mallocSizeOf); +} + } // namespace wasm } // namespace js diff --git a/js/src/wasm/WasmStubs.cpp b/js/src/wasm/WasmStubs.cpp index 321ac6c5aede..ec67ced54e88 100644 --- a/js/src/wasm/WasmStubs.cpp +++ b/js/src/wasm/WasmStubs.cpp @@ -975,9 +975,10 @@ wasm::GenerateDirectCallFromJit(MacroAssembler& masm, #endif // Actual call. - const wasm::CodeTier& codeTier = inst.code().codeTier(inst.code().bestTier()); - uint32_t offset = codeTier.metadata().codeRanges[fe.funcCodeRangeIndex()].funcNormalEntry(); - void* callee = codeTier.segment().base() + offset; + const CodeTier& codeTier = inst.code().codeTier(inst.code().bestTier()); + const MetadataTier& metadata = codeTier.metadata(); + const CodeRange& codeRange = metadata.codeRange(fe); + void* callee = codeTier.segment().base() + codeRange.funcNormalEntry(); masm.assertStackAlignment(WasmStackAlignment); masm.callJit(ImmPtr(callee)); @@ -1412,7 +1413,7 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa Register scratch = ABINonArgReturnReg1; // repeatedly clobbered // 2.1. Get JSFunction callee - masm.loadWasmGlobalPtr(fi.tlsDataOffset() + offsetof(FuncImportTls, obj), callee); + masm.loadWasmGlobalPtr(fi.tlsDataOffset() + offsetof(FuncImportTls, fun), callee); // 2.2. Save callee masm.storePtr(callee, Address(masm.getStackPointer(), argOffset)); diff --git a/js/src/wasm/WasmTypes.cpp b/js/src/wasm/WasmTypes.cpp index d2362146e2d7..50c512eb3bc6 100644 --- a/js/src/wasm/WasmTypes.cpp +++ b/js/src/wasm/WasmTypes.cpp @@ -461,8 +461,7 @@ ElemSegment::serializedSize() const { return sizeof(tableIndex) + sizeof(offsetIfActive) + - SerializedPodVectorSize(elemFuncIndices) + - SerializedPodVectorSize(elemCodeRangeIndices(Tier::Serialized)); + SerializedPodVectorSize(elemFuncIndices); } uint8_t* @@ -471,7 +470,6 @@ ElemSegment::serialize(uint8_t* cursor) const cursor = WriteBytes(cursor, &tableIndex, sizeof(tableIndex)); cursor = WriteBytes(cursor, &offsetIfActive, sizeof(offsetIfActive)); cursor = SerializePodVector(cursor, elemFuncIndices); - cursor = SerializePodVector(cursor, elemCodeRangeIndices(Tier::Serialized)); return cursor; } @@ -480,16 +478,43 @@ ElemSegment::deserialize(const uint8_t* cursor) { (cursor = ReadBytes(cursor, &tableIndex, sizeof(tableIndex))) && (cursor = ReadBytes(cursor, &offsetIfActive, sizeof(offsetIfActive))) && - (cursor = DeserializePodVector(cursor, &elemFuncIndices)) && - (cursor = DeserializePodVector(cursor, &elemCodeRangeIndices(Tier::Serialized))); + (cursor = DeserializePodVector(cursor, &elemFuncIndices)); return cursor; } size_t ElemSegment::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const { - return elemFuncIndices.sizeOfExcludingThis(mallocSizeOf) + - elemCodeRangeIndices(Tier::Serialized).sizeOfExcludingThis(mallocSizeOf); + return elemFuncIndices.sizeOfExcludingThis(mallocSizeOf); +} + +size_t +DataSegment::serializedSize() const +{ + return sizeof(offsetIfActive) + + SerializedPodVectorSize(bytes); +} + +uint8_t* +DataSegment::serialize(uint8_t* cursor) const +{ + cursor = WriteBytes(cursor, &offsetIfActive, sizeof(offsetIfActive)); + cursor = SerializePodVector(cursor, bytes); + return cursor; +} + +const uint8_t* +DataSegment::deserialize(const uint8_t* cursor) +{ + (cursor = ReadBytes(cursor, &offsetIfActive, sizeof(offsetIfActive))) && + (cursor = DeserializePodVector(cursor, &bytes)); + return cursor; +} + +size_t +DataSegment::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const +{ + return bytes.sizeOfExcludingThis(mallocSizeOf); } // Heap length on ARM should fit in an ARM immediate. We approximate the set diff --git a/js/src/wasm/WasmTypes.h b/js/src/wasm/WasmTypes.h index 06ae09e12aec..07419176e4d1 100644 --- a/js/src/wasm/WasmTypes.h +++ b/js/src/wasm/WasmTypes.h @@ -138,6 +138,21 @@ typedef Vector VectorName; const uint8_t* deserialize(const uint8_t* cursor) override; \ size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const override; +template +struct SerializableRefPtr : RefPtr +{ + using RefPtr::operator=; + + SerializableRefPtr() = default; + + template + MOZ_IMPLICIT SerializableRefPtr(U&& u) + : RefPtr(std::forward(u)) + {} + + WASM_DECLARE_SERIALIZABLE(SerializableRefPtr) +}; + // This reusable base class factors out the logic for a resource that is shared // by multiple instances/modules but should only be counted once when computing // about:memory stats. @@ -860,6 +875,7 @@ class InitExpr }; private: + // Note: all this private data is currently (de)serialized via memcpy(). Kind kind_; union U { LitVal val_; @@ -1088,122 +1104,80 @@ class GlobalDesc typedef Vector GlobalDescVector; -// ElemSegment represents an element segment in the module where each element -// describes both its function index and its code range. -// -// The codeRangeIndices are laid out in a nondeterminstic order as a result of -// parallel compilation. -// -// NB: if you add members to this, or change the type of existing ones, -// remember to update the ElemSegment copying code in Module::instantiate -// accordingly. +// When a ElemSegment is "passive" it is shared between a wasm::Module and its +// wasm::Instances. To allow each segment to be released as soon as the last +// Instance table.drops it and the Module is destroyed, each ElemSegment is +// individually atomically ref-counted. -struct ElemSegment +struct ElemSegment : AtomicRefCounted { uint32_t tableIndex; Maybe offsetIfActive; Uint32Vector elemFuncIndices; - Uint32Vector elemCodeRangeIndices1_; - mutable Uint32Vector elemCodeRangeIndices2_; - ElemSegment() = default; - ElemSegment(uint32_t tableIndex, Maybe&& offsetIfActive, - Uint32Vector&& elemFuncIndices) - : tableIndex(tableIndex), - offsetIfActive(std::move(offsetIfActive)), - elemFuncIndices(std::move(elemFuncIndices)) - {} - - Uint32Vector& elemCodeRangeIndices(Tier t) { - switch (t) { - case Tier::Baseline: - return elemCodeRangeIndices1_; - case Tier::Ion: - return elemCodeRangeIndices2_; - default: - MOZ_CRASH("No such tier"); - } + bool active() const { + return !!offsetIfActive; } - const Uint32Vector& elemCodeRangeIndices(Tier t) const { - switch (t) { - case Tier::Baseline: - return elemCodeRangeIndices1_; - case Tier::Ion: - return elemCodeRangeIndices2_; - default: - MOZ_CRASH("No such tier"); - } + InitExpr offset() const { + return *offsetIfActive; } - void setTier2(Uint32Vector&& elemCodeRangeIndices) const { - MOZ_ASSERT(elemCodeRangeIndices2_.length() == 0); - elemCodeRangeIndices2_ = std::move(elemCodeRangeIndices); + size_t length() const { + return elemFuncIndices.length(); } WASM_DECLARE_SERIALIZABLE(ElemSegment) }; -// The ElemSegmentVector is laid out in a deterministic order. +typedef RefPtr MutableElemSegment; +typedef SerializableRefPtr SharedElemSegment; +typedef Vector ElemSegmentVector; -typedef Vector ElemSegmentVector; +// DataSegmentEnv holds the initial results of decoding a data segment from the +// bytecode and is stored in the ModuleEnvironment during compilation. When +// compilation completes, (non-Env) DataSegments are created and stored in +// the wasm::Module which contain copies of the data segment payload. This +// allows non-compilation uses of wasm validation to avoid expensive copies. +// +// When a DataSegment is "passive" it is shared between a wasm::Module and its +// wasm::Instances. To allow each segment to be released as soon as the last +// Instance mem.drops it and the Module is destroyed, each DataSegment is +// individually atomically ref-counted. -// DataSegment describes the offset of a data segment in the bytecode that is -// to be copied at a given offset into linear memory upon instantiation. - -struct DataSegment +struct DataSegmentEnv { Maybe offsetIfActive; uint32_t bytecodeOffset; uint32_t length; }; -typedef Vector DataSegmentVector; +typedef Vector DataSegmentEnvVector; -// A pairing of entry point and instance pointer, used for lazy table -// initialisation. - -struct WasmCallee +struct DataSegment : AtomicRefCounted { - WasmCallee() : instance(nullptr), entry(nullptr) {} - WasmCallee(const Instance* instance, void* entry) - : instance(instance), - entry(entry) + Maybe offsetIfActive; + Bytes bytes; + + DataSegment() = default; + explicit DataSegment(const DataSegmentEnv& src) + : offsetIfActive(src.offsetIfActive) {} - // The instance associated with the code address. - const Instance* instance; - // The table entry code address. - void* entry; + + bool active() const { + return !!offsetIfActive; + } + + InitExpr offset() const { + return *offsetIfActive; + } + + WASM_DECLARE_SERIALIZABLE(DataSegment) }; -// Support for passive data and element segments -- lazy initialisation. -// -// At instantiation time, we prepare the required initialising data for each -// passive segment, copying it into new memory. This is done separately for -// data segments and elem segments. We also create a vector of pointers to -// this copied data, with nullptr for entries corresponding to active -// segments. This vector has the same length as the vector of data/elem -// segments respectively in the originating module. -// -// The vector of pointers and the prepared data are owned by the instance -// that is constructed. We have to do this so that the initialising data is -// available at run time in the instance, in particular to -// Instance::{mem,table}{Init,Drop}. -// -// The final structures have type DataSegmentInitVector and -// ElemSegmentInitVector respectively. - -typedef Vector DataSegmentInit; -typedef Vector ElemSegmentInit; - -// We store (unique) pointers rather than references to the initialising -// vectors in order that they can be incrementally freed as we execute -// {memory,table}.drop instructions. - -typedef Vector, 0, SystemAllocPolicy> - DataSegmentInitVector; -typedef Vector, 0, SystemAllocPolicy> - ElemSegmentInitVector; +typedef RefPtr MutableDataSegment; +typedef SerializableRefPtr SharedDataSegment; +typedef Vector DataSegmentVector; // FuncTypeIdDesc describes a function type that can be used by call_indirect // and table-entry prologues to structurally compare whether the caller and @@ -2033,11 +2007,10 @@ struct FuncImportTls // for bidirectional registration purposes. jit::BaselineScript* baselineScript; - // A GC pointer which keeps the callee alive. For imported wasm functions, - // this points to the wasm function's WasmInstanceObject. For all other - // imported functions, 'obj' points to the JSFunction. - GCPtrObject obj; - static_assert(sizeof(GCPtrObject) == sizeof(void*), "for JIT access"); + // A GC pointer which keeps the callee alive and is used to recover import + // values for lazy table initialization. + GCPtrFunction fun; + static_assert(sizeof(GCPtrFunction) == sizeof(void*), "for JIT access"); }; // TableTls describes the region of wasm global memory allocated in the diff --git a/js/src/wasm/WasmValidate.cpp b/js/src/wasm/WasmValidate.cpp index fb873519258e..5ed0a8394239 100644 --- a/js/src/wasm/WasmValidate.cpp +++ b/js/src/wasm/WasmValidate.cpp @@ -2202,6 +2202,10 @@ DecodeElemSection(Decoder& d, ModuleEnvironment* env) return d.fail("too many elem segments"); } + if (!env->elemSegments.reserve(numSegments)) { + return false; + } + for (uint32_t i = 0; i < numSegments; i++) { uint32_t initializerKind; if (!d.readVarU32(&initializerKind)) { @@ -2219,7 +2223,13 @@ DecodeElemSection(Decoder& d, ModuleEnvironment* env) return d.fail("elem segment requires a table section"); } - Maybe offsetIfActive; + MutableElemSegment seg = js_new(); + if (!seg) { + return false; + } + + seg->tableIndex = 0; + if (initializerKind == uint32_t(InitializerKind::Active)) { InitExpr offset; if (!DecodeInitializerExpression(d, env->gcTypesEnabled(), env->globals, ValType::I32, @@ -2227,7 +2237,7 @@ DecodeElemSection(Decoder& d, ModuleEnvironment* env) { return false; } - offsetIfActive.emplace(offset); + seg->offsetIfActive.emplace(offset); } uint32_t numElems; @@ -2239,17 +2249,16 @@ DecodeElemSection(Decoder& d, ModuleEnvironment* env) return d.fail("too many table elements"); } - Uint32Vector elemFuncIndices; - if (!elemFuncIndices.resize(numElems)) { + if (!seg->elemFuncIndices.reserve(numElems)) { return false; } for (uint32_t i = 0; i < numElems; i++) { - if (!d.readVarU32(&elemFuncIndices[i])) { + uint32_t funcIndex; + if (!d.readVarU32(&funcIndex)) { return d.fail("failed to read element function index"); } - uint32_t funcIndex = elemFuncIndices[i]; if (funcIndex >= env->numFuncs()) { return d.fail("table element out of range"); } @@ -2263,17 +2272,16 @@ DecodeElemSection(Decoder& d, ModuleEnvironment* env) #ifdef WASM_PRIVATE_REFTYPES if (env->tables[0].importedOrExported && - !FuncTypeIsJSCompatible(d, *env->funcTypes[elemFuncIndices[i]])) + !FuncTypeIsJSCompatible(d, *env->funcTypes[funcIndex])) { return false; } #endif + + seg->elemFuncIndices.infallibleAppend(funcIndex); } - if (!env->elemSegments.emplaceBack(0, std::move(offsetIfActive), - std::move(elemFuncIndices))) { - return false; - } + env->elemSegments.infallibleAppend(std::move(seg)); } return d.finishSection(*range, "elem"); @@ -2463,7 +2471,7 @@ DecodeDataSection(Decoder& d, ModuleEnvironment* env) return d.fail("data segment requires a memory section"); } - DataSegment seg; + DataSegmentEnv seg; if (initializerKind == uint32_t(InitializerKind::Active)) { InitExpr segOffset; if (!DecodeInitializerExpression(d, env->gcTypesEnabled(), env->globals, ValType::I32, diff --git a/js/src/wasm/WasmValidate.h b/js/src/wasm/WasmValidate.h index 58b0fc61027f..e36e37487718 100644 --- a/js/src/wasm/WasmValidate.h +++ b/js/src/wasm/WasmValidate.h @@ -178,7 +178,7 @@ struct ModuleEnvironment MaybeSectionRange codeSection; // Fields decoded as part of the wasm module tail: - DataSegmentVector dataSegments; + DataSegmentEnvVector dataSegments; Maybe moduleName; NameInBytecodeVector funcNames; CustomSectionVector customSections; diff --git a/js/xpconnect/idl/xpccomponents.idl b/js/xpconnect/idl/xpccomponents.idl index c9cdf0756940..29a82b9efe3f 100644 --- a/js/xpconnect/idl/xpccomponents.idl +++ b/js/xpconnect/idl/xpccomponents.idl @@ -727,6 +727,9 @@ interface nsIXPCComponents_Utils : nsISupports /* Create a commandline object. */ nsISupports createCommandLine(); + /* Create a command params object. */ + nsICommandParams createCommandParams(); + /* Create a loadcontext object. */ nsILoadContext createLoadContext(); diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp index 789437de14e4..2037ffba95ad 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp @@ -44,6 +44,7 @@ #include "GeckoProfiler.h" #include "mozilla/EditorSpellCheck.h" #include "nsCommandLine.h" +#include "nsCommandParams.h" #include "nsPersistentProperties.h" using namespace mozilla; @@ -3233,6 +3234,15 @@ nsXPCComponents_Utils::CreateCommandLine(nsISupports** aCommandLine) return NS_OK; } +NS_IMETHODIMP +nsXPCComponents_Utils::CreateCommandParams(nsICommandParams** aCommandParams) +{ + NS_ENSURE_ARG_POINTER(aCommandParams); + nsCOMPtr commandParams = new nsCommandParams(); + commandParams.forget(aCommandParams); + return NS_OK; +} + NS_IMETHODIMP nsXPCComponents_Utils::CreateLoadContext(nsILoadContext** aLoadContext) { diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index 416b9bc39a54..30ef48dbba95 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -381,8 +381,7 @@ Load(JSContext* cx, unsigned argc, Value* vp) return false; } JS::CompileOptions options(cx); - options.setUTF8(true) - .setFileAndLine(filename.get(), 1) + options.setFileAndLine(filename.get(), 1) .setIsRunOnce(true); JS::Rooted script(cx); JS::Rooted global(cx, JS::CurrentGlobalOrNull(cx)); @@ -735,8 +734,7 @@ ProcessUtf8Line(AutoJSAPI& jsapi, const char* buffer, int startline) JSContext* cx = jsapi.cx(); JS::CompileOptions options(cx); options.setFileAndLine("typein", startline) - .setIsRunOnce(true) - .setUTF8(true); + .setIsRunOnce(true); JS::RootedScript script(cx); if (!JS::CompileUtf8(cx, options, buffer, strlen(buffer), &script)) { @@ -800,8 +798,7 @@ ProcessFile(AutoJSAPI& jsapi, const char* filename, FILE* file, bool forceTTY) JS::RootedScript script(cx); JS::RootedValue unused(cx); JS::CompileOptions options(cx); - options.setUTF8(true) - .setFileAndLine(filename, 1) + options.setFileAndLine(filename, 1) .setIsRunOnce(true) .setNoScriptRval(true); if (!JS::CompileUtf8File(cx, options, file, &script)) { @@ -1032,9 +1029,9 @@ ProcessArgs(AutoJSAPI& jsapi, char** argv, int argc, XPCShellDirProvider* aDirPr } JS::CompileOptions opts(cx); - opts.setUTF8(true) - .setFileAndLine("-e", 1); - JS::Evaluate(cx, opts, argv[i], strlen(argv[i]), &rval); + opts.setFileAndLine("-e", 1); + + JS::EvaluateUtf8(cx, opts, argv[i], strlen(argv[i]), &rval); isInteractive = false; break; diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp index b8b6fc60289d..30a736cc2943 100644 --- a/layout/base/AccessibleCaretManager.cpp +++ b/layout/base/AccessibleCaretManager.cpp @@ -27,9 +27,6 @@ #include "nsFrameSelection.h" #include "nsGenericHTMLElement.h" #include "nsIHapticFeedback.h" -#ifdef MOZ_WIDGET_ANDROID -#include "nsWindow.h" -#endif namespace mozilla { @@ -894,17 +891,6 @@ AccessibleCaretManager::SetSelectionDragState(bool aState) const if (fs) { fs->SetDragState(aState); } - - // Pin Fennecs DynamicToolbarAnimator in place before/after dragging, - // to avoid co-incident screen scrolling. -#ifdef MOZ_WIDGET_ANDROID - if (XRE_IsParentProcess()) { - nsIDocument* doc = mPresShell->GetDocument(); - MOZ_ASSERT(doc); - nsIWidget* widget = nsContentUtils::WidgetForDocument(doc); - static_cast(widget)->SetSelectionDragState(aState); - } -#endif } bool diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 7330fbf7cefe..84801c2c7a37 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -1634,7 +1634,7 @@ nsITheme* nsPresContext::GetTheme() { if (!sNoTheme && !mTheme) { - mTheme = NS_NewNativeTheme(); + mTheme = do_GetService("@mozilla.org/chrome/chrome-native-theme;1"); if (!mTheme) sNoTheme = true; } diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index b0ed9ebb10dc..5b38947343c8 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -30,24 +30,19 @@ #include "nsCharsetSource.h" #include "nsMimeTypes.h" #include "DecoderTraits.h" +#ifdef MOZ_XUL +#include "XULDocument.h" +#endif // plugins #include "nsIPluginHost.h" #include "nsPluginHost.h" -static NS_DEFINE_CID(kPluginDocumentCID, NS_PLUGINDOCUMENT_CID); // Factory code for creating variations on html documents #undef NOISY_REGISTRY -static NS_DEFINE_IID(kHTMLDocumentCID, NS_HTMLDOCUMENT_CID); -static NS_DEFINE_IID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); -static NS_DEFINE_IID(kSVGDocumentCID, NS_SVGDOCUMENT_CID); -static NS_DEFINE_IID(kVideoDocumentCID, NS_VIDEODOCUMENT_CID); -static NS_DEFINE_IID(kImageDocumentCID, NS_IMAGEDOCUMENT_CID); -static NS_DEFINE_IID(kXULDocumentCID, NS_XULDOCUMENT_CID); - already_AddRefed NS_NewContentViewer(); static const char* const gHTMLTypes[] = { @@ -185,7 +180,12 @@ nsContentDLF::CreateInstance(const char* aCommand, nsContentUtils::IsPlainTextType(contentType)) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kHTMLDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewHTMLDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -193,7 +193,12 @@ nsContentDLF::CreateInstance(const char* aCommand, if (IsTypeInList(contentType, gXMLTypes)) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kXMLDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewXMLDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -201,7 +206,12 @@ nsContentDLF::CreateInstance(const char* aCommand, if (IsTypeInList(contentType, gSVGTypes)) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kSVGDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewSVGDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -219,7 +229,12 @@ nsContentDLF::CreateInstance(const char* aCommand, /* DecoderDoctorDiagnostics* */ nullptr)) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kVideoDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewVideoDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -227,7 +242,12 @@ nsContentDLF::CreateInstance(const char* aCommand, if (IsImageContentType(contentType.get())) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kImageDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewImageDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -238,7 +258,12 @@ nsContentDLF::CreateInstance(const char* aCommand, nsPluginHost::eExcludeNone)) { return CreateDocument(aCommand, aChannel, aLoadGroup, - aContainer, kPluginDocumentCID, + aContainer, [] () -> already_AddRefed { + nsCOMPtr doc; + nsresult rv = NS_NewPluginDocument(getter_AddRefs(doc)); + NS_ENSURE_SUCCESS(rv, nullptr); + return doc.forget(); + }, aDocListener, aDocViewer); } @@ -269,7 +294,8 @@ nsContentDLF::CreateBlankDocument(nsILoadGroup* aLoadGroup, nsDocShell* aContainer) { // create a new blank HTML document - nsCOMPtr blankDoc(do_CreateInstance(kHTMLDocumentCID)); + nsCOMPtr blankDoc; + mozilla::Unused << NS_NewHTMLDocument(getter_AddRefs(blankDoc)); if (!blankDoc) { return nullptr; @@ -324,16 +350,18 @@ nsContentDLF::CreateBlankDocument(nsILoadGroup* aLoadGroup, return blankDoc.forget(); } - nsresult nsContentDLF::CreateDocument(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, nsIDocShell* aContainer, - const nsCID& aDocumentCID, + nsContentDLF::DocumentCreator + aDocumentCreator, nsIStreamListener** aDocListener, nsIContentViewer** aContentViewer) { + MOZ_ASSERT(aDocumentCreator); + nsresult rv = NS_ERROR_FAILURE; nsCOMPtr aURL; @@ -350,8 +378,8 @@ nsContentDLF::CreateDocument(const char* aCommand, #endif // Create the document - nsCOMPtr doc = do_CreateInstance(aDocumentCID, &rv); - NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr doc = aDocumentCreator(); + NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE); // Create the content viewer XXX: could reuse content viewer here! nsCOMPtr contentViewer = NS_NewContentViewer(); @@ -379,8 +407,8 @@ nsContentDLF::CreateXULDocument(const char* aCommand, nsIStreamListener** aDocListener, nsIContentViewer** aContentViewer) { - nsresult rv; - nsCOMPtr doc = do_CreateInstance(kXULDocumentCID, &rv); + nsCOMPtr doc; + nsresult rv = NS_NewXULDocument(getter_AddRefs(doc)); if (NS_FAILED(rv)) return rv; nsCOMPtr contentViewer = NS_NewContentViewer(); diff --git a/layout/build/nsContentDLF.h b/layout/build/nsContentDLF.h index 20a567e66c0b..3edc12fc2b3b 100644 --- a/layout/build/nsContentDLF.h +++ b/layout/build/nsContentDLF.h @@ -32,11 +32,12 @@ public: nsresult InitUAStyleSheet(); + typedef already_AddRefed (*DocumentCreator)(); nsresult CreateDocument(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, nsIDocShell* aContainer, - const nsCID& aDocumentCID, + DocumentCreator aDocumentCreator, nsIStreamListener** aDocListener, nsIContentViewer** aContentViewer); diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h index f0ee006aca2c..bae5af73d9bf 100644 --- a/layout/build/nsLayoutCID.h +++ b/layout/build/nsLayoutCID.h @@ -23,10 +23,6 @@ #define NS_SDBCONNECTION_CID \ { 0xae2793c0, 0x2ba3, 0x4adb, { 0x9c, 0x5e, 0xc2, 0x35, 0x25, 0x81, 0x2c, 0x64 } } -// {A746DECD-AE74-4d86-8E75-4FDA81A9BE90} -#define NS_DOMSESSIONSTORAGEMANAGER_CID \ -{ 0xa746decd, 0xae74, 0x4d86, { 0x8e, 0x75, 0x4f, 0xda, 0x81, 0xa9, 0xbe, 0x90 } } - // {656DB07C-AA80-49e4-BCE8-E431BAAE697D} #define NS_DOMLOCALSTORAGEMANAGER_CID \ { 0x656db07c, 0xaa80, 0x49e4, { 0xbc, 0xe8, 0xe4, 0x31, 0xba, 0xae, 0x69, 0x7d } } diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index e552e4bf3792..a92166a77435 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -24,7 +24,6 @@ #include "nsIContentViewer.h" #include "nsIController.h" #include "nsIControllers.h" -#include "nsIDocument.h" #include "nsIDocumentEncoder.h" #include "nsIFactory.h" #include "nsIIdleService.h" @@ -69,7 +68,6 @@ #include "mozilla/dom/network/UDPSocketChild.h" #include "mozilla/dom/quota/QuotaManagerService.h" #include "mozilla/dom/ServiceWorkerManager.h" -#include "mozilla/dom/SessionStorageManager.h" #include "mozilla/dom/StorageActivityService.h" #include "mozilla/dom/WorkerDebuggerManager.h" #include "mozilla/dom/Notification.h" @@ -114,10 +112,6 @@ class nsIDocumentLoaderFactory; #include "inDeepTreeWalker.h" -#ifdef MOZ_XUL -#include "XULDocument.h" -#endif - static void Shutdown(); #include "nsGeolocation.h" @@ -175,7 +169,6 @@ already_AddRefed NS_CreatePresentationService(); typedef mozilla::dom::BlobURL::Mutator BlobURLMutator; NS_GENERIC_FACTORY_CONSTRUCTOR(BlobURLMutator) NS_GENERIC_FACTORY_CONSTRUCTOR(LocalStorageManager) -NS_GENERIC_FACTORY_CONSTRUCTOR(SessionStorageManager) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(DOMRequestService, DOMRequestService::FactoryCreate) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(QuotaManagerService, @@ -326,10 +319,6 @@ MAKE_CTOR(CreateNewFrameTraversal, nsIFrameTraversal, NS_CreateFrameTr NS_GENERIC_FACTORY_CONSTRUCTOR(inDeepTreeWalker) MAKE_CTOR2(CreateContentViewer, nsIContentViewer, NS_NewContentViewer) -MAKE_CTOR(CreateHTMLDocument, nsIDocument, NS_NewHTMLDocument) -MAKE_CTOR(CreateXMLDocument, nsIDocument, NS_NewXMLDocument) -MAKE_CTOR(CreateSVGDocument, nsIDocument, NS_NewSVGDocument) -MAKE_CTOR(CreateImageDocument, nsIDocument, NS_NewImageDocument) MAKE_CTOR(CreateTextEncoder, nsIDocumentEncoder, NS_NewTextEncoder) MAKE_CTOR(CreateHTMLCopyTextEncoder, nsIDocumentEncoder, NS_NewHTMLCopyTextEncoder) MAKE_CTOR(CreateXMLContentSerializer, nsIContentSerializer, NS_NewXMLContentSerializer) @@ -337,9 +326,6 @@ MAKE_CTOR(CreateHTMLContentSerializer, nsIContentSerializer, NS_NewHTM MAKE_CTOR(CreateXHTMLContentSerializer, nsIContentSerializer, NS_NewXHTMLContentSerializer) MAKE_CTOR(CreatePlainTextSerializer, nsIContentSerializer, NS_NewPlainTextSerializer) MAKE_CTOR(CreateContentPolicy, nsIContentPolicy, NS_NewContentPolicy) -#ifdef MOZ_XUL -MAKE_CTOR(CreateXULDocument, nsIDocument, NS_NewXULDocument) -#endif MAKE_CTOR(CreateContentDLF, nsIDocumentLoaderFactory, NS_NewContentDocumentLoaderFactory) MAKE_CTOR(CreateEventListenerService, nsIEventListenerService, NS_NewEventListenerService) MAKE_CTOR(CreateGlobalMessageManager, nsISupports, NS_NewGlobalMessageManager) @@ -347,8 +333,6 @@ MAKE_CTOR(CreateParentMessageManager, nsISupports, NS_NewPar MAKE_CTOR(CreateChildMessageManager, nsISupports, NS_NewChildProcessMessageManager) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDataDocumentContentPolicy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNoDataProtocolContentPolicy) -MAKE_CTOR(CreatePluginDocument, nsIDocument, NS_NewPluginDocument) -MAKE_CTOR(CreateVideoDocument, nsIDocument, NS_NewVideoDocument) MAKE_CTOR(CreateFocusManager, nsIFocusManager, NS_NewFocusManager) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStyleSheetService, Init) @@ -445,10 +429,6 @@ NS_DEFINE_NAMED_CID(NS_LAYOUT_DEBUGGER_CID); NS_DEFINE_NAMED_CID(NS_FRAMETRAVERSAL_CID); NS_DEFINE_NAMED_CID(IN_DEEPTREEWALKER_CID); NS_DEFINE_NAMED_CID(NS_CONTENT_VIEWER_CID); -NS_DEFINE_NAMED_CID(NS_HTMLDOCUMENT_CID); -NS_DEFINE_NAMED_CID(NS_XMLDOCUMENT_CID); -NS_DEFINE_NAMED_CID(NS_SVGDOCUMENT_CID); -NS_DEFINE_NAMED_CID(NS_IMAGEDOCUMENT_CID); NS_DEFINE_NAMED_CID(NS_TEXT_ENCODER_CID); NS_DEFINE_NAMED_CID(NS_HTMLCOPY_TEXT_ENCODER_CID); NS_DEFINE_NAMED_CID(NS_XMLCONTENTSERIALIZER_CID); @@ -460,21 +440,15 @@ NS_DEFINE_NAMED_CID(NS_SCRIPTABLEUNESCAPEHTML_CID); NS_DEFINE_NAMED_CID(NS_CONTENTPOLICY_CID); NS_DEFINE_NAMED_CID(NS_DATADOCUMENTCONTENTPOLICY_CID); NS_DEFINE_NAMED_CID(NS_NODATAPROTOCOLCONTENTPOLICY_CID); -#ifdef MOZ_XUL -NS_DEFINE_NAMED_CID(NS_XULDOCUMENT_CID); -#endif NS_DEFINE_NAMED_CID(NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID); NS_DEFINE_NAMED_CID(NS_JSPROTOCOLHANDLER_CID); NS_DEFINE_NAMED_CID(NS_JSURI_CID); NS_DEFINE_NAMED_CID(NS_JSURIMUTATOR_CID); NS_DEFINE_NAMED_CID(NS_PLUGINDOCLOADERFACTORY_CID); -NS_DEFINE_NAMED_CID(NS_PLUGINDOCUMENT_CID); -NS_DEFINE_NAMED_CID(NS_VIDEODOCUMENT_CID); NS_DEFINE_NAMED_CID(NS_STYLESHEETSERVICE_CID); NS_DEFINE_NAMED_CID(NS_HOSTOBJECTURI_CID); NS_DEFINE_NAMED_CID(NS_HOSTOBJECTURIMUTATOR_CID); NS_DEFINE_NAMED_CID(NS_SDBCONNECTION_CID); -NS_DEFINE_NAMED_CID(NS_DOMSESSIONSTORAGEMANAGER_CID); NS_DEFINE_NAMED_CID(NS_DOMLOCALSTORAGEMANAGER_CID); NS_DEFINE_NAMED_CID(DOMREQUEST_SERVICE_CID); NS_DEFINE_NAMED_CID(QUOTAMANAGER_SERVICE_CID); @@ -538,10 +512,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { { &kNS_FRAMETRAVERSAL_CID, false, nullptr, CreateNewFrameTraversal }, { &kIN_DEEPTREEWALKER_CID, false, nullptr, inDeepTreeWalkerConstructor }, { &kNS_CONTENT_VIEWER_CID, false, nullptr, CreateContentViewer }, - { &kNS_HTMLDOCUMENT_CID, false, nullptr, CreateHTMLDocument }, - { &kNS_XMLDOCUMENT_CID, false, nullptr, CreateXMLDocument }, - { &kNS_SVGDOCUMENT_CID, false, nullptr, CreateSVGDocument }, - { &kNS_IMAGEDOCUMENT_CID, false, nullptr, CreateImageDocument }, { &kNS_TEXT_ENCODER_CID, false, nullptr, CreateTextEncoder }, { &kNS_HTMLCOPY_TEXT_ENCODER_CID, false, nullptr, CreateHTMLCopyTextEncoder }, { &kNS_XMLCONTENTSERIALIZER_CID, false, nullptr, CreateXMLContentSerializer }, @@ -553,21 +523,15 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { { &kNS_CONTENTPOLICY_CID, false, nullptr, CreateContentPolicy }, { &kNS_DATADOCUMENTCONTENTPOLICY_CID, false, nullptr, nsDataDocumentContentPolicyConstructor }, { &kNS_NODATAPROTOCOLCONTENTPOLICY_CID, false, nullptr, nsNoDataProtocolContentPolicyConstructor }, -#ifdef MOZ_XUL - { &kNS_XULDOCUMENT_CID, false, nullptr, CreateXULDocument }, -#endif { &kNS_CONTENT_DOCUMENT_LOADER_FACTORY_CID, false, nullptr, CreateContentDLF }, { &kNS_JSPROTOCOLHANDLER_CID, false, nullptr, nsJSProtocolHandler::Create }, { &kNS_JSURI_CID, false, nullptr, nsJSURIMutatorConstructor }, // do_CreateInstance returns mutator { &kNS_JSURIMUTATOR_CID, false, nullptr, nsJSURIMutatorConstructor }, { &kNS_PLUGINDOCLOADERFACTORY_CID, false, nullptr, CreateContentDLF }, - { &kNS_PLUGINDOCUMENT_CID, false, nullptr, CreatePluginDocument }, - { &kNS_VIDEODOCUMENT_CID, false, nullptr, CreateVideoDocument }, { &kNS_STYLESHEETSERVICE_CID, false, nullptr, nsStyleSheetServiceConstructor }, { &kNS_HOSTOBJECTURI_CID, false, nullptr, BlobURLMutatorConstructor }, // do_CreateInstance returns mutator { &kNS_HOSTOBJECTURIMUTATOR_CID, false, nullptr, BlobURLMutatorConstructor }, { &kNS_SDBCONNECTION_CID, false, nullptr, SDBConnection::Create }, - { &kNS_DOMSESSIONSTORAGEMANAGER_CID, false, nullptr, SessionStorageManagerConstructor }, { &kNS_DOMLOCALSTORAGEMANAGER_CID, false, nullptr, LocalStorageManagerConstructor }, { &kDOMREQUEST_SERVICE_CID, false, nullptr, DOMRequestServiceConstructor }, { &kQUOTAMANAGER_SERVICE_CID, false, nullptr, QuotaManagerServiceConstructor }, @@ -623,8 +587,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = { static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { XPCONNECT_CONTRACTS { "@mozilla.org/inspector/deep-tree-walker;1", &kIN_DEEPTREEWALKER_CID }, - { "@mozilla.org/xml/xml-document;1", &kNS_XMLDOCUMENT_CID }, - { "@mozilla.org/svg/svg-document;1", &kNS_SVGDOCUMENT_CID }, { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID }, { NS_DOC_ENCODER_CONTRACTID_BASE "application/xml", &kNS_TEXT_ENCODER_CID }, { NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml", &kNS_TEXT_ENCODER_CID }, @@ -650,7 +612,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = { { NS_STYLESHEETSERVICE_CONTRACTID, &kNS_STYLESHEETSERVICE_CID }, { NS_SDBCONNECTION_CONTRACTID, &kNS_SDBCONNECTION_CID }, { "@mozilla.org/dom/localStorage-manager;1", &kNS_DOMLOCALSTORAGEMANAGER_CID }, - { "@mozilla.org/dom/sessionStorage-manager;1", &kNS_DOMSESSIONSTORAGEMANAGER_CID }, { DOMREQUEST_SERVICE_CONTRACTID, &kDOMREQUEST_SERVICE_CID }, { QUOTAMANAGER_SERVICE_CONTRACTID, &kQUOTAMANAGER_SERVICE_CID }, { SERVICEWORKERMANAGER_CONTRACTID, &kSERVICEWORKERMANAGER_CID }, diff --git a/layout/generic/TextDrawTarget.h b/layout/generic/TextDrawTarget.h index 2370d51f54d7..1f20f0f4eba6 100644 --- a/layout/generic/TextDrawTarget.h +++ b/layout/generic/TextDrawTarget.h @@ -448,7 +448,7 @@ public: MOZ_RELEASE_ASSERT(aPattern.GetType() == PatternType::COLOR && aStrokeOptions.mDashLength == 0); - wr::BorderWidths widths = { + wr::LayoutSideOffsets widths = { aStrokeOptions.mLineWidth, aStrokeOptions.mLineWidth, aStrokeOptions.mLineWidth, diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp index 03ce0650be98..7551f0556570 100644 --- a/layout/svg/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/nsSVGOuterSVGFrame.cpp @@ -240,6 +240,9 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() // We only have an intrinsic size/ratio if our width and height attributes // are both specified and set to non-percentage values, or we have a viewBox // rect: http://www.w3.org/TR/SVGMobile12/coords.html#IntrinsicSizing + // Unfortunately we have to return the ratio as two nscoords whereas what + // we have are two floats. Using app units allows for some floating point + // values to work but really small or large numbers will fail. SVGSVGElement *content = static_cast(GetContent()); const nsSVGLength2& width = @@ -248,8 +251,9 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() content->mLengthAttributes[SVGSVGElement::ATTR_HEIGHT]; if (!width.IsPercentage() && !height.IsPercentage()) { - nsSize ratio(NSToCoordRoundWithClamp(width.GetAnimValue(content)), - NSToCoordRoundWithClamp(height.GetAnimValue(content))); + nsSize ratio( + nsPresContext::CSSPixelsToAppUnits(width.GetAnimValue(content)), + nsPresContext::CSSPixelsToAppUnits(height.GetAnimValue(content))); if (ratio.width < 0) { ratio.width = 0; } @@ -279,8 +283,8 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() if (viewBoxHeight < 0.0f) { viewBoxHeight = 0.0f; } - return nsSize(NSToCoordRoundWithClamp(viewBoxWidth), - NSToCoordRoundWithClamp(viewBoxHeight)); + return nsSize(nsPresContext::CSSPixelsToAppUnits(viewBoxWidth), + nsPresContext::CSSPixelsToAppUnits(viewBoxHeight)); } return nsSVGDisplayContainerFrame::GetIntrinsicRatio(); diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index bc227ddc5605..f23adfcda4e5 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -7554,7 +7554,7 @@ BCBlockDirSeg::CreateWebRenderCommands(BCPaintBorderIterator& aIter, // All border style is set to none except left side. So setting the widths of // each side to width of rect is fine. - wr::BorderWidths borderWidths = wr::ToBorderWidths(roundedRect.size.width, + wr::LayoutSideOffsets borderWidths = wr::ToBorderWidths(roundedRect.size.width, roundedRect.size.width, roundedRect.size.width, roundedRect.size.width); @@ -7841,7 +7841,7 @@ BCInlineDirSeg::CreateWebRenderCommands(BCPaintBorderIterator& aIter, // All border style is set to none except top side. So setting the widths of // each side to height of rect is fine. - wr::BorderWidths borderWidths = wr::ToBorderWidths(roundedRect.size.height, + wr::LayoutSideOffsets borderWidths = wr::ToBorderWidths(roundedRect.size.height, roundedRect.size.height, roundedRect.size.height, roundedRect.size.height); @@ -8086,7 +8086,7 @@ nsTableFrame::CreateWebRenderCommandsForBCBorders(wr::DisplayListBuilder& aBuild LayoutDeviceRect allBorderRect; wr::BorderSide wrSide[4]; - wr::BorderWidths wrWidths; + wr::LayoutSideOffsets wrWidths; wr::BorderRadius borderRadii = wr::EmptyBorderRadius(); bool backfaceIsVisible = false; NS_FOR_CSS_SIDES(side) { diff --git a/layout/xul/nsBox.cpp b/layout/xul/nsBox.cpp index 589c1dcba2fb..15d1b07c4cf8 100644 --- a/layout/xul/nsBox.cpp +++ b/layout/xul/nsBox.cpp @@ -63,17 +63,15 @@ nsBox::EndXULLayout(nsBoxLayoutState& aState) } bool nsBox::gGotTheme = false; -StaticRefPtr nsBox::gTheme; +nsITheme* nsBox::gTheme = nullptr; nsBox::nsBox(ClassID aID) : nsIFrame(aID) { MOZ_COUNT_CTOR(nsBox); if (!gGotTheme) { - gTheme = NS_NewNativeTheme(); - if (gTheme) { - gGotTheme = true; - } + gGotTheme = true; + CallGetService("@mozilla.org/chrome/chrome-native-theme;1", &gTheme); } } @@ -88,7 +86,7 @@ nsBox::~nsBox() nsBox::Shutdown() { gGotTheme = false; - gTheme = nullptr; + NS_IF_RELEASE(gTheme); } nsresult diff --git a/layout/xul/nsBox.h b/layout/xul/nsBox.h index 7bff1aaf7ed9..5c3a8e75a173 100644 --- a/layout/xul/nsBox.h +++ b/layout/xul/nsBox.h @@ -8,7 +8,6 @@ #define nsBox_h___ #include "mozilla/Attributes.h" -#include "mozilla/StaticPtr.h" #include "nsIFrame.h" class nsITheme; @@ -80,7 +79,7 @@ protected: nsresult EndXULLayout(nsBoxLayoutState& aState); static bool gGotTheme; - static mozilla::StaticRefPtr gTheme; + static nsITheme* gTheme; enum eMouseThrough { unset, diff --git a/media/mtransport/third_party/nICEr/src/net/transport_addr.c b/media/mtransport/third_party/nICEr/src/net/transport_addr.c index fffb1f0d3782..6b3dfdc45d2b 100644 --- a/media/mtransport/third_party/nICEr/src/net/transport_addr.c +++ b/media/mtransport/third_party/nICEr/src/net/transport_addr.c @@ -99,12 +99,12 @@ int nr_transport_addr_fmt_ifname_addr_string(const nr_transport_addr *addr, char switch(addr->ip_version){ case NR_IPV4: if (!inet_ntop(AF_INET, &addr->u.addr4.sin_addr,buffer,sizeof(buffer))) { - strncpy(buffer, "[error]", len); + strncpy(buffer, "[error]", sizeof(buffer)); } break; case NR_IPV6: if (!inet_ntop(AF_INET6, &addr->u.addr6.sin6_addr,buffer,sizeof(buffer))) { - strncpy(buffer, "[error]", len); + strncpy(buffer, "[error]", sizeof(buffer)); } break; default: diff --git a/mobile/android/chrome/geckoview/GeckoViewContent.js b/mobile/android/chrome/geckoview/GeckoViewContent.js index 5c4019a618a6..3cb00243c48e 100644 --- a/mobile/android/chrome/geckoview/GeckoViewContent.js +++ b/mobile/android/chrome/geckoview/GeckoViewContent.js @@ -49,6 +49,7 @@ class GeckoViewContent extends GeckoViewContentModule { addEventListener("pageshow", this, options); addEventListener("focusin", this, options); addEventListener("focusout", this, options); + addEventListener("mozcaretstatechanged", this, options); XPCOMUtils.defineLazyGetter(this, "_autoFill", () => new GeckoViewAutoFill(this.eventDispatcher)); @@ -236,6 +237,7 @@ class GeckoViewContent extends GeckoViewContentModule { } } + // eslint-disable-next-line complexity handleEvent(aEvent) { debug `handleEvent: ${aEvent.type}`; @@ -336,6 +338,14 @@ class GeckoViewContent extends GeckoViewContentModule { this._autoFill.scanDocument(aEvent.target); } break; + case "mozcaretstatechanged": + if (aEvent.reason === "presscaret" || aEvent.reason === "releasecaret") { + this.eventDispatcher.sendRequest({ + type: "GeckoView:PinOnScreen", + pinned: aEvent.reason === "presscaret", + }); + } + break; } } diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt index 622840ac3d3b..ec3046fda59c 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt @@ -8,6 +8,7 @@ import org.mozilla.geckoview.GeckoResponse import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.* import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDevToolsAPI import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.Callbacks @@ -158,6 +159,31 @@ class SelectionActionDelegateTest : BaseSessionTest() { hasSelectionAt(selectedContent.initialContent.length)) } + @Test fun pagehide() { + // Navigating to another page should hide selection action. + testThat(selectedContent, { mainSession.loadTestPath(HELLO_HTML_PATH) }, clearsSelection()) + } + + @Test fun deactivate() { + // Blurring the window should hide selection action. + testThat(selectedContent, { mainSession.setFocused(false) }, clearsSelection()) + mainSession.setFocused(true) + } + + @NullDelegate(GeckoSession.SelectionActionDelegate::class) + @Test fun clearDelegate() { + var counter = 0 + mainSession.selectionActionDelegate = object : Callbacks.SelectionActionDelegate { + override fun onHideAction(session: GeckoSession, reason: Int) { + counter++ + } + } + + mainSession.selectionActionDelegate = null + assertThat("Hide action should be called when clearing delegate", + counter, equalTo(1)) + } + /** Interface that defines behavior for a particular type of content */ private interface SelectedContent { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java index 12237ec3269a..e2f1fea2a76d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java @@ -140,13 +140,6 @@ public class LayerSession { private void updateOverscrollOffset(final float x, final float y) { LayerSession.this.updateOverscrollOffset(x, y); } - - @WrapForJNI(calledFrom = "ui") - private void onSelectionCaretDrag(final boolean dragging) { - // Active SelectionCaretDrag requires DynamicToolbarAnimator to be pinned to - // avoid unwanted scroll interactions. - LayerSession.this.onSelectionCaretDrag(dragging); - } } protected final Compositor mCompositor = new Compositor(); @@ -482,13 +475,13 @@ public class LayerSession { mOverscroll.setDistance(y, OverscrollEdgeEffect.AXIS_Y); } - /* package */ void onSelectionCaretDrag(final boolean dragging) { + protected void setShouldPinOnScreen(final boolean pinned) { if (DEBUG) { ThreadUtils.assertOnUiThread(); } if (mToolbar != null) { - mToolbar.setPinned(dragging, DynamicToolbarAnimator.PinReason.CARET_DRAG); + mToolbar.setPinned(pinned, DynamicToolbarAnimator.PinReason.CARET_DRAG); } } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java index 7c8c99598c9d..57c9b292e365 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java @@ -59,4 +59,17 @@ public class GeckoDisplay { session.onScreenOriginChanged(left, top); } } + + /** + * Return whether the display should be pinned on the screen. When pinned, the display + * should not be moved on the screen due to animation, scrolling, etc. A common reason + * for the display being pinned is when the user is dragging a selection caret inside + * the display; normal user interaction would be disrupted in that case if the display + * was moved on screen. + * + * @return True if display should be pinned on the screen. + */ + public boolean shouldPinOnScreen() { + return session.getDisplay() == this && session.shouldPinOnScreen(); + } } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java index 7caaee200109..3439cf3e7164 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java @@ -101,6 +101,8 @@ public final class GeckoSession extends LayerSession private String mId = UUID.randomUUID().toString().replace("-", ""); /* package */ String getId() { return mId; } + private boolean mShouldPinOnScreen; + /* package */ static abstract class CallbackResult extends GeckoResult implements EventCallback { @Override @@ -813,6 +815,7 @@ public final class GeckoSession extends LayerSession private class Listener implements BundleEventListener { /* package */ void registerListeners() { getEventDispatcher().registerUiThreadListener(this, + "GeckoView:PinOnScreen", "GeckoView:Prompt", null); } @@ -824,7 +827,9 @@ public final class GeckoSession extends LayerSession Log.d(LOGTAG, "handleMessage: event = " + event); } - if ("GeckoView:Prompt".equals(event)) { + if ("GeckoView:PinOnScreen".equals(event)) { + GeckoSession.this.setShouldPinOnScreen(message.getBoolean("pinned")); + } else if ("GeckoView:Prompt".equals(event)) { handlePromptEvent(GeckoSession.this, message, callback); } } @@ -1992,6 +1997,17 @@ public final class GeckoSession extends LayerSession } } + @Override + protected void setShouldPinOnScreen(final boolean pinned) { + super.setShouldPinOnScreen(pinned); + mShouldPinOnScreen = pinned; + } + + /* package */ boolean shouldPinOnScreen() { + ThreadUtils.assertOnUiThread(); + return mShouldPinOnScreen; + } + public EventDispatcher getEventDispatcher() { return mEventDispatcher; } diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java index 92231779b6eb..01a93bc3ca27 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java @@ -159,6 +159,10 @@ public class GeckoView extends FrameLayout { mDisplay.screenOriginChanged(mOrigin[0], mOrigin[1]); } } + + public boolean shouldPinOnScreen() { + return mDisplay != null ? mDisplay.shouldPinOnScreen() : false; + } } public GeckoView(final Context context) { @@ -212,6 +216,19 @@ public class GeckoView extends FrameLayout { } } + /** + * Return whether the view should be pinned on the screen. When pinned, the view + * should not be moved on the screen due to animation, scrolling, etc. A common reason + * for the view being pinned is when the user is dragging a selection caret inside + * the view; normal user interaction would be disrupted in that case if the view + * was moved on screen. + * + * @return True if view should be pinned on the screen. + */ + public boolean shouldPinOnScreen() { + return mDisplay.shouldPinOnScreen(); + } + /* package */ void setActive(final boolean active) { if (mSession != null) { mSession.setActive(active); diff --git a/mobile/android/modules/ActionBarHandler.jsm b/mobile/android/modules/ActionBarHandler.jsm index fd551a2babd7..f152d93ccb1f 100644 --- a/mobile/android/modules/ActionBarHandler.jsm +++ b/mobile/android/modules/ActionBarHandler.jsm @@ -52,6 +52,16 @@ var ActionBarHandler = { handleEvent: function(e) { e.stopImmediatePropagation(); + if (e.reason === "presscaret" || e.reason === "releasecaret") { + const dispatcher = this._getDispatcher(Services.focus.focusedWindow); + if (dispatcher) { + dispatcher.sendRequest({ + type: "GeckoView:PinOnScreen", + pinned: e.reason === "presscaret", + }); + } + } + // Close an open ActionBar, if carets no longer logically visible. if (this._selectionID && !e.caretVisible) { this._uninit(false); diff --git a/modules/pdfium/moz.build b/modules/pdfium/moz.build index 48547e2f2ac7..9ede8dfbe8bc 100644 --- a/modules/pdfium/moz.build +++ b/modules/pdfium/moz.build @@ -562,4 +562,4 @@ AllowCompilerWarnings() GeckoSharedLibrary('pdfium', linkage=None) if CONFIG['OS_TARGET'] == 'WINNT': - DEFFILE = SRCDIR + '/pdfium.def' + DEFFILE = 'pdfium.def' diff --git a/mozglue/build/WindowsDllBlocklistDefs.h b/mozglue/build/WindowsDllBlocklistDefs.h index f3639dc23c50..0c823b9edf39 100644 --- a/mozglue/build/WindowsDllBlocklistDefs.h +++ b/mozglue/build/WindowsDllBlocklistDefs.h @@ -197,6 +197,9 @@ DLL_BLOCKLIST_ENTRY("gdkbfltdll64.dll", MAKE_VERSION(1, 0, 14141, 240)) DLL_BLOCKLIST_ENTRY("dbroverlayiconnotbackuped.dll", MAKE_VERSION(1, 8, 0, 9)) DLL_BLOCKLIST_ENTRY("dbroverlayiconbackuped.dll", MAKE_VERSION(1, 8, 0, 9)) +// NVIDIA nView Desktop Management causes crashes, bug 1465787 +DLL_BLOCKLIST_ENTRY("nviewh64.dll", MAKE_VERSION(6, 14, 10, 14847)) + #ifdef ENABLE_TESTS // DLLs used by TestDllBlocklist* gTests diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index 4945d1663f5c..dacfa1a2e226 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -30,7 +30,7 @@ if CONFIG['MOZ_UBSAN']: ] if CONFIG['OS_TARGET'] == 'WINNT': - DEFFILE = 'mozglue.def' + DEFFILE = '!mozglue.def' # We'll break the DLL blocklist if we immediately load user32.dll DELAYLOAD_DLLS += [ 'user32.dll', diff --git a/mozglue/misc/TimeStamp_windows.cpp b/mozglue/misc/TimeStamp_windows.cpp index 95af0e7fb46b..5a994124794b 100644 --- a/mozglue/misc/TimeStamp_windows.cpp +++ b/mozglue/misc/TimeStamp_windows.cpp @@ -168,7 +168,9 @@ PerformanceCounter() LARGE_INTEGER pc; ::QueryPerformanceCounter(&pc); - if (!sHasStableTSC) { + // As an experiment, we want to have a monotonicity sentinel + // even if the TSC is reported as stable. + if (true || !sHasStableTSC) { // This is a simple go-backward protection for faulty hardware AutoCriticalSection lock(&sTimeStampLock); diff --git a/other-licenses/7zstub/README.mozilla b/other-licenses/7zstub/README.mozilla index 526b14609a72..854aece1dac2 100644 --- a/other-licenses/7zstub/README.mozilla +++ b/other-licenses/7zstub/README.mozilla @@ -19,7 +19,9 @@ versions which are no longer supported by the build system used for the main application; that means we can show an error message specifically informing users that their OS is too old, instead of the generic "not a valid Win32 application" error that Windows would generate if we used the newer toolchain -and that isn't very helpful to most users. +and that isn't very helpful to most users. Using a precompiled binary also +allows the installer build procedure to work without a compiler toolchain +being configured (e.g., for artifact builds). The firefox/ directory also contains an icon and a manifest which were edited into 7zSD.sfx's resources after build time. The icon had to be added this way @@ -28,3 +30,33 @@ compiler included with VC6 does not support the 128x128 PNG image included in our icon file. Similarly, the manifest had to be edited in because the older resource compiler does not support manifests (and the 7-zip build files do not try to use any). + +The version info in the compiled binary was also edited after build time. There +isn't a technical reason why the version info changes couldn't be included at +build time, but since the goal is just to avoid confusing users about the origin +of the Firefox installer, not to appear to be making the claim that we wrote the +LZMA SDK, a more targeted change is appropriate. + +Step-by-step instructions for generating 7zSD.sfx: +1) Install Microsoft Visual C++ 6 Professional or Enterprise edition (the + Standard edition does not include the optimizing compiler, so it should + not be used). You'll likely want a virtual machine running Windows XP, + because running VC6 under more modern Windows versions is tricky. +2) Install an appropriate Windows SDK version. The Windows XP Service Pack 2 SDK + is known to work well, but that particular version appears to only be + available from archive.org: +https://web.archive.org/web/20080209175723/http://www.microsoft.com:80/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm +3) Run the tool included with the SDK that configures Visual C++ to use it. +4) If using a fresh copy of the LZMA SDK sources, apply the patch in + mozilla_customizations.diff. The copy in the Firefox source tree already + has these changes applied. +5) Open the workspace file at src\CPP\7zip\Bundles\SFXSetup\SFXSetup.dsw and + build it using the "SFXSetup - Win32 ReleaseD" configuration. The output + executable should be at the path ReleaseD\7zSD.sfx relative to SFXSetup.dsw. +6) Use Resource Hacker (available from http://angusj.com/resourcehacker/) to + replace the existing icon on 7zSD.sfx and to add the manifest as a new + resource. Also edit the version info resource to replace CompanyName and + LegalCopyright with "Mozilla" (or appropriate vendor name) and + FileDescription and ProductName with "Firefox" (or appropriate product name). + Be sure to recompile the resources using the green "play" button in the + toolbar (or by pressing F5) before saving the file. diff --git a/other-licenses/7zstub/firefox/7zSD.sfx b/other-licenses/7zstub/firefox/7zSD.sfx index 22c06905b615..9cb1d5645fda 100644 Binary files a/other-licenses/7zstub/firefox/7zSD.sfx and b/other-licenses/7zstub/firefox/7zSD.sfx differ diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py index 4dfa57bc191f..14023e45cb5a 100644 --- a/python/mozbuild/mozbuild/backend/base.py +++ b/python/mozbuild/mozbuild/backend/base.py @@ -317,6 +317,7 @@ class BuildBackend(LoggingMixin): top_srcdir=obj.topsrcdir, topobjdir=obj.topobjdir, srcdir=srcdir, + srcdir_rel=mozpath.relpath(srcdir, mozpath.dirname(obj.output_path)), relativesrcdir=mozpath.relpath(srcdir, obj.topsrcdir) or '.', DEPTH=mozpath.relpath(obj.topobjdir, mozpath.dirname(obj.output_path)) or '.', ) diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index fe4b251338df..b046def182f2 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -1677,6 +1677,7 @@ class RecursiveMakeBackend(CommonBackend): pp.handleLine(b'topobjdir := @topobjdir@\n') pp.handleLine(b'topsrcdir := @top_srcdir@\n') pp.handleLine(b'srcdir := @srcdir@\n') + pp.handleLine(b'srcdir_rel := @srcdir_rel@\n') pp.handleLine(b'VPATH := @srcdir@\n') pp.handleLine(b'relativesrcdir := @relativesrcdir@\n') pp.handleLine(b'include $(DEPTH)/config/@autoconfmk@\n') diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py index b72094eac1e6..76109447c89a 100644 --- a/python/mozbuild/mozbuild/frontend/context.py +++ b/python/mozbuild/mozbuild/frontend/context.py @@ -1614,7 +1614,7 @@ VARIABLES = { This variable can only be used on Windows. """), - 'DEFFILE': (unicode, unicode, + 'DEFFILE': (Path, unicode, """The program .def (module definition) file. This variable can only be used on Windows. diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index ab22d59dd732..6d4211520537 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -1036,7 +1036,6 @@ class TreeMetadataEmitter(LoggingMixin): 'RCFILE', 'RESFILE', 'RCINCLUDE', - 'DEFFILE', 'WIN32_EXE_LDFLAGS', 'USE_EXTENSION_MANIFEST', 'NO_JS_MANIFEST', @@ -1067,13 +1066,28 @@ class TreeMetadataEmitter(LoggingMixin): if 'LDFLAGS' in context and context['LDFLAGS']: computed_link_flags.resolve_flags('MOZBUILD', context['LDFLAGS']) - deffile = context['DEFFILE'] - if deffile and context.config.substs.get('OS_ARCH') == 'WINNT': + deffile = context.get('DEFFILE') + if deffile and context.config.substs.get('OS_TARGET') == 'WINNT': + if isinstance(deffile, SourcePath): + if not os.path.exists(deffile.full_path): + raise SandboxValidationError( + 'Path specified in DEFFILE does not exist: %s ' + '(resolved to %s)' % (deffile, + deffile.full_path), context) + path = mozpath.relpath(deffile.full_path, context.objdir) + else: + path = deffile.target_basename + + # We don't have any better way to indicate that the def file + # is a dependency to whatever we're building beyond stuffing + # it into EXTRA_DEPS. + passthru.variables['EXTRA_DEPS'] = [path] + if context.config.substs.get('GNU_CC'): - computed_link_flags.resolve_flags('DEFFILE', [deffile]) + computed_link_flags.resolve_flags('DEFFILE', [path]) else: computed_link_flags.resolve_flags('DEFFILE', - ['-DEF:' + deffile]) + ['-DEF:' + path]) dist_install = context['DIST_INSTALL'] if dist_install is True: diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/baz.def b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/baz.def new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py index 33b794953652..348849fb687b 100644 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py @@ -225,6 +225,7 @@ class TestRecursiveMakeBackend(BackendTester): 'topobjdir := %s' % env.topobjdir, 'topsrcdir := %s' % env.topsrcdir, 'srcdir := %s' % env.topsrcdir, + 'srcdir_rel := %s' % mozpath.relpath(env.topsrcdir, env.topobjdir), 'VPATH := %s' % env.topsrcdir, 'relativesrcdir := .', 'include $(DEPTH)/config/autoconf.mk', @@ -242,7 +243,7 @@ class TestRecursiveMakeBackend(BackendTester): self.assertTrue(os.path.exists(p)) lines = [l.strip() for l in open(p, 'rt').readlines()] - self.assertEqual(len(lines), 10) + self.assertEqual(len(lines), 11) self.assertTrue(lines[0].startswith('# THIS FILE WAS AUTOMATICALLY')) @@ -325,8 +326,10 @@ class TestRecursiveMakeBackend(BackendTester): 'RCINCLUDE': [ 'RCINCLUDE := bar.rc', ], - 'DEFFILE': [ - 'DEFFILE := baz.def', + 'EXTRA_DEPS': [ + 'EXTRA_DEPS += %s' % mozpath.join(mozpath.relpath(env.topsrcdir, + env.topobjdir), + 'baz.def'), ], 'WIN32_EXE_LDFLAGS': [ 'WIN32_EXE_LDFLAGS += -subsystem:console', diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/baz.def b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/baz.def new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index 784464ea0321..d4c7ee84e4ab 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -190,7 +190,9 @@ class TestEmitterBasic(unittest.TestCase): 'RCFILE': 'foo.rc', 'RESFILE': 'bar.res', 'RCINCLUDE': 'bar.rc', - 'DEFFILE': 'baz.def', + 'EXTRA_DEPS': [mozpath.join(mozpath.relpath(reader.config.topsrcdir, + reader.config.topobjdir), + 'baz.def')], 'WIN32_EXE_LDFLAGS': ['-subsystem:console'], } diff --git a/testing/geckodriver/src/prefs.rs b/testing/geckodriver/src/prefs.rs index bb765f94a515..9f058e653cef 100644 --- a/testing/geckodriver/src/prefs.rs +++ b/testing/geckodriver/src/prefs.rs @@ -62,7 +62,6 @@ lazy_static! { ("browser.uitour.enabled", Pref::new(false)), // Do not warn on quitting Firefox - // TODO: Remove once minimum supported Firefox release is 61. ("browser.warnOnQuit", Pref::new(false)), // Do not show datareporting policy notifications which can diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py index 09e6febb2043..5b885188cacf 100644 --- a/testing/marionette/client/marionette_driver/geckoinstance.py +++ b/testing/marionette/client/marionette_driver/geckoinstance.py @@ -569,6 +569,9 @@ class DesktopInstance(GeckoInstance): # tests that don't expect it to be there. "browser.urlbar.userMadeSearchSuggestionsChoice": True, + # Don't warn when exiting the browser + "browser.warnOnQuit": False, + # Disable first-run welcome page "startup.homepage_welcome_url": "about:blank", "startup.homepage_welcome_url.additional": "", diff --git a/testing/mozbase/mozprofile/mozprofile/profile.py b/testing/mozbase/mozprofile/mozprofile/profile.py index 81dfc091a913..e79ae0d6b52b 100644 --- a/testing/mozbase/mozprofile/mozprofile/profile.py +++ b/testing/mozbase/mozprofile/mozprofile/profile.py @@ -427,61 +427,22 @@ class Profile(BaseProfile): class FirefoxProfile(Profile): """Specialized Profile subclass for Firefox""" - - preferences = { # Don't automatically update the application - 'app.update.disabledForTesting': True, - 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer': True, - # Don't restore the last open set of tabs if the browser has crashed - 'browser.sessionstore.resume_from_crash': False, - # Don't check for the default web browser during startup - 'browser.shell.checkDefaultBrowser': False, - # Don't warn on exit when multiple tabs are open - 'browser.tabs.warnOnClose': False, - # Don't warn when exiting the browser - 'browser.warnOnQuit': False, - # Don't send Firefox health reports to the production server - 'datareporting.healthreport.documentServerURI': 'http://%(server)s/healthreport/', - # Skip data reporting policy notifications - 'datareporting.policy.dataSubmissionPolicyBypassNotification': True, - # Only install add-ons from the profile and the application scope - # Also ensure that those are not getting disabled. - # see: https://developer.mozilla.org/en/Installing_extensions - 'extensions.enabledScopes': 5, - 'extensions.autoDisableScopes': 10, - # Don't send the list of installed addons to AMO - 'extensions.getAddons.cache.enabled': False, - # Don't install distribution add-ons from the app folder - 'extensions.installDistroAddons': False, - # Don't automatically update add-ons - 'extensions.update.enabled': False, - # Don't open a dialog to show available add-on updates - 'extensions.update.notifyUser': False, - # Enable test mode to run multiple tests in parallel - 'focusmanager.testmode': True, - # Enable test mode to not raise an OS level dialog for location sharing - 'geo.provider.testing': True, - # Suppress delay for main action in popup notifications - 'security.notification_enable_delay': 0, - # Suppress automatic safe mode after crashes - 'toolkit.startup.max_resumed_crashes': -1, - # Don't send Telemetry reports to the production server. This is - # needed as Telemetry sends pings also if FHR upload is enabled. - 'toolkit.telemetry.server': 'http://%(server)s/telemetry-dummy/', - } + preferences = {} class ThunderbirdProfile(Profile): """Specialized Profile subclass for Thunderbird""" - preferences = {'extensions.update.enabled': False, - 'extensions.update.notifyUser': False, - 'browser.shell.checkDefaultBrowser': False, - 'browser.tabs.warnOnClose': False, - 'browser.warnOnQuit': False, - 'browser.sessionstore.resume_from_crash': False, - # prevents the 'new e-mail address' wizard on new profile - 'mail.provider.enabled': False, - } + preferences = { + 'extensions.update.enabled': False, + 'extensions.update.notifyUser': False, + 'browser.shell.checkDefaultBrowser': False, + 'browser.tabs.warnOnClose': False, + 'browser.warnOnQuit': False, + 'browser.sessionstore.resume_from_crash': False, + # prevents the 'new e-mail address' wizard on new profile + 'mail.provider.enabled': False, + } class ChromeProfile(BaseProfile): diff --git a/testing/mozbase/mozprofile/tests/test_profile_view.py b/testing/mozbase/mozprofile/tests/test_profile_view.py index 1bc27a94df20..bf97ea520061 100644 --- a/testing/mozbase/mozprofile/tests/test_profile_view.py +++ b/testing/mozbase/mozprofile/tests/test_profile_view.py @@ -17,14 +17,8 @@ here = os.path.dirname(os.path.abspath(__file__)) def test_profileprint(tmpdir): - """ - test the summary function - """ - - keys = set(['Files', 'Path', 'user.js']) - ff_prefs = mozprofile.FirefoxProfile.preferences # shorthand - pref_string = '\n'.join(['%s: %s' % (key, ff_prefs[key]) - for key in sorted(ff_prefs.keys())]) + """Test the summary function.""" + keys = set(['Files', 'Path']) tmpdir = tmpdir.strpath profile = mozprofile.FirefoxProfile(tmpdir) @@ -33,7 +27,6 @@ def test_profileprint(tmpdir): assert parts['Path'] == tmpdir assert set(parts.keys()) == keys - assert pref_string == parts['user.js'].strip() def test_str_cast(): diff --git a/testing/profiles/moz.build b/testing/profiles/moz.build index fa2627b8fd81..24e8228dd5b3 100644 --- a/testing/profiles/moz.build +++ b/testing/profiles/moz.build @@ -8,8 +8,10 @@ profile_files = [ 'common/*', 'perf/*', 'profiles.json', + 'profileserver/*', 'reftest/*', 'unittest/*', + 'web-platform/*' ] TEST_HARNESS_FILES.reftest.profile_data += profile_files diff --git a/testing/profiles/profiles.json b/testing/profiles/profiles.json index f461c256204a..3cf26dde8b72 100644 --- a/testing/profiles/profiles.json +++ b/testing/profiles/profiles.json @@ -1,9 +1,9 @@ { "mochitest": ["common", "unittest"], - "profileserver": ["common", "unittest"], + "profileserver": ["common", "unittest", "profileserver"], "raptor": ["common", "perf", "raptor"], "reftest": ["common", "reftest"], "talos": ["common", "perf"], "valgrind": ["common", "unittest"], - "web-platform-tests": ["common", "unittest"] + "web-platform-tests": ["common", "unittest", "web-platform"] } diff --git a/testing/profiles/profileserver/extensions/README.txt b/testing/profiles/profileserver/extensions/README.txt new file mode 100644 index 000000000000..9ec618a6aa0f --- /dev/null +++ b/testing/profiles/profileserver/extensions/README.txt @@ -0,0 +1,2 @@ +Dropping extensions here will get them installed in all test harnesses +that make use of this profile. diff --git a/build/pgo/prefs_override.js b/testing/profiles/profileserver/user.js similarity index 65% rename from build/pgo/prefs_override.js rename to testing/profiles/profileserver/user.js index 9c10afa6811e..0870016d2302 100644 --- a/build/pgo/prefs_override.js +++ b/testing/profiles/profileserver/user.js @@ -1,2 +1,4 @@ +// Preferences file for profileserver. +/* globals user_pref */ // Turn off budget throttling for the profile server user_pref("dom.timeout.enable_budget_timer_throttling", false); diff --git a/testing/profiles/web-platform/extensions/README.txt b/testing/profiles/web-platform/extensions/README.txt new file mode 100644 index 000000000000..9ec618a6aa0f --- /dev/null +++ b/testing/profiles/web-platform/extensions/README.txt @@ -0,0 +1,2 @@ +Dropping extensions here will get them installed in all test harnesses +that make use of this profile. diff --git a/testing/profiles/web-platform/user.js b/testing/profiles/web-platform/user.js new file mode 100644 index 000000000000..6f074ce7f1d0 --- /dev/null +++ b/testing/profiles/web-platform/user.js @@ -0,0 +1,22 @@ +// Base preferences file for web-platform-tests. +/* globals user_pref */ +// Don't restore the last open set of tabs if the browser has crashed +user_pref("browser.sessionstore.resume_from_crash", false); +// Only install add-ons from the profile and the application scope +// Also ensure that those are not getting disabled. +// see: https://developer.mozilla.org/en/Installing_extensions +user_pref("extensions.autoDisableScopes", 10); +// Don't open a dialog to show available add-on updates +user_pref("extensions.update.notifyUser", false); +// Enable test mode to run multiple tests in parallel +user_pref("focusmanager.testmode", true); +// Enable pre-fetching of resources +user_pref("network.preload", true); +// Enable direct connection +user_pref("network.proxy.type", 0); +// Web-platform-tests load a lot of URLs very quickly. This puts avoidable and +// unnecessary I/O pressure on the Places DB (measured to be in the +// gigabytes). +user_pref("places.history.enabled", false); +// Suppress automatic safe mode after crashes +user_pref("toolkit.startup.max_resumed_crashes", -1); diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json index 5ecfcdf1cebf..4b4aed703504 100644 --- a/testing/web-platform/meta/MANIFEST.json +++ b/testing/web-platform/meta/MANIFEST.json @@ -13585,6 +13585,12 @@ {} ] ], + "pointerevents/extension/pointerevent_pointerrawmove_in_pointerlock-manual.html": [ + [ + "/pointerevents/extension/pointerevent_pointerrawmove_in_pointerlock-manual.html", + {} + ] + ], "pointerevents/extension/pointerevent_touch-action-pan-down-css_touch-manual.html": [ [ "/pointerevents/extension/pointerevent_touch-action-pan-down-css_touch-manual.html", @@ -14131,12 +14137,30 @@ {} ] ], + "presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html": [ + [ + "/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html", + {} + ] + ], + "presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html": [ + [ + "/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html", + {} + ] + ], "presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html": [ [ "/presentation-api/controlling-ua/reconnectToPresentation_success-manual.https.html", {} ] ], + "presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html": [ + [ + "/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html", + {} + ] + ], "presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html": [ [ "/presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html", @@ -109525,18 +109549,6 @@ {} ] ], - "css/css-contain/contain-layout-008.html": [ - [ - "/css/css-contain/contain-layout-008.html", - [ - [ - "/css/css-contain/reference/contain-paint-013-ref.html", - "==" - ] - ], - {} - ] - ], "css/css-contain/contain-layout-009.html": [ [ "/css/css-contain/contain-layout-009.html", @@ -109717,6 +109729,42 @@ {} ] ], + "css/css-contain/contain-layout-independent-formatting-context-001.html": [ + [ + "/css/css-contain/contain-layout-independent-formatting-context-001.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html", + "==" + ] + ], + {} + ] + ], + "css/css-contain/contain-layout-independent-formatting-context-002.html": [ + [ + "/css/css-contain/contain-layout-independent-formatting-context-002.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html", + "==" + ] + ], + {} + ] + ], + "css/css-contain/contain-layout-independent-formatting-context-003.html": [ + [ + "/css/css-contain/contain-layout-independent-formatting-context-003.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html", + "==" + ] + ], + {} + ] + ], "css/css-contain/contain-layout-ink-overflow-013.html": [ [ "/css/css-contain/contain-layout-ink-overflow-013.html", @@ -109957,18 +110005,6 @@ {} ] ], - "css/css-contain/contain-paint-013.html": [ - [ - "/css/css-contain/contain-paint-013.html", - [ - [ - "/css/css-contain/reference/contain-paint-013-ref.html", - "==" - ] - ], - {} - ] - ], "css/css-contain/contain-paint-014.html": [ [ "/css/css-contain/contain-paint-014.html", @@ -110281,6 +110317,42 @@ {} ] ], + "css/css-contain/contain-paint-independent-formatting-context-001.html": [ + [ + "/css/css-contain/contain-paint-independent-formatting-context-001.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html", + "==" + ] + ], + {} + ] + ], + "css/css-contain/contain-paint-independent-formatting-context-002.html": [ + [ + "/css/css-contain/contain-paint-independent-formatting-context-002.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html", + "==" + ] + ], + {} + ] + ], + "css/css-contain/contain-paint-independent-formatting-context-003.html": [ + [ + "/css/css-contain/contain-paint-independent-formatting-context-003.html", + [ + [ + "/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html", + "==" + ] + ], + {} + ] + ], "css/css-contain/contain-paint-size-001.html": [ [ "/css/css-contain/contain-paint-size-001.html", @@ -133969,6 +134041,30 @@ {} ] ], + "css/css-tables/percentages-grandchildren-quirks-mode-001.html": [ + [ + "/css/css-tables/percentages-grandchildren-quirks-mode-001.html", + [ + [ + "/css/reference/ref-filled-green-100px-square-only.html", + "==" + ] + ], + {} + ] + ], + "css/css-tables/percentages-grandchildren-quirks-mode-002.html": [ + [ + "/css/css-tables/percentages-grandchildren-quirks-mode-002.html", + [ + [ + "/css/reference/ref-filled-green-100px-square-only.html", + "==" + ] + ], + {} + ] + ], "css/css-tables/table-has-box-sizing-border-box-001.html": [ [ "/css/css-tables/table-has-box-sizing-border-box-001.html", @@ -185617,12 +185713,24 @@ {} ] ], - "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html": [ + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html": [ [ - "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html", + "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html", [ [ - "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-ref.html", + "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html", + "==" + ] + ], + {} + ] + ], + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html": [ + [ + "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html", + [ + [ + "/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html", "==" ] ], @@ -221465,6 +221573,16 @@ {} ] ], + "cookie-store/resources/helper_iframe.sub.html": [ + [ + {} + ] + ], + "cookie-store/resources/helpers.js": [ + [ + {} + ] + ], "cookie-store/resources/http_cookie_and_set_cookie_headers.js": [ [ {} @@ -247645,11 +247763,6 @@ {} ] ], - "css/css-contain/reference/contain-paint-013-ref.html": [ - [ - {} - ] - ], "css/css-contain/reference/contain-paint-022-ref.html": [ [ {} @@ -247670,6 +247783,16 @@ {} ] ], + "css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html": [ + [ + {} + ] + ], + "css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html": [ + [ + {} + ] + ], "css/css-contain/reference/contain-paint-size-001-ref.html": [ [ {} @@ -271385,6 +271508,11 @@ {} ] ], + "css/cssom/support/getComputedStyle-insets.js": [ + [ + {} + ] + ], "css/cssom/support/import-charset.css": [ [ {} @@ -279665,6 +279793,16 @@ {} ] ], + "feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.headers": [ + [ + {} + ] + ], + "feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.headers": [ + [ + {} + ] + ], "feature-policy/experimental-features/resources/async-script.js": [ [ {} @@ -279705,6 +279843,11 @@ {} ] ], + "feature-policy/experimental-features/resources/lazyload-contents.html": [ + [ + {} + ] + ], "feature-policy/experimental-features/resources/parser-blocking-script.js": [ [ {} @@ -288320,7 +288463,7 @@ {} ] ], - "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-ref.html": [ + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html": [ [ {} ] @@ -288405,6 +288548,11 @@ {} ] ], + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html": [ + [ + {} + ] + ], "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css": [ [ {} @@ -295510,6 +295658,11 @@ {} ] ], + "pointerevents/resources/pointerevent_pointerrawmove_in_pointerlock-iframe.html": [ + [ + {} + ] + ], "pointerlock/META.yml": [ [ {} @@ -331088,6 +331241,18 @@ {} ] ], + "cookie-store/cookieStore_get_set_across_frames.tentative.https.html": [ + [ + "/cookie-store/cookieStore_get_set_across_frames.tentative.https.html", + {} + ] + ], + "cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html": [ + [ + "/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html", + {} + ] + ], "cookie-store/cookieStore_get_set_basic.tentative.https.window.js": [ [ "/cookie-store/cookieStore_get_set_basic.tentative.https.window.html", @@ -338638,6 +338803,12 @@ {} ] ], + "css/css-transitions/historical.html": [ + [ + "/css/css-transitions/historical.html", + {} + ] + ], "css/css-transitions/idlharness.html": [ [ "/css/css-transitions/idlharness.html", @@ -342396,6 +342567,42 @@ {} ] ], + "css/cssom/getComputedStyle-insets-absolute.html": [ + [ + "/css/cssom/getComputedStyle-insets-absolute.html", + {} + ] + ], + "css/cssom/getComputedStyle-insets-fixed.html": [ + [ + "/css/cssom/getComputedStyle-insets-fixed.html", + {} + ] + ], + "css/cssom/getComputedStyle-insets-nobox.html": [ + [ + "/css/cssom/getComputedStyle-insets-nobox.html", + {} + ] + ], + "css/cssom/getComputedStyle-insets-relative.html": [ + [ + "/css/cssom/getComputedStyle-insets-relative.html", + {} + ] + ], + "css/cssom/getComputedStyle-insets-static.html": [ + [ + "/css/cssom/getComputedStyle-insets-static.html", + {} + ] + ], + "css/cssom/getComputedStyle-insets-sticky.html": [ + [ + "/css/cssom/getComputedStyle-insets-sticky.html", + {} + ] + ], "css/cssom/getComputedStyle-pseudo.html": [ [ "/css/cssom/getComputedStyle-pseudo.html", @@ -343466,6 +343673,12 @@ {} ] ], + "custom-elements/parser/parser-custom-element-in-foreign-content.html": [ + [ + "/custom-elements/parser/parser-custom-element-in-foreign-content.html", + {} + ] + ], "custom-elements/parser/parser-fallsback-to-unknown-element.html": [ [ "/custom-elements/parser/parser-fallsback-to-unknown-element.html", @@ -355314,6 +355527,18 @@ {} ] ], + "feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html": [ + [ + "/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html", + {} + ] + ], + "feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html": [ + [ + "/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html", + {} + ] + ], "feature-policy/experimental-features/sync-script.tentative.https.sub.html": [ [ "/feature-policy/experimental-features/sync-script.tentative.https.sub.html", @@ -385898,12 +386123,6 @@ {} ] ], - "presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html": [ - [ - "/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html", - {} - ] - ], "presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html": [ [ "/presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html", @@ -397676,6 +397895,22 @@ {} ] ], + "speech-api/SpeechSynthesis-pause-resume.tentative.html": [ + [ + "/speech-api/SpeechSynthesis-pause-resume.tentative.html", + { + "testdriver": true + } + ] + ], + "speech-api/SpeechSynthesis-speak-events.html": [ + [ + "/speech-api/SpeechSynthesis-speak-events.html", + { + "testdriver": true + } + ] + ], "speech-api/SpeechSynthesis-speak-ownership.html": [ [ "/speech-api/SpeechSynthesis-speak-ownership.html", @@ -397692,14 +397927,6 @@ } ] ], - "speech-api/SpeechSynthesis-speak-with-activation-succeeds.html": [ - [ - "/speech-api/SpeechSynthesis-speak-with-activation-succeeds.html", - { - "testdriver": true - } - ] - ], "speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html": [ [ "/speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html", @@ -399744,6 +399971,12 @@ {} ] ], + "trusted-types/Element-setAttributeNS.tentative.html": [ + [ + "/trusted-types/Element-setAttributeNS.tentative.html", + {} + ] + ], "trusted-types/HTMLElement-generic.tentative.html": [ [ "/trusted-types/HTMLElement-generic.tentative.html", @@ -399846,6 +400079,12 @@ {} ] ], + "trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html": [ + [ + "/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html", + {} + ] + ], "trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html": [ [ "/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html", @@ -402728,12 +402967,6 @@ {} ] ], - "webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html": [ - [ - "/webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html", - {} - ] - ], "webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html": [ [ "/webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html", @@ -438898,15 +439131,15 @@ "manual" ], "accname/name_test_case_661-manual.html": [ - "e1f25ba7c66276f0c61c8006767f4afc29fc7583", + "2bb16f9ffc02ffda2dcc830fe6c8fbd41361cea8", "manual" ], "accname/name_test_case_662-manual.html": [ - "4d69b0f1b57dc65f750dbb2423bdaf2eb76e5b4c", + "5587569438147f0c0997079bcf8f0b8bde177ef4", "manual" ], "accname/name_test_case_663a-manual.html": [ - "95ec2f857b7e33aafebb658b35911d908c0912da", + "3fc3d17ccdf207677f6c1c32bca4e438f796cf0c", "manual" ], "accname/name_test_case_721-manual.html": [ @@ -463045,6 +463278,14 @@ "fc9645d3e2e98063da8cf03ef50823af363c6b9c", "testharness" ], + "cookie-store/cookieStore_get_set_across_frames.tentative.https.html": [ + "fe5c1f14605815d9914a7a968b91d77d54b604ca", + "testharness" + ], + "cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html": [ + "5cbe542e32b37b45857e1cecb0c5ddb045bd9f5c", + "testharness" + ], "cookie-store/cookieStore_get_set_basic.tentative.https.window.js": [ "2a082de9d30927ec5ee152acdd76cde04ed730d5", "testharness" @@ -463117,6 +463358,14 @@ "980347f1d185649ad4366f4d86fb03c030baa03f", "support" ], + "cookie-store/resources/helper_iframe.sub.html": [ + "8e91cb7bed48c44a7b5e0cbe98bd3c198b372269", + "support" + ], + "cookie-store/resources/helpers.js": [ + "98f9ff6cb09808fcfe4db095994e5040ea24ba1c", + "support" + ], "cookie-store/resources/http_cookie_and_set_cookie_headers.js": [ "0fcf6b604290ddbdb165502e9fc514e20990b47b", "support" @@ -530469,10 +530718,6 @@ "39be5fe7fd06edc63704ee2e10c20dee14d01738", "reftest" ], - "css/css-contain/contain-layout-008.html": [ - "d442bebb065db400b3de429f1b2418f6f7b2423c", - "reftest" - ], "css/css-contain/contain-layout-009.html": [ "fc57bbd18204ff20190301025727edfd136dab41", "reftest" @@ -530533,6 +530778,18 @@ "3e4f3dafbf213c18a09cfd2a7512dd485c13f839", "reftest" ], + "css/css-contain/contain-layout-independent-formatting-context-001.html": [ + "94c88bc49cb123e98b114136b7836cd6f24c9574", + "reftest" + ], + "css/css-contain/contain-layout-independent-formatting-context-002.html": [ + "a7e8baed56db08e70c1c536cacd971d3885002b0", + "reftest" + ], + "css/css-contain/contain-layout-independent-formatting-context-003.html": [ + "a10afd3cdee90b988e0c3d25b533d3c1b4e8bb06", + "reftest" + ], "css/css-contain/contain-layout-ink-overflow-013.html": [ "d1431737352ef766f333e160888334b9efa0f66b", "reftest" @@ -530613,10 +530870,6 @@ "471726a99c659ab0d6a7870ee2519994051b425f", "reftest" ], - "css/css-contain/contain-paint-013.html": [ - "3b6b3a76dc63028e1ae22b81c4ba06112c5aceb7", - "reftest" - ], "css/css-contain/contain-paint-014.html": [ "ee6bc7876f6f0a1f3653c62819fd16553b1610b7", "reftest" @@ -530721,6 +530974,18 @@ "b8a03936cbcc3ddcc88dc1237fab0af56f4bd72b", "reftest" ], + "css/css-contain/contain-paint-independent-formatting-context-001.html": [ + "e4c06a992b351974d5506070db3dd8dadd53173e", + "reftest" + ], + "css/css-contain/contain-paint-independent-formatting-context-002.html": [ + "353196970c99e9b5ed556b850d4eda034d16df77", + "reftest" + ], + "css/css-contain/contain-paint-independent-formatting-context-003.html": [ + "fe1f7f2775db9cd82292c181560c2f9997de197d", + "reftest" + ], "css/css-contain/contain-paint-size-001.html": [ "930429b7ecc5af860fa6782cff30a8803393d3cd", "reftest" @@ -531001,10 +531266,6 @@ "b94055eb1b7830696b36be17f7bde1474ea605c4", "support" ], - "css/css-contain/reference/contain-paint-013-ref.html": [ - "af758703a3b75b45223491a4fe97eb1da20d5320", - "support" - ], "css/css-contain/reference/contain-paint-022-ref.html": [ "b3bb7576f2944f6ef51c16024767b93e8f30c329", "support" @@ -531021,6 +531282,14 @@ "229c8c2d74ba3f2b5cede6824091575835807092", "support" ], + "css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html": [ + "08900b201b12099e3b0c00f1e21b4b7890d2bcb9", + "support" + ], + "css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html": [ + "0cef592ba5cc6cc56a0fc3a7439cec330d1856b0", + "support" + ], "css/css-contain/reference/contain-paint-size-001-ref.html": [ "9aad8a490b4b740991c968a17f1c74571e758d36", "support" @@ -555357,6 +555626,14 @@ "a8745487b6702b8b8e8ac85bd843014dc296b717", "reftest" ], + "css/css-tables/percentages-grandchildren-quirks-mode-001.html": [ + "b6b6d245ab2f2c56ae5ac51c96a771e5acd5f084", + "reftest" + ], + "css/css-tables/percentages-grandchildren-quirks-mode-002.html": [ + "a24556aa0dedfab35ff7792f03b804f44c0f4160", + "reftest" + ], "css/css-tables/support/base.css": [ "52be1bb4e52e5705319ebf5525f6d89839356d65", "support" @@ -565573,6 +565850,10 @@ "4d17d4ad41e73c4c5e7830d10973384614353ce5", "testharness" ], + "css/css-transitions/historical.html": [ + "8d0360a8ecf7a37b81acb10917b63abc7c9543cc", + "testharness" + ], "css/css-transitions/idlharness.html": [ "4cc7ee50eb4915fcf95843f7eeee266abfa7b81a", "testharness" @@ -577961,6 +578242,30 @@ "aa49dc33ef79a6f8d6e7e1051d963708e05e7622", "testharness" ], + "css/cssom/getComputedStyle-insets-absolute.html": [ + "196f5f26f31f71253aa33b581f7a64ce3604e8da", + "testharness" + ], + "css/cssom/getComputedStyle-insets-fixed.html": [ + "e57e774fe6eb27be91fa95d920096ba107512b1b", + "testharness" + ], + "css/cssom/getComputedStyle-insets-nobox.html": [ + "ca55ace7f4ed42ae25dab7968b347f83a998b958", + "testharness" + ], + "css/cssom/getComputedStyle-insets-relative.html": [ + "c48f2eb555ee51c464753d980deeac514c84fd29", + "testharness" + ], + "css/cssom/getComputedStyle-insets-static.html": [ + "854a8e3dba4085ab1fa8fe3c48fde4ef2c27bca6", + "testharness" + ], + "css/cssom/getComputedStyle-insets-sticky.html": [ + "10520232d738a6547ee430797c74763649e06224", + "testharness" + ], "css/cssom/getComputedStyle-pseudo.html": [ "340f9eed9b955467eb39c957222328baf2c41d4a", "testharness" @@ -578070,7 +578375,7 @@ "testharness" ], "css/cssom/shorthand-serialization.html": [ - "44af6737e3ef3b3c71ccd259b1d75104c4a92061", + "97e11da8b8a266c7efa3826272e3fdb7ce55ed86", "testharness" ], "css/cssom/shorthand-values.html": [ @@ -578165,6 +578470,10 @@ "85dd7324815b8f8ef1a1d0496224c1a0661db9d8", "support" ], + "css/cssom/support/getComputedStyle-insets.js": [ + "7bd34fe87a2806d3cc79625001c694159743f862", + "support" + ], "css/cssom/support/import-charset.css": [ "9f44090c94a7945c3adbf850da3290c85a60a0ab", "support" @@ -590589,6 +590898,10 @@ "3f13c50a0e1b10e7c914038c785b60b92abff4a9", "testharness" ], + "custom-elements/parser/parser-custom-element-in-foreign-content.html": [ + "2ae0f1309c62b42ba8253e40fb045f3ba7748897", + "testharness" + ], "custom-elements/parser/parser-fallsback-to-unknown-element.html": [ "82e970f1ae810f54a3d37c5c5b142143422bda11", "testharness" @@ -590910,7 +591223,7 @@ "support" ], "docs/_writing-tests/lint-tool.md": [ - "d818f4b0b38190e2527f74c4bb590c5781f9488b", + "498df7f293d893043c1efc221c444d48b5092e30", "support" ], "docs/_writing-tests/manual.md": [ @@ -595689,12 +596002,28 @@ "db2dcbc1929b9e1264855e9b80f77dfbda5d4f38", "support" ], + "feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html": [ + "5b9034b63841209bd64c5115e91dc2a69a81d90d", + "testharness" + ], + "feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.headers": [ + "d0bac47e01a7e903d78ffab7b73838f0852852d6", + "support" + ], + "feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html": [ + "2e0a791f374cecac3eb02c1292ab599535b20d1d", + "testharness" + ], + "feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.headers": [ + "83b744e2bc4e09b771c7997fc044802f77f65407", + "support" + ], "feature-policy/experimental-features/resources/async-script.js": [ "3c0ee6d02343891b0234f31c0fb229929ae1b24b", "support" ], "feature-policy/experimental-features/resources/common.js": [ - "08d3aef9874894f03941a0dc74dd4061ebe021d3", + "10c28be7741b718794f264c0b720304b8c5b7cb7", "support" ], "feature-policy/experimental-features/resources/defer-script.js": [ @@ -595721,6 +596050,10 @@ "73ca820915bbdccdf4fd2d3960c795f1cea8e181", "support" ], + "feature-policy/experimental-features/resources/lazyload-contents.html": [ + "a6e98c24e6add4976571141ad2409e1cce96d173", + "support" + ], "feature-policy/experimental-features/resources/parser-blocking-script.js": [ "c61efee8a0a15801d474fd8b384de01e565e37ce", "support" @@ -607361,12 +607694,16 @@ "c38944ae795807628ce1c5cd114e5832263b2ff2", "testharness" ], - "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-ref.html": [ + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html": [ + "563a2aa68d833175767c2fe6507e460c25378d8e", + "reftest" + ], + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html": [ "95e2347121e26ec7cc7d080caf9db6ff253231c6", "support" ], - "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html": [ - "4d2269632c0eeeaf057b2008351ae98d4ddbdbca", + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html": [ + "1dbef479a9fd41933ad204f1540e6c45675a54b7", "reftest" ], "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-hittest.html": [ @@ -607557,6 +607894,10 @@ "92c33029701b41678f4f514d28c6260338bd8e77", "testharness" ], + "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/no-red-ref.html": [ + "32b7d46d6ffe54d92c9a1e2197df57583c68df83", + "support" + ], "html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/resources/fieldset-vertical.css": [ "b358d925a76fb571eda42292e2abbf7c1c75062f", "support" @@ -617782,7 +618123,7 @@ "support" ], "interfaces/background-fetch.idl": [ - "130d5d825a5bef49fd651c0cb326b9b40a7fa2c7", + "0dbe3fbad3cf343c36977380653c73144c6659d8", "support" ], "interfaces/battery-status.idl": [ @@ -617806,7 +618147,7 @@ "support" ], "interfaces/cookie-store.idl": [ - "d872b7aadb25b4720e78d98f3bf04c0c15151084", + "f5c44b60bd05dac2d54f6c36438aa0dd4a7d4471", "support" ], "interfaces/cors-rfc1918.idl": [ @@ -617910,7 +618251,7 @@ "support" ], "interfaces/feature-policy.idl": [ - "de2f0464683394194f347c7155c38ad48bfc190c", + "c09cc33ce14daefd44db0a84c1a9b39264e856a1", "support" ], "interfaces/fetch.idl": [ @@ -618062,7 +618403,7 @@ "support" ], "interfaces/payment-request.idl": [ - "05790c7d76d6e5f36b47fbf23615822b4a68c18a", + "e3afbd47db3b4d2c85a1e53599862b2cb273f828", "support" ], "interfaces/performance-timeline.idl": [ @@ -618146,7 +618487,7 @@ "support" ], "interfaces/service-workers.idl": [ - "2c9cbf6955e7f267a098b7b2562aeebf8378ad7d", + "ed02af117172c654ec41b45281803e3c4d5441f4", "support" ], "interfaces/shape-detection-api.idl": [ @@ -618242,11 +618583,11 @@ "support" ], "interfaces/webrtc-stats.idl": [ - "ee5cce403f8d325b73661f45b65bd09f5faae861", + "4df720a0fc183389be33d4c3fa7089e70e9e1543", "support" ], "interfaces/webrtc.idl": [ - "c06e91e6de7b1f44e5f92e2c8eb1d0fabb792b7d", + "c4ca910d6d18bf8c8d817c76deacb03a74cef59e", "support" ], "interfaces/webusb.idl": [ @@ -620066,7 +620407,7 @@ "support" ], "mimesniff/mime-types/resources/mime-types.json": [ - "1d0b1528892b66d944724c26f0bac5ace9ed4364", + "8918b355bf5a4f287904834a14378be94eb26dca", "support" ], "mixed-content/META.yml": [ @@ -630010,7 +630351,7 @@ "testharness" ], "payment-request/MerchantValidationEvent/constructor.https.html": [ - "952c0f734a30f170964053bb00e55225d57cce0b", + "ec8a4ff1ed0925a354f2631d8459337e47ab079d", "testharness" ], "payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html": [ @@ -630473,6 +630814,10 @@ "0c4ccf9ad48d49c62b3d138845dfa3ac631a8e4e", "manual" ], + "pointerevents/extension/pointerevent_pointerrawmove_in_pointerlock-manual.html": [ + "30fff15bd92f536de826b7ef98419b6a30284d41", + "manual" + ], "pointerevents/extension/pointerevent_touch-action-pan-down-css_touch-manual.html": [ "592139f9f41abb2a3fe6bf1b99af87d1c5e651f3", "manual" @@ -630518,11 +630863,11 @@ "manual" ], "pointerevents/pointerevent_capture_mouse-manual.html": [ - "c4c7bc8c7c435c81780be86a21e1653835e2e79c", + "ee31e225722a2c9af1bfffef3b6746e12510cd2c", "manual" ], "pointerevents/pointerevent_capture_suppressing_mouse-manual.html": [ - "763e17916e9fd2d7f200679658cf65120f1d72c9", + "127b07a9ee0c36004e2a5c1113b01c18633672d4", "manual" ], "pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html": [ @@ -630554,11 +630899,11 @@ "manual" ], "pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html": [ - "ca305f74f78114b4fbecfe70b0c8c76979f8cf0e", + "f4fe2b424e6e837a1e0e1ea625ede17619e797b4", "manual" ], "pointerevents/pointerevent_lostpointercapture_is_first-manual.html": [ - "e446d1844295684df3bbea03e82c02aef12c4957", + "9e460b872e22474f7aa897b9295299d405c2931f", "manual" ], "pointerevents/pointerevent_multiple_primary_pointers_boundary_events-manual.html": [ @@ -630634,11 +630979,11 @@ "manual" ], "pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html": [ - "105e3b5a9740ef38fe2c9b77704694db3894a4f4", + "497840041f6b6f67326bede1fbfef442f403f7b7", "manual" ], "pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html": [ - "df515436c057d81b221f0f7c08b195f432fd75a0", + "24fe40d5834b71247d19ce9aa0d35ceb74ca52fa", "manual" ], "pointerevents/pointerevent_releasepointercapture_release_right_after_capture-manual.html": [ @@ -630670,7 +631015,7 @@ "manual" ], "pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html": [ - "bc3195127279fca7685c1702664bffc73b54d99d", + "bc1bb93c7168764dd8d1ae7ea96fdc1cf3c0add7", "manual" ], "pointerevents/pointerevent_setpointercapture_to_same_element_twice-manual.html": [ @@ -630682,7 +631027,7 @@ "support" ], "pointerevents/pointerevent_support.js": [ - "bf68f85fe08cba9043ce8d201392417087e9b905", + "5c35e016a0ed51353868e0307af0896c62db64de", "support" ], "pointerevents/pointerevent_suppress_compat_events_on_click-manual.html": [ @@ -630809,6 +631154,10 @@ "ab33560b35216ea0976d1c037650122d9336ae39", "support" ], + "pointerevents/resources/pointerevent_pointerrawmove_in_pointerlock-iframe.html": [ + "505fc2cae40b80612fdd67ba98918aafad2f1b0a", + "support" + ], "pointerlock/META.yml": [ "bb639b4417ef4975e0f5a1649d010f6a7565e87c", "support" @@ -631149,9 +631498,13 @@ "52aa8c55328c7b9226581779793955b62b4d5126", "testharness" ], - "presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html": [ - "390e42eae771f50f6f2a82bd87169ad31b162420", - "testharness" + "presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html": [ + "211e8a01058cdc4c1e4756edcd21cb6369875f25", + "manual" + ], + "presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html": [ + "41cb360bb1d330181652e9a38eeb2b21cc5ad634", + "manual" ], "presentation-api/controlling-ua/reconnectToPresentation_sandboxing_success.https.html": [ "96505aca05be3902255830080264ebda90b442da", @@ -631161,6 +631514,10 @@ "7521b4fd23c8e3362d4e576b0f1b4253f6c2a4fc", "manual" ], + "presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html": [ + "0268bd87e8fd41a32f20abf096855ca42bc595aa", + "manual" + ], "presentation-api/controlling-ua/startNewPresentation_displaynotallowed-manual.https.html": [ "73570d50f03fe091a437b02f4345a80e0e0c1265", "manual" @@ -645801,6 +646158,14 @@ "e4741b7fc6f450a5038f99c1b3de15ae4f5b0db0", "manual" ], + "speech-api/SpeechSynthesis-pause-resume.tentative.html": [ + "a7aa2bbf6fa25fec45845b1b08801148649fc4a2", + "testharness" + ], + "speech-api/SpeechSynthesis-speak-events.html": [ + "babfe3c388e92aee8c4e6ea62cd3c038eb5bcb2d", + "testharness" + ], "speech-api/SpeechSynthesis-speak-ownership.html": [ "f2121fc561de1f25a4de27372ca42a2b1e97a10a", "testharness" @@ -645809,10 +646174,6 @@ "3e0388b9cf37cae2075380faf48414a48b4092e9", "testharness" ], - "speech-api/SpeechSynthesis-speak-with-activation-succeeds.html": [ - "55dec5c123ff6384e6a30694c6a9fb6b27bc5b51", - "testharness" - ], "speech-api/SpeechSynthesis-speak-without-activation-fails.tentative.html": [ "acf0d7d575b5dc7f9b348d82b056aa90089b6639", "testharness" @@ -650510,7 +650871,7 @@ "support" ], "tools/ci/jobs.py": [ - "6f3f64560167fa5ff4f8242082e62ec7bfb62608", + "97504dc8d9c517358eee833eb27988b611ace87b", "support" ], "tools/ci/lib.sh": [ @@ -650538,7 +650899,7 @@ "support" ], "tools/ci/tests/test_jobs.py": [ - "e94f4b6830555e70fa1f86db42927cbce207de17", + "e888ad884a18f257008fe860f31f7892b3bd39a3", "support" ], "tools/conftest.py": [ @@ -651690,7 +652051,7 @@ "support" ], "tools/serve/serve.py": [ - "e81ca26a7dad91dc2d65781dd55300b864050c7c", + "f9dde38bd567ca88e4908475d3796a8815dc6b0f", "support" ], "tools/serve/test_functional.py": [ @@ -656665,6 +657026,10 @@ "a284b2f83550b1b0e4cf7c79e7a200791ae8c70a", "testharness" ], + "trusted-types/Element-setAttributeNS.tentative.html": [ + "80128cfbf0ebce7d878dd349fc8838b2a6469a16", + "testharness" + ], "trusted-types/HTMLElement-generic.tentative.html": [ "2d38104511879943a4d538c9dc5b0031d7596b23", "testharness" @@ -656737,6 +657102,10 @@ "52e317083316435ec4b1dcc7331f1216c2a32d9a", "testharness" ], + "trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html": [ + "5a72992100ced1ae73766f147e29fa0afa6c8334", + "testharness" + ], "trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html": [ "f31fce629bccd342ff5e8dfacd43e13faac6fced", "testharness" @@ -656766,7 +657135,7 @@ "testharness" ], "trusted-types/support/helper.sub.js": [ - "1ad5b4ef0c68a1ffde111db62c5e2aa4957732b6", + "75874e5b3c2ed90f0ebfbfca2da701d027d2d832", "support" ], "uievents/META.yml": [ @@ -660385,10 +660754,6 @@ "6326d00dfb78efefd8a179e87dc53b531584895d", "testharness" ], - "webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html": [ - "f0c8e42044b6aa4c6ed32b6c65d73550c91abf73", - "testharness" - ], "webaudio/the-audio-api/the-iirfilternode-interface/ctor-iirfilter.html": [ "e884d487af8fc89b6b162177c7402eac692c02e3", "testharness" diff --git a/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_frames.tentative.https.html.ini b/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_frames.tentative.https.html.ini new file mode 100644 index 000000000000..15514ee27552 --- /dev/null +++ b/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_frames.tentative.https.html.ini @@ -0,0 +1,10 @@ +[cookieStore_get_set_across_frames.tentative.https.html] + [Async Cookies: cookieStore basic API across frames] + expected: FAIL + + [cookieStore.get() sees cookieStore.set() in frame] + expected: FAIL + + [cookieStore.get() in frame sees cookieStore.set()] + expected: FAIL + diff --git a/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html.ini b/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html.ini new file mode 100644 index 000000000000..efd1b5440caa --- /dev/null +++ b/testing/web-platform/meta/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html.ini @@ -0,0 +1,14 @@ +[cookieStore_get_set_across_origins.tentative.sub.https.html] + expected: TIMEOUT + [cookieStore.set in cross-origin iframe] + expected: TIMEOUT + + [cookieStore.set in main window] + expected: NOTRUN + + [cookieStore.get() in cross-origin frame sees cookieStore.set()] + expected: NOTRUN + + [cookieStore.get() sees cookieStore.set() in cross-origin frame] + expected: TIMEOUT + diff --git a/testing/web-platform/meta/cookie-store/idlharness_serviceworker.tentative.https.html.ini b/testing/web-platform/meta/cookie-store/idlharness_serviceworker.tentative.https.html.ini index 03014b2462bb..0c4500ccb9e9 100644 --- a/testing/web-platform/meta/cookie-store/idlharness_serviceworker.tentative.https.html.ini +++ b/testing/web-platform/meta/cookie-store/idlharness_serviceworker.tentative.https.html.ini @@ -308,9 +308,6 @@ [CookieChangeEvent interface: existence and properties of interface prototype object] expected: FAIL - [CookieChangeEvent interface: existence and properties of interface object] - expected: FAIL - [CookieChangeEvent interface: attribute deleted] expected: FAIL diff --git a/testing/web-platform/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini b/testing/web-platform/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini new file mode 100644 index 000000000000..cf18d139fbb4 --- /dev/null +++ b/testing/web-platform/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini @@ -0,0 +1,3 @@ +[vh_not_refreshing_on_chrome.html] + expected: + if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT diff --git a/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini b/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini new file mode 100644 index 000000000000..3670532658f0 --- /dev/null +++ b/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini @@ -0,0 +1,217 @@ +[getComputedStyle-insets-absolute.html] + [horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + diff --git a/testing/web-platform/meta/css/cssom/getComputedStyle-insets-fixed.html.ini b/testing/web-platform/meta/css/cssom/getComputedStyle-insets-fixed.html.ini new file mode 100644 index 000000000000..829a2583f927 --- /dev/null +++ b/testing/web-platform/meta/css/cssom/getComputedStyle-insets-fixed.html.ini @@ -0,0 +1,217 @@ +[getComputedStyle-insets-fixed.html] + [horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [vertical-rl ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + + [horizontal-tb ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained] + expected: FAIL + diff --git a/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.ini b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.ini new file mode 100644 index 000000000000..43247c181fda --- /dev/null +++ b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.ini @@ -0,0 +1,12 @@ +[lazyload-disabled-tentative.sub.html] + [Sanity-check: Contents do not load immediately (no eager-loading) when the lazyload attribute is 'on' and frame is in viewport.] + expected: FAIL + + [When 'lazyload' feature is disabled, a frame cannot avoid lazyloading by setting 'lazyload' attribute to 'off'] + expected: + if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS + if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS + if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS + if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS + if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS + diff --git a/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini new file mode 100644 index 000000000000..fb4898af29f8 --- /dev/null +++ b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini @@ -0,0 +1,4 @@ +[lazyload-enabled-tentative.sub.html] + [Sanity-check: Contents do not load immediately (no eager-loading) when the lazyload attribute is 'on' and frame is in viewport.] + expected: FAIL + diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html.ini deleted file mode 100644 index dc74f79f0961..000000000000 --- a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/window-name-after-cross-origin-sub-frame-navigation.sub.html.ini +++ /dev/null @@ -1,7 +0,0 @@ -[window-name-after-cross-origin-sub-frame-navigation.sub.html] - expected: - if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT - [Test that the window name is correct] - expected: - if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): NOTRUN - diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini index f359ff31deee..6193009d92b7 100644 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini +++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-fetch-error.sub.html.ini @@ -1,8 +1,3 @@ [dynamic-imports-fetch-error.sub.html] - expected: ERROR [import(): error cases occuring during fetching] expected: FAIL - - [import() must reject when there is a wrong MIME type] - expected: FAIL - diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini index 299b4adaadfa..583778f32a41 100644 --- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini +++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error.html.ini @@ -1,8 +1,3 @@ [dynamic-imports-script-error.html] - expected: ERROR [import(): error cases caused by the imported module script] expected: FAIL - - [import() must reject when there is a parse error] - expected: FAIL - diff --git a/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini b/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini index d5065b8758be..f9c02581b40f 100644 --- a/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini +++ b/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini @@ -20,3 +20,6 @@ [text/html;charset= ";charset=GBK] expected: FAIL + [text/html;charset="";charset=GBK] + expected: FAIL + diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync index 7911ce96e7f0..da819d02c353 100644 --- a/testing/web-platform/meta/mozilla-sync +++ b/testing/web-platform/meta/mozilla-sync @@ -1,2 +1,2 @@ -local: 7b73d44e05e6e1af97216ff07d243db56599adb0 -upstream: 9a16eee96e7fb06c7ca05899436e35c957e676d8 +local: 833ee67b39e7d2105b2c8317fd1b7f548d25a64c +upstream: 5051858e95936197d354cc18ea88365cb9d3e690 diff --git a/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini b/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini new file mode 100644 index 000000000000..4943759bbd29 --- /dev/null +++ b/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini @@ -0,0 +1,5 @@ +[nav2_test_document_open.html] + [Navigation Timing 2 WPT] + expected: + if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL + diff --git a/testing/web-platform/meta/payment-request/MerchantValidationEvent/constructor.https.html.ini b/testing/web-platform/meta/payment-request/MerchantValidationEvent/constructor.https.html.ini index 57facfc29f65..5f0f8e64694a 100644 --- a/testing/web-platform/meta/payment-request/MerchantValidationEvent/constructor.https.html.ini +++ b/testing/web-platform/meta/payment-request/MerchantValidationEvent/constructor.https.html.ini @@ -20,3 +20,15 @@ [Must throw TypeError if initialized with an invalid URL.] expected: FAIL + [When no methodName is passed, methodName attribute defaults to the empty string] + expected: FAIL + + [MerchantValidationEvent can be constructed with valid PMIs] + expected: FAIL + + [MerchantValidationEvent can't be constructed with invalid PMIs] + expected: FAIL + + [Must have a methodName IDL attribute, which is initialized with to the methodName dictionary value.] + expected: FAIL + diff --git a/testing/web-platform/meta/payment-request/idlharness.https.window.js.ini b/testing/web-platform/meta/payment-request/idlharness.https.window.js.ini index e596fd45e069..a0cafd190b24 100644 --- a/testing/web-platform/meta/payment-request/idlharness.https.window.js.ini +++ b/testing/web-platform/meta/payment-request/idlharness.https.window.js.ini @@ -317,3 +317,9 @@ [PaymentRequest interface: paymentRequest must inherit property "onmerchantvalidation" with the proper type] expected: FAIL + [MerchantValidationEvent interface: attribute methodName] + expected: FAIL + + [MerchantValidationEvent interface: new MerchantValidationEvent("merchantvalidation") must inherit property "methodName" with the proper type] + expected: FAIL + diff --git a/testing/web-platform/meta/payment-request/interfaces.https.html.ini b/testing/web-platform/meta/payment-request/interfaces.https.html.ini index fe4c28efe6a5..189f3621e09f 100644 --- a/testing/web-platform/meta/payment-request/interfaces.https.html.ini +++ b/testing/web-platform/meta/payment-request/interfaces.https.html.ini @@ -408,3 +408,6 @@ [PaymentRequest interface: attribute onmerchantvalidation] expected: FAIL + [MerchantValidationEvent interface: attribute methodName] + expected: FAIL + diff --git a/testing/web-platform/meta/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html.ini b/testing/web-platform/meta/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html.ini deleted file mode 100644 index 9f447182c054..000000000000 --- a/testing/web-platform/meta/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[reconnectToPresentation_notfound_error.https.html] - [Calling "reconnect" with an unknown presentation ID fails with a NotFoundError exception] - expected: FAIL - diff --git a/testing/web-platform/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini deleted file mode 100644 index e236bdd19279..000000000000 --- a/testing/web-platform/meta/service-workers/service-worker/ServiceWorkerGlobalScope/update.https.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[update.https.html] - [Update a registration on ServiceWorkerGlobalScope] - expected: - if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL - diff --git a/testing/web-platform/meta/speech-api/SpeechSynthesis-pause-resume.tentative.html.ini b/testing/web-platform/meta/speech-api/SpeechSynthesis-pause-resume.tentative.html.ini new file mode 100644 index 000000000000..a4bf55f7fe5f --- /dev/null +++ b/testing/web-platform/meta/speech-api/SpeechSynthesis-pause-resume.tentative.html.ini @@ -0,0 +1,2 @@ +[SpeechSynthesis-pause-resume.tentative.html] + disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1491069 diff --git a/testing/web-platform/meta/subresource-integrity/idlharness.window.js.ini b/testing/web-platform/meta/subresource-integrity/idlharness.window.js.ini deleted file mode 100644 index ffcb26af6f89..000000000000 --- a/testing/web-platform/meta/subresource-integrity/idlharness.window.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[idlharness.window.html] - [webappsec-subresource-integrity interfaces] - expected: FAIL - diff --git a/testing/web-platform/meta/trusted-types/Element-setAttributeNS.tentative.html.ini b/testing/web-platform/meta/trusted-types/Element-setAttributeNS.tentative.html.ini new file mode 100644 index 000000000000..2edda061a920 --- /dev/null +++ b/testing/web-platform/meta/trusted-types/Element-setAttributeNS.tentative.html.ini @@ -0,0 +1,13 @@ +[Element-setAttributeNS.tentative.html] + [Element.setAttributeNS assigned via policy (successful URL transformation)] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful ScriptURL transformation)] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful HTML transformation)] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful Script transformation)] + expected: FAIL + diff --git a/testing/web-platform/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html.ini b/testing/web-platform/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html.ini new file mode 100644 index 000000000000..8a4b13a66175 --- /dev/null +++ b/testing/web-platform/meta/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html.ini @@ -0,0 +1,19 @@ +[block-string-assignment-to-Element-setAttributeNS.tentative.html] + [Element.setAttributeNS assigned via policy (successful URL transformation)] + expected: FAIL + + [`Element.setAttributeNS = string` throws] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful HTML transformation)] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful ScriptURL transformation)] + expected: FAIL + + [`Element.setAttributeNS = null` throws] + expected: FAIL + + [Element.setAttributeNS assigned via policy (successful Script transformation)] + expected: FAIL + diff --git a/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini b/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini index 5f94510016c9..2baea2f9c3b5 100644 --- a/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini +++ b/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini @@ -599,3 +599,9 @@ [RTCErrorEvent interface: existence and properties of interface prototype object] expected: FAIL + [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "address" with the proper type] + expected: FAIL + + [RTCIceCandidate interface: attribute address] + expected: FAIL + diff --git a/testing/web-platform/meta/x-frame-options/deny.sub.html.ini b/testing/web-platform/meta/x-frame-options/deny.sub.html.ini deleted file mode 100644 index 435ecf4f7132..000000000000 --- a/testing/web-platform/meta/x-frame-options/deny.sub.html.ini +++ /dev/null @@ -1,7 +0,0 @@ -[deny.sub.html] - [`XFO: DENY` blocks same-origin framing.] - expected: FAIL - - [`XFO: DENY` blocks cross-origin framing.] - expected: FAIL - diff --git a/testing/web-platform/meta/x-frame-options/multiple.sub.html.ini b/testing/web-platform/meta/x-frame-options/multiple.sub.html.ini deleted file mode 100644 index b9d23432df90..000000000000 --- a/testing/web-platform/meta/x-frame-options/multiple.sub.html.ini +++ /dev/null @@ -1,16 +0,0 @@ -[multiple.sub.html] - [`XFO: SAMEORIGIN; XFO: DENY` blocks same-origin framing.] - expected: FAIL - - [`XFO: DENY; XFO: SAMEORIGIN` blocks same-origin framing.] - expected: FAIL - - [`XFO: INVALID; XFO: SAMEORIGIN` blocks same-origin framing.] - expected: FAIL - - [`XFO: SAMEORIGIN; XFO: INVALID` blocks same-origin framing.] - expected: FAIL - - [`XFO: SAMEORIGIN; XFO: SAMEORIGIN` blocks cross-origin framing.] - expected: FAIL - diff --git a/testing/web-platform/meta/x-frame-options/sameorigin.sub.html.ini b/testing/web-platform/meta/x-frame-options/sameorigin.sub.html.ini deleted file mode 100644 index 1238f00dbf53..000000000000 --- a/testing/web-platform/meta/x-frame-options/sameorigin.sub.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[sameorigin.sub.html] - [`XFO: SAMEORIGIN` blocks cross-origin framing.] - expected: FAIL - diff --git a/testing/web-platform/meta/xhr/overridemimetype-blob.html.ini b/testing/web-platform/meta/xhr/overridemimetype-blob.html.ini new file mode 100644 index 000000000000..bf14e97cbcf1 --- /dev/null +++ b/testing/web-platform/meta/xhr/overridemimetype-blob.html.ini @@ -0,0 +1,4 @@ +[overridemimetype-blob.html] + [32) MIME types need to be parsed and serialized: text/html;charset="";charset=GBK] + expected: FAIL + diff --git a/testing/web-platform/tests/accname/name_test_case_661-manual.html b/testing/web-platform/tests/accname/name_test_case_661-manual.html index e1f25ba7c662..2bb16f9ffc02 100644 --- a/testing/web-platform/tests/accname/name_test_case_661-manual.html +++ b/testing/web-platform/tests/accname/name_test_case_661-manual.html @@ -21,7 +21,7 @@ "property", "name", "is", - "foo bar baz" + "foo baz" ] ], "AXAPI" : [ @@ -29,7 +29,7 @@ "property", "AXDescription", "is", - "foo bar baz" + "foo baz" ] ], "IAccessible2" : [ @@ -37,7 +37,7 @@ "property", "accName", "is", - "foo bar baz" + "foo baz" ] ], "UIA" : [ @@ -45,7 +45,7 @@ "property", "Name", "is", - "foo bar baz" + "foo baz" ] ] }, diff --git a/testing/web-platform/tests/accname/name_test_case_662-manual.html b/testing/web-platform/tests/accname/name_test_case_662-manual.html index 4d69b0f1b57d..558756943814 100644 --- a/testing/web-platform/tests/accname/name_test_case_662-manual.html +++ b/testing/web-platform/tests/accname/name_test_case_662-manual.html @@ -21,7 +21,7 @@ "property", "name", "is", - "foo bar baz" + "foo baz" ] ], "AXAPI" : [ @@ -29,7 +29,7 @@ "property", "AXDescription", "is", - "foo bar baz" + "foo baz" ] ], "IAccessible2" : [ @@ -37,7 +37,7 @@ "property", "accName", "is", - "foo bar baz" + "foo baz" ] ], "UIA" : [ @@ -45,7 +45,7 @@ "property", "Name", "is", - "foo bar baz" + "foo baz" ] ] }, diff --git a/testing/web-platform/tests/accname/name_test_case_663a-manual.html b/testing/web-platform/tests/accname/name_test_case_663a-manual.html index 95ec2f857b7e..3fc3d17ccdf2 100644 --- a/testing/web-platform/tests/accname/name_test_case_663a-manual.html +++ b/testing/web-platform/tests/accname/name_test_case_663a-manual.html @@ -21,7 +21,7 @@ "property", "name", "is", - "foo bar baz" + "foo baz" ] ], "AXAPI" : [ @@ -29,7 +29,7 @@ "property", "AXDescription", "is", - "foo bar baz" + "foo baz" ] ], "IAccessible2" : [ @@ -37,7 +37,7 @@ "property", "accName", "is", - "foo bar baz" + "foo baz" ] ], "UIA" : [ @@ -45,7 +45,7 @@ "property", "Name", "is", - "foo bar baz" + "foo baz" ] ] }, diff --git a/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_frames.tentative.https.html b/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_frames.tentative.https.html new file mode 100644 index 000000000000..fe5c1f146058 --- /dev/null +++ b/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_frames.tentative.https.html @@ -0,0 +1,40 @@ + + +Async Cookies: cookieStore basic API across frames + + + + + + + diff --git a/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html b/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html new file mode 100644 index 000000000000..5cbe542e32b3 --- /dev/null +++ b/testing/web-platform/tests/cookie-store/cookieStore_get_set_across_origins.tentative.sub.https.html @@ -0,0 +1,63 @@ + + +Async Cookies: cookieStore basic API across origins + + + + + + + + diff --git a/testing/web-platform/tests/cookie-store/resources/helper_iframe.sub.html b/testing/web-platform/tests/cookie-store/resources/helper_iframe.sub.html new file mode 100644 index 000000000000..8e91cb7bed48 --- /dev/null +++ b/testing/web-platform/tests/cookie-store/resources/helper_iframe.sub.html @@ -0,0 +1,31 @@ + + + + diff --git a/testing/web-platform/tests/cookie-store/resources/helpers.js b/testing/web-platform/tests/cookie-store/resources/helpers.js new file mode 100644 index 000000000000..98f9ff6cb098 --- /dev/null +++ b/testing/web-platform/tests/cookie-store/resources/helpers.js @@ -0,0 +1,24 @@ +/** + * Promise based helper function who's return promise will resolve + * once the iframe src has been loaded + * @param {string} url the url to set the iframe src + * @param {test} t a test object to add a cleanup function to + * @return {Promise} when resolved, will return the iframe + */ +self.createIframe = (url, t) => new Promise(resolve => { + const iframe = document.createElement('iframe'); + iframe.addEventListener('load', () => {resolve(iframe);}, {once: true}); + iframe.src = url; + document.documentElement.appendChild(iframe); + t.add_cleanup(() => iframe.remove()); +}); + +/** + * Function that will return a promise that resolves when a message event + * is fired. Returns a promise that resolves to the message that was received + */ +self.waitForMessage = () => new Promise(resolve => { + window.addEventListener('message', event => { + resolve(event.data); + }, {once: true}); +}); diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-001.html b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-001.html new file mode 100644 index 000000000000..94c88bc49cb1 --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-001.html @@ -0,0 +1,19 @@ + + +CSS Containment Test: Layout containment independent formatting context + + + + + +

Test passes if it has the same output than the reference.

+
+
+
This text should have 2em top and bottom margins (margins do not collapse).
+
+
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-008.html b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-002.html similarity index 51% rename from testing/web-platform/tests/css/css-contain/contain-layout-008.html rename to testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-002.html index d442bebb065d..a7e8baed56db 100644 --- a/testing/web-platform/tests/css/css-contain/contain-layout-008.html +++ b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-002.html @@ -3,27 +3,17 @@ CSS Containment Test: Layout containment independent formatting context - - + + -

Test passes if on the first two boxes the top and bottom margins of the text line are double size than on the last box.

-
-
-
This text should have 2em top and bottom margins (margins do not collapse).
-
-
+

Test passes if it has the same output than the reference.

This text should have 2em top and bottom margins (margins do not collapse).
-
- -
This text should have 1em top and bottom margins.
- -
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-003.html b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-003.html new file mode 100644 index 000000000000..a10afd3cdee9 --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/contain-layout-independent-formatting-context-003.html @@ -0,0 +1,19 @@ + + +CSS Containment Test: Layout containment independent formatting context + + + + + +

Test passes if it has the same output than the reference.

+
+ +
This text should have 1em top and bottom margins.
+ +
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-001.html b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-001.html new file mode 100644 index 000000000000..e4c06a992b35 --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-001.html @@ -0,0 +1,19 @@ + + +CSS Containment Test: Paint containment independent formatting context + + + + + +

Test passes if it has the same output than the reference.

+
+
+
This text should have 2em top and bottom margins (margins do not collapse).
+
+
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-013.html b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-002.html similarity index 51% rename from testing/web-platform/tests/css/css-contain/contain-paint-013.html rename to testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-002.html index 3b6b3a76dc63..353196970c99 100644 --- a/testing/web-platform/tests/css/css-contain/contain-paint-013.html +++ b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-002.html @@ -3,27 +3,17 @@ CSS Containment Test: Paint containment independent formatting context - - + + -

Test passes if on the first two boxes the top and bottom margins of the text line are double size than on the last box.

-
-
-
This text should have 2em top and bottom margins (margins do not collapse).
-
-
+

Test passes if it has the same output than the reference.

This text should have 2em top and bottom margins (margins do not collapse).
-
- -
This text should have 1em top and bottom margins.
- -
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-003.html b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-003.html new file mode 100644 index 000000000000..fe1f7f2775db --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/contain-paint-independent-formatting-context-003.html @@ -0,0 +1,19 @@ + + +CSS Containment Test: Paint containment independent formatting context + + + + + +

Test passes if it has the same output than the reference.

+
+ +
This text should have 1em top and bottom margins.
+ +
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-013-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-013-ref.html deleted file mode 100644 index af758703a3b7..000000000000 --- a/testing/web-platform/tests/css/css-contain/reference/contain-paint-013-ref.html +++ /dev/null @@ -1,20 +0,0 @@ - - -CSS Containment Test: Reference file - - -

Test passes if on the first two boxes the top and bottom margins of the text line are double size than on the last box.

-
-
This text should have 2em top and bottom margins (margins do not collapse).
-
-
-
This text should have 2em top and bottom margins (margins do not collapse).
-
-
-
This text should have 1em top and bottom margins.
-
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html new file mode 100644 index 000000000000..08900b201b12 --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-001-ref.html @@ -0,0 +1,14 @@ + + +CSS Containment Test: Reference file + + +

Test passes if it has the same output than the reference.

+
+
This text should have 2em top and bottom margins (margins do not collapse).
+
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html new file mode 100644 index 000000000000..0cef592ba5cc --- /dev/null +++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-independent-formatting-context-003-ref.html @@ -0,0 +1,14 @@ + + +CSS Containment Test: Reference file + + +

Test passes if it has the same output than the reference.

+
+
This text should have 1em top and bottom margins.
+
diff --git a/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html b/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html new file mode 100644 index 000000000000..b6b6d245ab2f --- /dev/null +++ b/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-001.html @@ -0,0 +1,9 @@ + + + +

Test passes if there is a filled green square.

+
+
+
+
+
diff --git a/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html b/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html new file mode 100644 index 000000000000..a24556aa0ded --- /dev/null +++ b/testing/web-platform/tests/css/css-tables/percentages-grandchildren-quirks-mode-002.html @@ -0,0 +1,9 @@ + + + +

Test passes if there is a filled green square.

+
+
+
+
+
diff --git a/testing/web-platform/tests/css/css-transitions/historical.html b/testing/web-platform/tests/css/css-transitions/historical.html new file mode 100644 index 000000000000..8d0360a8ecf7 --- /dev/null +++ b/testing/web-platform/tests/css/css-transitions/historical.html @@ -0,0 +1,18 @@ + + +Historical CSS Transition features must be removed + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-absolute.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-absolute.html new file mode 100644 index 000000000000..196f5f26f31f --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-absolute.html @@ -0,0 +1,21 @@ + + +CSSOM: resolved values of the inset properties for absolute positioning + + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-fixed.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-fixed.html new file mode 100644 index 000000000000..e57e774fe6eb --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-fixed.html @@ -0,0 +1,21 @@ + + +CSSOM: resolved values of the inset properties for fixed positioning + + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-nobox.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-nobox.html new file mode 100644 index 000000000000..ca55ace7f4ed --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-nobox.html @@ -0,0 +1,18 @@ + + +CSSOM: resolved values of the inset properties when the element generates no box + + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-relative.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-relative.html new file mode 100644 index 000000000000..c48f2eb555ee --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-relative.html @@ -0,0 +1,19 @@ + + +CSSOM: resolved values of the inset properties for relative positioning + + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-static.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-static.html new file mode 100644 index 000000000000..854a8e3dba40 --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-static.html @@ -0,0 +1,19 @@ + + +CSSOM: resolved values of the inset properties for static positioning + + + + + + diff --git a/testing/web-platform/tests/css/cssom/getComputedStyle-insets-sticky.html b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-sticky.html new file mode 100644 index 000000000000..10520232d738 --- /dev/null +++ b/testing/web-platform/tests/css/cssom/getComputedStyle-insets-sticky.html @@ -0,0 +1,19 @@ + + +CSSOM: resolved values of the inset properties for sticky positioning + + + + + + diff --git a/testing/web-platform/tests/css/cssom/shorthand-serialization.html b/testing/web-platform/tests/css/cssom/shorthand-serialization.html index 44af6737e3ef..97e11da8b8a2 100644 --- a/testing/web-platform/tests/css/cssom/shorthand-serialization.html +++ b/testing/web-platform/tests/css/cssom/shorthand-serialization.html @@ -70,8 +70,17 @@ const testElem = document.getElementById("test"); testElem.style.setProperty("margin-top", "initial", "important"); assert_equals(testElem.style.margin, ""); - assert_equals(testElem.style.cssText, "margin-top: initial !important; margin-right: initial; margin-bottom: initial; margin-left: initial;"); }, "Shorthand serialization with 'initial' value, one longhand with important flag."); + + test(function() { + const testElem = document.getElementById("test"); + testElem.style.cssText = ""; + testElem.style.setProperty("margin-top", "initial"); + testElem.style.setProperty("margin-right", "initial"); + testElem.style.setProperty("margin-bottom", "initial"); + testElem.style.setProperty("margin-left", "initial", "important"); + assert_equals(testElem.style.margin, ""); + }, "Shorthand serialization with 'initial' value, longhands set individually, one with important flag."); diff --git a/testing/web-platform/tests/css/cssom/support/getComputedStyle-insets.js b/testing/web-platform/tests/css/cssom/support/getComputedStyle-insets.js new file mode 100644 index 000000000000..7bd34fe87a28 --- /dev/null +++ b/testing/web-platform/tests/css/cssom/support/getComputedStyle-insets.js @@ -0,0 +1,376 @@ +export const testEl = document.createElement("div"); +export const containerForInflow = document.createElement("div"); +export const containerForAbspos = document.createElement("div"); +export const containerForFixed = document.createElement("div"); + +testEl.id = "test"; +containerForInflow.id = "container-for-inflow"; +containerForAbspos.id = "container-for-abspos"; +containerForFixed.id = "container-for-fixed"; + +containerForInflow.appendChild(testEl); +containerForAbspos.appendChild(containerForInflow); +containerForFixed.appendChild(containerForAbspos); +document.body.appendChild(containerForFixed); + +const stylesheet = document.createElement("style"); +stylesheet.textContent = ` + #container-for-inflow { + /* Content area: 100px tall, 200px wide */ + height: 100px; + width: 200px; + padding: 1px 2px; + border-width: 2px 4px; + margin: 4px 8px; + overflow: hidden; + } + #container-for-abspos { + /* Padding area: 200px tall, 400px wide */ + height: 184px; + width: 368px; + padding: 8px 16px; + border-width: 16px 32px; + margin: 32px 64px; + position: relative; + } + #container-for-fixed { + /* Padding area: 300px tall, 600px wide */ + height: 172px; + width: 344px; + padding: 64px 128px; + border-width: 128px 256px; + margin: 256px 512px; + position: absolute; + transform: scale(1); + visibility: hidden; + } + [id ^= container] { + border-style: solid; + } +`; +document.head.appendChild(stylesheet); + +function runTestsWithWM(data, testWM, cbWM) { + const { + style, + containingBlockElement, + containingBlockArea, + preservesPercentages, + preservesAuto, + canStretchAutoSize, + staticPositionX, + staticPositionY, + } = data; + + let cbHeight = containingBlockElement ? containingBlockElement.clientHeight : NaN; + let cbWidth = containingBlockElement ? containingBlockElement.clientWidth : NaN; + if (containingBlockElement && containingBlockArea == "content") { + const cs = getComputedStyle(containingBlockElement); + cbHeight -= parseFloat(cs.paddingTop) + parseFloat(cs.paddingBottom); + cbWidth -= parseFloat(cs.paddingLeft) + parseFloat(cs.paddingRight); + } + + const staticPositionTop = cbWM.blockStart == "top" || cbWM.inlineStart == "top" + ? staticPositionY : cbHeight - staticPositionY; + const staticPositionLeft = cbWM.blockStart == "left" || cbWM.inlineStart == "left" + ? staticPositionX : cbWidth - staticPositionX; + const staticPositionBottom = cbWM.blockStart == "bottom" || cbWM.inlineStart == "bottom" + ? staticPositionY : cbHeight - staticPositionY; + const staticPositionRight = cbWM.blockStart == "right" || cbWM.inlineStart == "right" + ? staticPositionX : cbWidth - staticPositionX; + + function serialize(declarations) { + return Object.entries(declarations).map(([p, v]) => `${p}: ${v}; `).join(""); + } + + function wmName(wm) { + return Object.values(wm.style).join(" "); + } + + function checkStyle(declarations, expected, msg) { + test(function() { + testEl.style.cssText = style + "; " + serialize({...declarations, ...testWM.style}); + if (containingBlockElement) { + containingBlockElement.style.cssText = serialize({...cbWM.style}); + } + const cs = getComputedStyle(testEl); + for (let [prop, value] of Object.entries(expected)) { + assert_equals(cs[prop], value, `'${prop}'`); + } + }, `${wmName(testWM)} inside ${wmName(cbWM)} - ${msg}`); + + testEl.style.cssText = ""; + if (containingBlockElement) { + containingBlockElement.style.cssText = ""; + } + } + + checkStyle({ + top: "1px", + left: "2px", + bottom: "3px", + right: "4px", + }, { + top: "1px", + left: "2px", + bottom: "3px", + right: "4px", + }, "Pixels resolve as-is"); + + checkStyle({ + top: "1em", + left: "2em", + bottom: "3em", + right: "4em", + "font-size": "10px", + }, { + top: "10px", + left: "20px", + bottom: "30px", + right: "40px", + }, "Relative lengths are absolutized into pixels"); + + if (preservesPercentages) { + checkStyle({ + top: "10%", + left: "25%", + bottom: "50%", + right: "75%", + }, { + top: "10%", + left: "25%", + bottom: "50%", + right: "75%", + }, "Percentages resolve as-is"); + } else { + checkStyle({ + top: "10%", + left: "25%", + bottom: "50%", + right: "75%", + }, { + top: .1 * cbHeight + "px", + left: .25 * cbWidth + "px", + bottom: .5 * cbHeight + "px", + right: .75 * cbWidth + "px", + }, "Percentages are absolutized into pixels"); + + checkStyle({ + top: "calc(10% - 1px)", + left: "calc(25% - 2px)", + bottom: "calc(50% - 3px)", + right: "calc(75% - 4px)", + }, { + top: .1 * cbHeight - 1 + "px", + left: .25 * cbWidth - 2 + "px", + bottom: .5 * cbHeight - 3 + "px", + right: .75 * cbWidth - 4 + "px", + }, "calc() is absolutized into pixels"); + } + + if (canStretchAutoSize) { + // Force overconstraintment by setting size or with insets that would result in + // negative size. Then the resolved value should be the computed one according to + // https://drafts.csswg.org/cssom/#resolved-value-special-case-property-like-top + + checkStyle({ + top: "1px", + left: "2px", + bottom: "3px", + right: "4px", + height: "0px", + width: "0px", + }, { + top: "1px", + left: "2px", + bottom: "3px", + right: "4px", + }, "Pixels resolve as-is when overconstrained"); + + checkStyle({ + top: "100%", + left: "100%", + bottom: "100%", + right: "100%", + }, { + top: cbHeight + "px", + left: cbWidth + "px", + bottom: cbHeight + "px", + right: cbWidth + "px", + }, "Percentages absolutize the computed value when overconstrained"); + } + + if (preservesAuto) { + checkStyle({ + top: "auto", + left: "auto", + bottom: "3px", + right: "4px", + }, { + top: "auto", + left: "auto", + bottom: "3px", + right: "4px", + }, "If start side is 'auto' and end side is not, 'auto' resolves as-is"); + + checkStyle({ + top: "1px", + left: "2px", + bottom: "auto", + right: "auto", + }, { + top: "1px", + left: "2px", + bottom: "auto", + right: "auto", + }, "If end side is 'auto' and start side is not, 'auto' resolves as-is"); + + checkStyle({ + top: "auto", + left: "auto", + bottom: "auto", + right: "auto", + }, { + top: "auto", + left: "auto", + bottom: "auto", + right: "auto", + }, "If opposite sides are 'auto', they resolve as-is"); + } else if (canStretchAutoSize) { + checkStyle({ + top: "auto", + left: "auto", + bottom: "3px", + right: "4px", + }, { + top: cbHeight - 3 + "px", + left: cbWidth - 4 + "px", + bottom: "3px", + right: "4px", + }, "If start side is 'auto' and end side is not, 'auto' resolves to used value"); + + checkStyle({ + top: "1px", + left: "2px", + bottom: "auto", + right: "auto", + }, { + top: "1px", + left: "2px", + bottom: cbHeight - 1 + "px", + right: cbWidth - 2 + "px", + }, "If end side is 'auto' and start side is not, 'auto' resolves to used value"); + + checkStyle({ + top: "auto", + left: "auto", + bottom: "auto", + right: "auto", + }, { + top: staticPositionTop + "px", + left: staticPositionLeft + "px", + bottom: staticPositionBottom + "px", + right: staticPositionRight + "px", + }, "If opposite sides are 'auto', they resolve to used value"); + } else { + checkStyle({ + top: "auto", + left: "auto", + bottom: "3px", + right: "4px", + }, { + top: "-3px", + left: "-4px", + bottom: "3px", + right: "4px", + }, "If start side is 'auto' and end side is not, 'auto' resolves to used value"); + + checkStyle({ + top: "1px", + left: "2px", + bottom: "auto", + right: "auto", + }, { + top: "1px", + left: "2px", + bottom: "-1px", + right: "-2px", + }, "If end side is 'auto' and start side is not, 'auto' resolves to used value"); + + checkStyle({ + top: "auto", + left: "auto", + bottom: "auto", + right: "auto", + }, { + top: "0px", + left: "0px", + bottom: "0px", + right: "0px", + }, "If opposite sides are 'auto', they resolve to used value"); + } +} + +const writingModes = [{ + style: { + "writing-mode": "horizontal-tb", + "direction": "ltr", + }, + blockStart: "top", + blockEnd: "bottom", + inlineStart: "left", + inlineEnd: "right", +}, { + style: { + "writing-mode": "horizontal-tb", + "direction": "rtl", + }, + blockStart: "top", + blockEnd: "bottom", + inlineStart: "right", + inlineEnd: "left", +}, { + style: { + "writing-mode": "vertical-lr", + "direction": "ltr", + }, + blockStart: "left", + blockEnd: "right", + inlineStart: "top", + inlineEnd: "bottom", +}, { + style: { + "writing-mode": "vertical-lr", + "direction": "rtl", + }, + blockStart: "left", + blockEnd: "right", + inlineStart: "bottom", + inlineEnd: "top", +}, { + style: { + "writing-mode": "vertical-rl", + "direction": "ltr", + }, + blockStart: "right", + blockEnd: "left", + inlineStart: "top", + inlineEnd: "bottom", +}, { + style: { + "writing-mode": "vertical-rl", + "direction": "rtl", + }, + blockStart: "right", + blockEnd: "left", + inlineStart: "bottom", + inlineEnd: "top", +}]; + +export function runTests(data) { + for (let testWM of writingModes) { + for (let cbWM of writingModes) { + runTestsWithWM(data, testWM, cbWM); + } + } +} diff --git a/testing/web-platform/tests/custom-elements/parser/parser-custom-element-in-foreign-content.html b/testing/web-platform/tests/custom-elements/parser/parser-custom-element-in-foreign-content.html new file mode 100644 index 000000000000..2ae0f1309c62 --- /dev/null +++ b/testing/web-platform/tests/custom-elements/parser/parser-custom-element-in-foreign-content.html @@ -0,0 +1,28 @@ + +Custom Elements: Custom element in foreign content + + + + + + + + + + diff --git a/testing/web-platform/tests/docs/_writing-tests/lint-tool.md b/testing/web-platform/tests/docs/_writing-tests/lint-tool.md index d818f4b0b381..498df7f293d8 100644 --- a/testing/web-platform/tests/docs/_writing-tests/lint-tool.md +++ b/testing/web-platform/tests/docs/_writing-tests/lint-tool.md @@ -58,7 +58,7 @@ below to fix all errors reported. element whose `content` attribute has a malformed value; **fix**: ensure the value of the `content` attribute starts with `?` or `#` or is empty. -* **MISSING-LINK**: CSS test file is missing a link to a spec. **fix**: Ensure that there is a `` for the spec. +* **MISSING-LINK**: CSS test file is missing a link to a spec. **fix**: Ensure that there is a `` for the spec. * Note: `MISSING-LINK` is designed to ensure that the CSS build tool can find the tests. Note that the CSS build system is primarily used by [test.csswg.org/](http://test.csswg.org/), which doesn't use `wptserve`, so `*.any.js` and similar tests won't work there; stick with the `.html` equivalent. * **MISSING-TESTHARNESSREPORT**: Test file is missing an instance of diff --git a/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html new file mode 100644 index 000000000000..5b9034b63841 --- /dev/null +++ b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html @@ -0,0 +1,93 @@ + + + + + +
+ diff --git a/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.headers b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.headers new file mode 100644 index 000000000000..d0bac47e01a7 --- /dev/null +++ b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-disabled-tentative.sub.html.headers @@ -0,0 +1 @@ +Feature-Policy: lazyload 'none' diff --git a/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html new file mode 100644 index 000000000000..2e0a791f374c --- /dev/null +++ b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html @@ -0,0 +1,77 @@ + + + + + +
+ diff --git a/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.headers b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.headers new file mode 100644 index 000000000000..83b744e2bc4e --- /dev/null +++ b/testing/web-platform/tests/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.headers @@ -0,0 +1 @@ +Feature-Policy: lazyload * diff --git a/testing/web-platform/tests/feature-policy/experimental-features/resources/common.js b/testing/web-platform/tests/feature-policy/experimental-features/resources/common.js index 08d3aef98748..10c28be7741b 100644 --- a/testing/web-platform/tests/feature-policy/experimental-features/resources/common.js +++ b/testing/web-platform/tests/feature-policy/experimental-features/resources/common.js @@ -32,3 +32,29 @@ function onMessage(e) { } window.addEventListener("message", onMessage); + +// Waits for |load_timeout| before resolving the promise. It will resolve the +// promise sooner if a message event with |e.data.id| of |id| is received. +// In such a case the response is the contents of the message |e.data.contents|. +// Otherwise, returns false (when timeout occurs). +function waitForMessageOrTimeout(t, id, load_timeout) { + return new Promise((resolve) => { + window.addEventListener( + "message", + (e) => { + if (!e.data || e.data.id !== id) + return; + resolve(e.data.contents); + } + ); + t.step_timeout(() => { resolve(false); }, load_timeout); + }); +} + +function createIframe(container, attributes) { + var new_iframe = document.createElement("iframe"); + for (attr_name in attributes) + new_iframe.setAttribute(attr_name, attributes[attr_name]); + container.appendChild(new_iframe); + return new_iframe; +} diff --git a/testing/web-platform/tests/feature-policy/experimental-features/resources/lazyload-contents.html b/testing/web-platform/tests/feature-policy/experimental-features/resources/lazyload-contents.html new file mode 100644 index 000000000000..a6e98c24e6ad --- /dev/null +++ b/testing/web-platform/tests/feature-policy/experimental-features/resources/lazyload-contents.html @@ -0,0 +1,13 @@ + + +

This page is lazyloaded.

+ + diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html new file mode 100644 index 000000000000..563a2aa68d83 --- /dev/null +++ b/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-negative-margin.html @@ -0,0 +1,11 @@ + +fieldset border gap with negative margin + + +

There should be no red.

+
+ +
diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-ref.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html similarity index 100% rename from testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-ref.html rename to testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative-ref.html diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html similarity index 81% rename from testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html rename to testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html index 4d2269632c0e..1dbef479a9fd 100644 --- a/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap.html +++ b/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-gap-position-relative.html @@ -1,6 +1,6 @@ fieldset border gap - + + +

Click the button below and select the available presentation display, to start the manual test.

+

Click the button below and select the other available presentation display, to continue the manual test.

+

This test asks you to click the button twice, unless the test fails.
+This test requires two or more available displays.

+ + + + \ No newline at end of file diff --git a/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html b/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html new file mode 100644 index 000000000000..41cb360bb1d3 --- /dev/null +++ b/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html @@ -0,0 +1,61 @@ + + +Calling "reconnect" with a wrong presentation ID fails with a NotFoundError exception + + + + + + + + +

Click the button below to start the manual test. Select a presentation device after the selection dialog is prompted. + The test assumes that at least one presentation device is available. The test passes if a "PASS" result appears.

+ + + diff --git a/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html b/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html deleted file mode 100644 index 390e42eae771..000000000000 --- a/testing/web-platform/tests/presentation-api/controlling-ua/reconnectToPresentation_notfound_error.https.html +++ /dev/null @@ -1,16 +0,0 @@ - - -Calling "reconnect" with an unknown presentation ID fails with a NotFoundError exception - - - - - - - diff --git a/testing/web-platform/tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html b/testing/web-platform/tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html new file mode 100644 index 000000000000..0268bd87e8fd --- /dev/null +++ b/testing/web-platform/tests/presentation-api/controlling-ua/startMultiplePresentations_success-manual.https.html @@ -0,0 +1,99 @@ + + +Starting presentations on two distinct displays + + + + + + + +

Click the button below and select the available presentation display, to start the manual test.

+

Click the button below and select the other available presentation display, to continue the manual test.

+

This test asks you to click the button twice, unless the test fails.
+This test requires two or more available displays.

+ + + + \ No newline at end of file diff --git a/testing/web-platform/tests/speech-api/SpeechSynthesis-pause-resume.tentative.html b/testing/web-platform/tests/speech-api/SpeechSynthesis-pause-resume.tentative.html new file mode 100644 index 000000000000..a7aa2bbf6fa2 --- /dev/null +++ b/testing/web-platform/tests/speech-api/SpeechSynthesis-pause-resume.tentative.html @@ -0,0 +1,50 @@ + + + + + + + diff --git a/testing/web-platform/tests/speech-api/SpeechSynthesis-speak-with-activation-succeeds.html b/testing/web-platform/tests/speech-api/SpeechSynthesis-speak-events.html similarity index 59% rename from testing/web-platform/tests/speech-api/SpeechSynthesis-speak-with-activation-succeeds.html rename to testing/web-platform/tests/speech-api/SpeechSynthesis-speak-events.html index 55dec5c123ff..babfe3c388e9 100644 --- a/testing/web-platform/tests/speech-api/SpeechSynthesis-speak-with-activation-succeeds.html +++ b/testing/web-platform/tests/speech-api/SpeechSynthesis-speak-events.html @@ -7,9 +7,12 @@ diff --git a/testing/web-platform/tests/tools/ci/jobs.py b/testing/web-platform/tests/tools/ci/jobs.py index 6f3f64560167..97504dc8d9c5 100644 --- a/testing/web-platform/tests/tools/ci/jobs.py +++ b/testing/web-platform/tests/tools/ci/jobs.py @@ -35,11 +35,21 @@ job_path_map = { } +def _path_norm(path): + """normalize a path for both case and slashes (to /)""" + path = os.path.normcase(path) + if os.path.sep != "/": + # this must be after the normcase call as that does slash normalization + path = path.replace(os.path.sep, "/") + return path + + class Ruleset(object): def __init__(self, rules): self.include = [] self.exclude = [] for rule in rules: + rule = _path_norm(rule) self.add_rule(rule) def add_rule(self, rule): @@ -52,9 +62,7 @@ class Ruleset(object): target.append(re.compile("^%s" % rule)) def __call__(self, path): - if os.path.sep != "/": - path = path.replace(os.path.sep, "/") - path = os.path.normcase(path) + path = _path_norm(path) for item in self.exclude: if item.match(path): return False diff --git a/testing/web-platform/tests/tools/ci/tests/test_jobs.py b/testing/web-platform/tests/tools/ci/tests/test_jobs.py index e94f4b683055..e888ad884a18 100644 --- a/testing/web-platform/tests/tools/ci/tests/test_jobs.py +++ b/testing/web-platform/tests/tools/ci/tests/test_jobs.py @@ -1,14 +1,8 @@ -import sys - -import pytest - from tools.ci import jobs default_jobs = set(["lint", "manifest_upload"]) -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_testharness(): assert jobs.get_jobs(["resources/testharness.js"]) == default_jobs | set(["resources_unittest"]) assert jobs.get_jobs(["resources/testharness.js"], @@ -19,8 +13,6 @@ def test_testharness(): includes=["resources_unittest"]) == set() -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_stability(): assert jobs.get_jobs(["dom/historical.html"], includes=["stability"]) == set(["stability"]) @@ -51,8 +43,6 @@ def test_default(): assert jobs.get_jobs(["README.md"]) == default_jobs -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_tools_unittest(): assert jobs.get_jobs(["tools/ci/test/test_jobs.py"], includes=["tools_unittest"]) == set(["tools_unittest"]) @@ -62,8 +52,6 @@ def test_tools_unittest(): includes=["tools_unittest"]) == set() -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_wptrunner_unittest(): assert jobs.get_jobs(["tools/wptrunner/wptrunner/wptrunner.py"], includes=["wptrunner_unittest"]) == set(["wptrunner_unittest"]) @@ -71,8 +59,6 @@ def test_wptrunner_unittest(): includes=["wptrunner_unittest"]) == set() -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_build_css(): assert jobs.get_jobs(["css/css-build-testsuites.sh"], includes=["build_css"]) == set(["build_css"]) @@ -82,8 +68,6 @@ def test_build_css(): includes=["build_css"]) == set() -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_update_built(): assert jobs.get_jobs(["2dcontext/foo.html"], includes=["update_built"]) == set(["update_built"]) @@ -93,16 +77,12 @@ def test_update_built(): includes=["update_built"]) == set(["update_built"]) -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_wpt_integration(): assert jobs.get_jobs(["tools/wpt/wpt.py"], includes=["wpt_integration"]) == set(["wpt_integration"]) assert jobs.get_jobs(["tools/wptrunner/wptrunner/wptrunner.py"], includes=["wpt_integration"]) == set(["wpt_integration"]) -@pytest.mark.xfail(sys.platform == "win32", - reason="https://github.com/web-platform-tests/wpt/issues/12949") def test_wpt_infrastructure(): assert jobs.get_jobs(["tools/hammer.html"], includes=["wptrunner_infrastructure"]) == set(["wptrunner_infrastructure"]) diff --git a/testing/web-platform/tests/tools/serve/serve.py b/testing/web-platform/tests/tools/serve/serve.py index e81ca26a7dad..f9dde38bd567 100644 --- a/testing/web-platform/tests/tools/serve/serve.py +++ b/testing/web-platform/tests/tools/serve/serve.py @@ -19,7 +19,6 @@ from collections import defaultdict, OrderedDict from multiprocessing import Process, Event from localpaths import repo_root -from six.moves import reload_module from manifest.sourcefile import read_script_metadata, js_meta_re, parse_variants from wptserve import server as wptserve, handlers @@ -632,9 +631,12 @@ class WebSocketDaemon(object): def start_ws_server(host, port, paths, routes, bind_address, config, **kwargs): - # Ensure that when we start this in a new process we don't inherit the - # global lock in the logging module - reload_module(logging) + # Ensure that when we start this in a new process we have the global lock + # in the logging module unlocked + try: + logging._releaseLock() + except RuntimeError: + pass return WebSocketDaemon(host, str(port), repo_root, @@ -645,9 +647,12 @@ def start_ws_server(host, port, paths, routes, bind_address, config, **kwargs): def start_wss_server(host, port, paths, routes, bind_address, config, **kwargs): - # Ensure that when we start this in a new process we don't inherit the - # global lock in the logging module - reload_module(logging) + # Ensure that when we start this in a new process we have the global lock + # in the logging module unlocked + try: + logging._releaseLock() + except RuntimeError: + pass return WebSocketDaemon(host, str(port), repo_root, diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py index 04f2ce84a416..9f7ebfa2ca54 100644 --- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py +++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py @@ -220,13 +220,15 @@ class FirefoxBrowser(Browser): preferences = self.load_prefs() self.profile = FirefoxProfile(preferences=preferences) - self.profile.set_preferences({"marionette.port": self.marionette_port, - "dom.disable_open_during_load": False, - "network.dns.localDomains": ",".join(self.config.domains_set), - "network.proxy.type": 0, - "places.history.enabled": False, - "dom.send_after_paint_to_content": True, - "network.preload": True}) + self.profile.set_preferences({ + "marionette.port": self.marionette_port, + "network.dns.localDomains": ",".join(self.config.domains_set), + + # TODO: Remove preferences once Firefox 64 is stable (Bug 905404) + "network.proxy.type": 0, + "places.history.enabled": False, + "network.preload": True, + }) if self.e10s: self.profile.set_preferences({"browser.tabs.remote.autostart": True}) diff --git a/testing/web-platform/tests/trusted-types/Element-setAttributeNS.tentative.html b/testing/web-platform/tests/trusted-types/Element-setAttributeNS.tentative.html new file mode 100644 index 000000000000..80128cfbf0eb --- /dev/null +++ b/testing/web-platform/tests/trusted-types/Element-setAttributeNS.tentative.html @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html b/testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html new file mode 100644 index 000000000000..5a72992100ce --- /dev/null +++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html @@ -0,0 +1,35 @@ + + + + + + + + + + + diff --git a/testing/web-platform/tests/trusted-types/support/helper.sub.js b/testing/web-platform/tests/trusted-types/support/helper.sub.js index 1ad5b4ef0c68..75874e5b3c2e 100644 --- a/testing/web-platform/tests/trusted-types/support/helper.sub.js +++ b/testing/web-platform/tests/trusted-types/support/helper.sub.js @@ -126,3 +126,49 @@ function assert_element_accepts_non_trusted_type_explicit_set(tag, attribute, va elem.setAttribute(attribute, value); assert_equals(elem[attribute] + "", expected); } + +let namespace = 'http://www.w3.org/1999/xhtml'; +function assert_element_accepts_trusted_html_set_ns(win, c, t, tag, attribute, expected) { + let p = createHTML_policy(win, c); + let html = p.createHTML(INPUTS.HTML); + assert_element_accepts_trusted_type_set_ns(tag, attribute, html, expected); +} + +function assert_element_accepts_trusted_script_set_ns(win, c, t, tag, attribute, expected) { + let p = createScript_policy(win, c); + let script = p.createScript(INPUTS.SCRIPT); + assert_element_accepts_trusted_type_set_ns(tag, attribute, script, expected); +} + +function assert_element_accepts_trusted_script_url_set_ns(win, c, t, tag, attribute, expected) { + let p = createScriptURL_policy(win, c); + let scripturl = p.createScriptURL(INPUTS.SCRIPTURL); + assert_element_accepts_trusted_type_set_ns(tag, attribute, scripturl, expected); +} + +function assert_element_accepts_trusted_url_set_ns(win, c, t, tag, attribute, expected) { + let p = createURL_policy(win, c); + let url = p.createURL(INPUTS.URL); + assert_element_accepts_trusted_type_set_ns(tag, attribute, url, expected); +} + +function assert_element_accepts_trusted_type_set_ns(tag, attribute, value, expected) { + let elem = document.createElement(tag); + elem.setAttributeNS(namespace, attribute, value); + let attr_node = elem.getAttributeNodeNS(namespace, attribute); + assert_equals(attr_node.value + "", expected); +} + +function assert_throws_no_trusted_type_set_ns(tag, attribute, value) { + let elem = document.createElement(tag); + assert_throws(new TypeError(), _ => { + elem.setAttributeNS(namespace, attribute, value); + }); +} + +function assert_element_accepts_non_trusted_type_set_ns(tag, attribute, value, expected) { + let elem = document.createElement(tag); + elem.setAttributeNS(namespace, attribute, value); + let attr_node = elem.getAttributeNodeNS(namespace, attribute); + assert_equals(attr_node.value + "", expected); +} diff --git a/testing/web-platform/tests/webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html b/testing/web-platform/tests/webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html deleted file mode 100644 index f0c8e42044b6..000000000000 --- a/testing/web-platform/tests/webaudio/the-audio-api/the-gainnode-interface/test-gainnode.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - GainNode interface - - - - - - -
- - - diff --git a/testing/web-platform/tests/x-frame-options/multiple.sub.html b/testing/web-platform/tests/x-frame-options/multiple.sub.html index f7a28e40ee22..717e9fd25c51 100644 --- a/testing/web-platform/tests/x-frame-options/multiple.sub.html +++ b/testing/web-platform/tests/x-frame-options/multiple.sub.html @@ -49,29 +49,27 @@ var i = document.createElement('iframe'); i.src = "./support/xfo.py?value=INVALID&value2=SAMEORIGIN"; - assert_no_message_from(i, t); - - i.onload = t.step_func_done(_ => { - assert_equals(i.contentDocument, null); - i.remove(); - }); + wait_for_message_from(i, t) + .then(t.step_func_done(e => { + assert_equals(e.data, "Loaded"); + i.remove(); + })); document.body.appendChild(i); - }, "`XFO: INVALID; XFO: SAMEORIGIN` blocks same-origin framing."); + }, "`XFO: INVALID; XFO: SAMEORIGIN` allows same-origin framing."); async_test(t => { var i = document.createElement('iframe'); i.src = "./support/xfo.py?value=SAMEORIGIN&value2=INVALID"; - assert_no_message_from(i, t); - - i.onload = t.step_func_done(_ => { - assert_equals(i.contentDocument, null); - i.remove(); - }); + wait_for_message_from(i, t) + .then(t.step_func_done(e => { + assert_equals(e.data, "Loaded"); + i.remove(); + })); document.body.appendChild(i); - }, "`XFO: SAMEORIGIN; XFO: INVALID` blocks same-origin framing."); + }, "`XFO: SAMEORIGIN; XFO: INVALID` allows same-origin framing."); async_test(t => { var i = document.createElement('iframe'); diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.js b/toolkit/components/aboutperformance/content/aboutPerformance.js index f3cfb9aba75d..394d19195689 100644 --- a/toolkit/components/aboutperformance/content/aboutPerformance.js +++ b/toolkit/components/aboutperformance/content/aboutPerformance.js @@ -413,7 +413,8 @@ var State = { let counters = await ChromeUtils.requestPerformanceMetrics(); let tabs = {}; for (let counter of counters) { - let {items, host, windowId, duration, isWorker, isTopLevel} = counter; + let {items, host, pid, counterId, windowId, duration, isWorker, + isTopLevel} = counter; // If a worker has a windowId of 0 or max uint64, attach it to the // browser UI (doc group with id 1). if (isWorker && (windowId == 18446744073709552000 || !windowId)) @@ -436,8 +437,9 @@ var State = { } tab.dispatchCount += dispatchCount; tab.duration += duration; - if (!isTopLevel) { - tab.children.push({host, isWorker, dispatchCount, duration}); + if (!isTopLevel || isWorker) { + tab.children.push({host, isWorker, dispatchCount, duration, + counterId: pid + ":" + counterId}); } } @@ -577,7 +579,7 @@ var State = { // Temporarily set to false to avoid doing several lookups if a site has // several subframes on the same domain. this._trackingState.set(host, false); - if (host.startsWith("about:")) + if (host.startsWith("about:") || host.startsWith("moz-nullprincipal")) return false; let principal = @@ -598,14 +600,18 @@ var State = { // we do not maintain references to groups that has been removed // (e.g. pages that have been closed). - let oldestInBuffer = this._buffer[0].tabs; let previous = this._buffer[Math.max(this._buffer.length - 2, 0)].tabs; let current = this._latest.tabs; - return Object.keys(current).map(function(id) { + return Object.keys(current).map(id => { let tab = current[id]; - let oldest = oldestInBuffer[id]; + let oldest; + for (let index = 0; index <= this._buffer.length - 2; ++index) { + if (id in this._buffer[index].tabs) { + oldest = this._buffer[index].tabs[id]; + break; + } + } let prev = previous[id]; - let dispatches = tab.dispatchCount; let host = tab.host; let name = `${host} (${id})`; @@ -629,13 +635,67 @@ var State = { name = "Ghost windows"; } - return ({windowId: id, name, image, - totalDispatches: dispatches, - totalDuration: tab.duration, - durationSincePrevious: prev ? tab.duration - prev.duration : NaN, - dispatchesSincePrevious: prev ? dispatches - prev.dispatchCount : NaN, - dispatchesSinceStartOfBuffer: oldest ? dispatches - oldest.dispatchCount : NaN, - children: tab.children}); + // Create a map of all the child items from the previous time we read the + // counters, indexed by counterId so that we can quickly find the previous + // value for any subitem. + let prevChildren = new Map(); + if (prev) { + for (let child of prev.children) { + prevChildren.set(child.counterId, child); + } + } + // For each subitem, create a new object including the deltas since the previous time. + let children = tab.children.map(child => { + let {host, dispatchCount, duration, isWorker, counterId} = child; + + let dispatchesSincePrevious = dispatchCount; + let durationSincePrevious = duration; + if (prevChildren.has(counterId)) { + let prevCounter = prevChildren.get(counterId); + dispatchesSincePrevious -= prevCounter.dispatchCount; + durationSincePrevious -= prevCounter.duration; + prevChildren.delete(counterId); + } + + return {host, dispatchCount, duration, isWorker, + dispatchesSincePrevious, durationSincePrevious}; + }); + + // Any item that remains in prevChildren is a subitem that no longer + // exists in the current sample; remember the values of its counters + // so that the values don't go down for the parent item. + tab.dispatchesFromFormerChildren = prev && prev.dispatchesFromFormerChildren || 0; + tab.durationFromFormerChildren = prev && prev.durationFromFormerChildren || 0; + for (let [, counter] of prevChildren) { + tab.dispatchesFromFormerChildren += counter.dispatchCount; + tab.durationFromFormerChildren += counter.duration; + } + + // Create the object representing the counters of the parent item including + // the deltas from the previous times. + let dispatches = tab.dispatchCount + tab.dispatchesFromFormerChildren; + let duration = tab.duration + tab.durationFromFormerChildren; + let durationSincePrevious = NaN; + let dispatchesSincePrevious = NaN; + let dispatchesSinceStartOfBuffer = NaN; + let durationSinceStartOfBuffer = NaN; + if (prev) { + durationSincePrevious = + duration - prev.duration - (prev.durationFromFormerChildren || 0); + dispatchesSincePrevious = + dispatches - prev.dispatchCount - (prev.dispatchesFromFormerChildren || 0); + } + if (oldest) { + dispatchesSinceStartOfBuffer = + dispatches - oldest.dispatchCount - (oldest.dispatchesFromFormerChildren || 0); + durationSinceStartOfBuffer = + duration - oldest.duration - (oldest.durationFromFormerChildren || 0); + } + return ({id, name, image, + totalDispatches: dispatches, totalDuration: duration, + durationSincePrevious, dispatchesSincePrevious, + durationSinceStartOfBuffer, dispatchesSinceStartOfBuffer, + children}); }); }, }; @@ -936,26 +996,26 @@ var View = { tbody.appendChild(this._fragment); this._fragment = document.createDocumentFragment(); }, - appendRow(name, totalValue, recentValue, classes, image = "") { + appendRow(name, value, tooltip, classes, image = "") { let row = document.createElement("tr"); let elt = document.createElement("td"); elt.textContent = name; - row.appendChild(elt); if (image) elt.style.backgroundImage = `url('${image}')`; if (classes) elt.classList.add(...classes); - - elt = document.createElement("td"); - elt.textContent = totalValue; row.appendChild(elt); elt = document.createElement("td"); - elt.textContent = recentValue; + elt.textContent = value; row.appendChild(elt); + if (tooltip) + row.title = tooltip; + this._fragment.appendChild(row); + return row; }, }; @@ -963,6 +1023,30 @@ var Control = { init() { this._initAutorefresh(); this._initDisplayMode(); + let tbody = document.getElementById("dispatch-tbody"); + tbody.addEventListener("click", () => { + let row = event.target.parentNode; + if (this.selectedRow) { + this.selectedRow.removeAttribute("selected"); + } + if (row.windowId) { + row.setAttribute("selected", "true"); + this.selectedRow = row; + } else if (this.selectedRow) { + this.selectedRow = null; + } + }); + tbody.addEventListener("dblclick", () => { + let id = parseInt(event.target.parentNode.windowId); + if (isNaN(id)) + return; + let found = tabFinder.get(id); + if (!found || !found.tabbrowser) + return; + let {tabbrowser, tab} = found; + tabbrowser.selectedTab = tab; + tabbrowser.ownerGlobal.focus(); + }); }, async update() { let mode = this._displayMode; @@ -987,27 +1071,61 @@ var Control = { // Make sure that we do not keep obsolete stuff around. View.DOMCache.trimTo(state.deltas); } else { + + let selectedId = -1; + if (this.selectedRow) { + selectedId = this.selectedRow.windowId; + this.selectedRow = null; + } + let counters = this._sortCounters(State.getCounters()); - for (let {name, image, totalDispatches, dispatchesSincePrevious, + for (let {id, name, image, totalDispatches, dispatchesSincePrevious, totalDuration, durationSincePrevious, children} of counters) { + function dispatchesAndDuration(dispatches, duration) { let result = dispatches; if (duration) { duration /= 1000; duration = Math.round(duration); if (duration) - result += ` (${duration / 1000}s)`; + result += duration >= 1000 ? ` (${duration / 1000}s)` : ` (${duration}ms)`; else result += " (< 1ms)"; } return result; } - View.appendRow(name, - dispatchesAndDuration(totalDispatches, totalDuration), - dispatchesAndDuration(dispatchesSincePrevious, - durationSincePrevious), - null, image); - children.sort((a, b) => b.dispatchCount - a.dispatchCount); + + function formatTooltip(totalDispatches, totalDuration, + dispatchesSincePrevious, durationSincePrevious) { + return `${dispatchesAndDuration(totalDispatches, totalDuration)} dispatches since load\n` + + `${dispatchesAndDuration(dispatchesSincePrevious, durationSincePrevious)} in the last seconds`; + } + + let formatEnergyImpact = (dispatches, duration) => { + let energyImpact = this._computeEnergyImpact(dispatches, duration); + if (!energyImpact) + return "None"; + energyImpact = Math.ceil(energyImpact * 100) / 100; + if (energyImpact < 1) + return `Low (${energyImpact})`; + if (energyImpact < 25) + return `Medium (${energyImpact})`; + return `High (${energyImpact})`; + }; + + let row = + View.appendRow(name, + formatEnergyImpact(dispatchesSincePrevious, durationSincePrevious), + formatTooltip(totalDispatches, totalDuration, + dispatchesSincePrevious, durationSincePrevious), + null, image); + row.windowId = id; + if (id == selectedId) { + row.setAttribute("selected", "true"); + this.selectedRow = row; + } + + children.sort((a, b) => b.dispatchesSincePrevious - a.dispatchesSincePrevious); for (let row of children) { let host = row.host.replace(/^blob:https?:\/\//, ""); let classes = ["indent"]; @@ -1016,10 +1134,15 @@ var Control = { if (row.isWorker) classes.push("worker"); View.appendRow(row.host, - dispatchesAndDuration(row.dispatchCount, row.duration), - "", classes); + formatEnergyImpact(row.dispatchesSincePrevious, + row.durationSincePrevious), + formatTooltip(row.dispatchCount, row.duration, + row.dispatchesSincePrevious, + row.durationSincePrevious), + classes); } } + View.commit(); } @@ -1028,12 +1151,29 @@ var Control = { // Inform watchers Services.obs.notifyObservers(null, UPDATE_COMPLETE_TOPIC, mode); }, + _computeEnergyImpact(dispatches, duration) { + // 'Dispatches' doesn't make sense to users, and it's difficult to present + // two numbers in a meaningful way, so we need to somehow aggregate the + // dispatches and duration values we have. + // The current formula to aggregate the numbers assumes that the cost of + // a dispatch is equivalent to 1ms of CPU time. + // Dividing the result by the sampling interval and by 10 gives a number that + // looks like a familiar percentage to users, as fullying using one core will + // result in a number close to 100. + return Math.max(duration || 0, dispatches * 1000) / UPDATE_INTERVAL_MS / 10; + }, _sortCounters(counters) { return counters.sort((a, b) => { - if (a.dispatchesSinceStartOfBuffer != b.dispatchesSinceStartOfBuffer) - return b.dispatchesSinceStartOfBuffer - a.dispatchesSinceStartOfBuffer; - if (a.totalDispatches != b.totalDispatches) - return b.totalDispatches - a.totalDispatches; + // Note: _computeEnergyImpact uses UPDATE_INTERVAL_MS which doesn't match + // the time between the most recent sample and the start of the buffer, + // BUFFER_DURATION_MS would be better, but the values is never displayed + // so this is OK. + let aEI = this._computeEnergyImpact(a.dispatchesSinceStartOfBuffer, + a.durationSinceStartOfBuffer); + let bEI = this._computeEnergyImpact(b.dispatchesSinceStartOfBuffer, + b.durationSinceStartOfBuffer); + if (aEI != bEI) + return bEI - aEI; return a.name.localeCompare(b.name); }); }, diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.xhtml b/toolkit/components/aboutperformance/content/aboutPerformance.xhtml index f8ad7ca9027a..d9e0a5598265 100644 --- a/toolkit/components/aboutperformance/content/aboutPerformance.xhtml +++ b/toolkit/components/aboutperformance/content/aboutPerformance.xhtml @@ -108,6 +108,7 @@ } #dispatch-table { + -moz-user-select: none; font-size: 1em; border: 1px solid var(--in-content-box-border-color); border-radius: 2px; @@ -159,6 +160,14 @@ fill: #808080; } + #dispatch-tbody > tr[selected] > td { + background-color: var(--in-content-item-selected); + color: var(--in-content-selected-text); + } + #dispatch-tbody > tr:hover { + background-color: var(--in-content-item-hover); + } + .options { width: 100%; } @@ -192,8 +201,7 @@ Tab title - Dispatches and runtime since load - Dispatches in the last seconds + Energy Impact diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css index 30ff1c55c506..0c159865bae5 100644 --- a/toolkit/themes/osx/global/in-content/common.css +++ b/toolkit/themes/osx/global/in-content/common.css @@ -11,6 +11,7 @@ xul|tabs { } xul|tab[visuallyselected] { + color: inherit; text-shadow: none; } diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index c1c69191fb73..63936fb58fe9 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -104,7 +104,7 @@ xul|caption xul|label { xul|groupbox { -moz-appearance: none; border: none; - margin: 0; + margin: 0 0 32px; padding: 0; } @@ -134,6 +134,7 @@ xul|tabs { border-top: 1px solid var(--in-content-box-border-color); border-bottom: 1px solid var(--in-content-box-border-color); background-color: var(--in-content-page-background); + color: var(--in-content-tab-color); } xul|tab { @@ -141,7 +142,7 @@ xul|tab { margin-top: 0; padding: 4px 20px; min-height: 44px; - color: var(--in-content-tab-color); + color: inherit; background-color: var(--in-content-page-background); border-width: 0; /* !important overrides tabbox.css RTL and visuallyselected rules */ diff --git a/widget/android/nsNativeThemeAndroid.cpp b/widget/android/nsNativeThemeAndroid.cpp index a8164d13f6d7..e6cd9f9e51f9 100644 --- a/widget/android/nsNativeThemeAndroid.cpp +++ b/widget/android/nsNativeThemeAndroid.cpp @@ -313,9 +313,3 @@ nsNativeThemeAndroid::GetWidgetTransparency(nsIFrame* aFrame, WidgetType aWidget { return eUnknownTransparency; } - -already_AddRefed -NS_NewNativeTheme() -{ - return do_AddRef(new nsNativeThemeAndroid()); -} diff --git a/widget/android/nsWidgetFactory.cpp b/widget/android/nsWidgetFactory.cpp index e4462ab51a8b..ec0284ca4f9a 100644 --- a/widget/android/nsWidgetFactory.cpp +++ b/widget/android/nsWidgetFactory.cpp @@ -28,6 +28,7 @@ #include "nsToolkitCompsCID.h" #include "AndroidAlerts.h" +#include "nsNativeThemeAndroid.h" #include "mozilla/widget/ScreenManager.h" @@ -55,8 +56,29 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(AndroidAlerts) } } +static nsresult +nsNativeThemeAndroidConstructor(nsISupports *aOuter, REFNSIID aIID, + void **aResult) +{ + nsresult rv; + + if (aOuter) { + rv = NS_ERROR_NO_AGGREGATION; + return rv; + } + + *aResult = nullptr; + nsNativeThemeAndroid* inst = new nsNativeThemeAndroid(); + NS_ADDREF(inst); + rv = inst->QueryInterface(aIID, aResult); + NS_RELEASE(inst); + + return rv; +} + NS_DEFINE_NAMED_CID(NS_APPSHELL_CID); NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID); +NS_DEFINE_NAMED_CID(NS_THEMERENDERER_CID); NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID); @@ -74,6 +96,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { { &kNS_APPSHELL_CID, false, nullptr, nsAppShellConstructor }, { &kNS_SCREENMANAGER_CID, false, nullptr, ScreenManagerConstructor, mozilla::Module::MAIN_PROCESS_ONLY }, + { &kNS_THEMERENDERER_CID, false, nullptr, nsNativeThemeAndroidConstructor }, { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceAndroidConstructor }, { &kNS_TRANSFERABLE_CID, false, nullptr, nsTransferableConstructor }, { &kNS_CLIPBOARD_CID, false, nullptr, nsClipboardConstructor }, @@ -93,6 +116,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { { "@mozilla.org/widget/appshell/android;1", &kNS_APPSHELL_CID }, { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID, mozilla::Module::MAIN_PROCESS_ONLY }, + { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID }, { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID }, { "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID }, { "@mozilla.org/widget/clipboard;1", &kNS_CLIPBOARD_CID }, diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index cd8d590b2dd1..a0ddbca2e5e6 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -1945,24 +1945,6 @@ nsWindow::UpdateOverscrollOffset(const float aX, const float aY) } } -void -nsWindow::SetSelectionDragState(bool aState) -{ - MOZ_ASSERT(NS_IsMainThread()); - - if (!mLayerViewSupport) { - return; - } - - const auto& compositor = mLayerViewSupport->GetJavaCompositor(); - DispatchToUiThread( - "nsWindow::SetSelectionDragState", - [compositor = LayerSession::Compositor::GlobalRef(compositor), - aState] { - compositor->OnSelectionCaretDrag(aState); - }); -} - void * nsWindow::GetNativeData(uint32_t aDataType) { diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h index 9b4e9d86faf8..a9e3f8bff55c 100644 --- a/widget/android/nsWindow.h +++ b/widget/android/nsWindow.h @@ -268,7 +268,6 @@ public: const InputContextAction& aAction) override; virtual InputContext GetInputContext() override; - void SetSelectionDragState(bool aState); LayerManager* GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr, LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE, LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT) override; diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 5bca3d607084..8c332bb51cde 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -3942,7 +3942,7 @@ nsNativeThemeCocoa::CreateWebRenderCommandsForWidget(mozilla::wr::DisplayListBui wr::BorderRadius borderRadius = wr::EmptyBorderRadius(); float borderWidth = presContext->CSSPixelsToDevPixels(1.0f); - wr::BorderWidths borderWidths = + wr::LayoutSideOffsets borderWidths = wr::ToBorderWidths(borderWidth, borderWidth, borderWidth, borderWidth); mozilla::Range wrsides(side, 4); @@ -3965,7 +3965,7 @@ nsNativeThemeCocoa::CreateWebRenderCommandsForWidget(mozilla::wr::DisplayListBui wr::BorderRadius borderRadius = wr::EmptyBorderRadius(); float borderWidth = presContext->CSSPixelsToDevPixels(1.0f); - wr::BorderWidths borderWidths = + wr::LayoutSideOffsets borderWidths = wr::ToBorderWidths(borderWidth, borderWidth, borderWidth, borderWidth); mozilla::Range wrsides(side, 4); @@ -4971,9 +4971,3 @@ nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, WidgetType aWidgetTy return eUnknownTransparency; } } - -already_AddRefed -NS_NewNativeTheme() -{ - return do_AddRef(new nsNativeThemeCocoa()); -} diff --git a/widget/cocoa/nsWidgetFactory.mm b/widget/cocoa/nsWidgetFactory.mm index 35e7cd585273..387665c0af6d 100644 --- a/widget/cocoa/nsWidgetFactory.mm +++ b/widget/cocoa/nsWidgetFactory.mm @@ -82,6 +82,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(OSXNotificationCenter, Init) #include "nsMenuBarX.h" NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeMenuServiceX) +#include "nsNativeThemeCocoa.h" +NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeCocoa) + #include "nsMacDockSupport.h" NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacDockSupport) @@ -114,6 +117,7 @@ NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID); NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID); +NS_DEFINE_NAMED_CID(NS_THEMERENDERER_CID); NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID); NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID); NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID); @@ -144,6 +148,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { { &kNS_CLIPBOARDHELPER_CID, false, NULL, nsClipboardHelperConstructor }, { &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor, mozilla::Module::MAIN_PROCESS_ONLY }, + { &kNS_THEMERENDERER_CID, false, NULL, nsNativeThemeCocoaConstructor }, { &kNS_SCREENMANAGER_CID, false, NULL, ScreenManagerConstructor, mozilla::Module::MAIN_PROCESS_ONLY }, { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecXConstructor }, @@ -177,6 +182,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { { "@mozilla.org/widget/clipboardhelper;1", &kNS_CLIPBOARDHELPER_CID }, { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, mozilla::Module::MAIN_PROCESS_ONLY }, + { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID }, { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID, mozilla::Module::MAIN_PROCESS_ONLY }, { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID }, diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp index 8c2d526eada9..574b8d11c451 100644 --- a/widget/gtk/nsNativeThemeGTK.cpp +++ b/widget/gtk/nsNativeThemeGTK.cpp @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsNativeThemeGTK.h" -#include "HeadlessThemeGTK.h" #include "nsStyleConsts.h" #include "gtkdrawing.h" #include "ScreenHelperGTK.h" @@ -66,9 +65,6 @@ NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme, static int gLastGdkError; -// from nsWindow.cpp -extern bool gDisableNativeTheme; - // Return scale factor of the monitor where the window is located // by the most part or layout.css.devPixelsPerPx pref if set to > 0. static inline gint @@ -2147,20 +2143,3 @@ nsNativeThemeGTK::WidgetAppearanceDependsOnWindowFocus(StyleAppearance aWidgetTy return false; } } - -already_AddRefed -NS_NewNativeTheme() -{ - nsCOMPtr inst; - - if (gDisableNativeTheme) { - return nullptr; - } - - if (gfxPlatform::IsHeadless()) { - inst = new HeadlessThemeGTK(); - } else { - inst = new nsNativeThemeGTK(); - } - return inst.forget(); -} diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp index 1973c2a73536..91f052d85e2b 100644 --- a/widget/gtk/nsWidgetFactory.cpp +++ b/widget/gtk/nsWidgetFactory.cpp @@ -48,6 +48,9 @@ #include "GfxInfoX11.h" #endif +#include "nsNativeThemeGTK.h" +#include "HeadlessThemeGTK.h" + #include "nsIComponentRegistrar.h" #include "nsComponentManagerUtils.h" #include "mozilla/gfx/2D.h" @@ -69,6 +72,39 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(ScreenManager, ScreenManager::GetAddRef NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf) NS_GENERIC_FACTORY_CONSTRUCTOR(TaskbarProgress) + +// from nsWindow.cpp +extern bool gDisableNativeTheme; + +static nsresult +nsNativeThemeGTKConstructor(nsISupports *aOuter, REFNSIID aIID, + void **aResult) +{ + nsresult rv; + nsCOMPtr inst; + + if (gDisableNativeTheme) + return NS_ERROR_NO_INTERFACE; + + *aResult = nullptr; + if (nullptr != aOuter) { + rv = NS_ERROR_NO_AGGREGATION; + return rv; + } + if (gfxPlatform::IsHeadless()) { + inst = new HeadlessThemeGTK(); + } else { + inst = new nsNativeThemeGTK(); + } + if (nullptr == inst) { + rv = NS_ERROR_OUT_OF_MEMORY; + return rv; + } + rv = inst->QueryInterface(aIID, aResult); + + return rv; +} + #if defined(MOZ_X11) namespace mozilla { namespace widget { @@ -175,6 +211,7 @@ NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID); #endif NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID); NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID); +NS_DEFINE_NAMED_CID(NS_THEMERENDERER_CID); #ifdef NS_PRINTING NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID); NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID); @@ -207,6 +244,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { { &kNS_HTMLFORMATCONVERTER_CID, false, nullptr, nsHTMLFormatConverterConstructor }, { &kNS_SCREENMANAGER_CID, false, nullptr, ScreenManagerConstructor, Module::MAIN_PROCESS_ONLY }, + { &kNS_THEMERENDERER_CID, false, nullptr, nsNativeThemeGTKConstructor }, #ifdef NS_PRINTING { &kNS_PRINTSETTINGSSERVICE_CID, false, nullptr, nsPrintSettingsServiceGTKConstructor }, { &kNS_PRINTER_ENUMERATOR_CID, false, nullptr, nsPrinterEnumeratorGTKConstructor }, @@ -240,6 +278,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID }, { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID, Module::MAIN_PROCESS_ONLY }, + { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID }, #ifdef NS_PRINTING { "@mozilla.org/gfx/printsettings-service;1", &kNS_PRINTSETTINGSSERVICE_CID }, { "@mozilla.org/gfx/printerenumerator;1", &kNS_PRINTER_ENUMERATOR_CID }, diff --git a/widget/windows/nsNativeThemeWin.cpp b/widget/windows/nsNativeThemeWin.cpp index dcab56beeb05..1fac4b3de444 100644 --- a/widget/windows/nsNativeThemeWin.cpp +++ b/widget/windows/nsNativeThemeWin.cpp @@ -4446,12 +4446,16 @@ nsNativeThemeWin::DrawCustomScrollbarPart(gfxContext* aContext, // from nsWindow.cpp extern bool gDisableNativeTheme; -already_AddRefed -NS_NewNativeTheme() +nsresult NS_NewNativeTheme(nsISupports *aOuter, REFNSIID aIID, void **aResult) { if (gDisableNativeTheme) - return nullptr; + return NS_ERROR_NO_INTERFACE; - nsCOMPtr theme = new nsNativeThemeWin(); - return theme.forget(); + if (aOuter) + return NS_ERROR_NO_AGGREGATION; + + nsNativeThemeWin* theme = new nsNativeThemeWin(); + if (!theme) + return NS_ERROR_OUT_OF_MEMORY; + return theme->QueryInterface(aIID, aResult); } diff --git a/widget/windows/nsWidgetFactory.cpp b/widget/windows/nsWidgetFactory.cpp index 7a1757cd6b81..c96dda76980e 100644 --- a/widget/windows/nsWidgetFactory.cpp +++ b/widget/windows/nsWidgetFactory.cpp @@ -27,6 +27,7 @@ // Desktop #include "nsFilePicker.h" // needs to be included before other shobjidl.h includes #include "nsColorPicker.h" +#include "nsNativeThemeWin.h" // Content processes #include "nsFilePickerProxy.h" @@ -131,6 +132,7 @@ NS_DEFINE_NAMED_CID(NS_COLORPICKER_CID); NS_DEFINE_NAMED_CID(NS_APPSHELL_CID); NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID); NS_DEFINE_NAMED_CID(NS_GFXINFO_CID); +NS_DEFINE_NAMED_CID(NS_THEMERENDERER_CID); NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARD_CID); NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID); @@ -162,6 +164,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { { &kNS_SCREENMANAGER_CID, false, nullptr, ScreenManagerConstructor, Module::MAIN_PROCESS_ONLY }, { &kNS_GFXINFO_CID, false, nullptr, GfxInfoConstructor, Module::ALLOW_IN_GPU_PROCESS }, + { &kNS_THEMERENDERER_CID, false, nullptr, NS_NewNativeTheme }, { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceWinConstructor }, { &kNS_CLIPBOARD_CID, false, nullptr, nsClipboardConstructor, Module::MAIN_PROCESS_ONLY }, { &kNS_CLIPBOARDHELPER_CID, false, nullptr, nsClipboardHelperConstructor }, @@ -193,6 +196,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { { "@mozilla.org/widget/appshell/win;1", &kNS_APPSHELL_CID, Module::ALLOW_IN_GPU_PROCESS }, { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID, Module::MAIN_PROCESS_ONLY }, { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID, Module::ALLOW_IN_GPU_PROCESS }, + { "@mozilla.org/chrome/chrome-native-theme;1", &kNS_THEMERENDERER_CID }, { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID }, { "@mozilla.org/widget/clipboard;1", &kNS_CLIPBOARD_CID, Module::MAIN_PROCESS_ONLY }, { "@mozilla.org/widget/clipboardhelper;1", &kNS_CLIPBOARDHELPER_CID },