Diff
Modified: trunk/LayoutTests/ChangeLog (237184 => 237185)
--- trunk/LayoutTests/ChangeLog 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/ChangeLog 2018-10-16 16:24:12 UTC (rev 237185)
@@ -1,3 +1,19 @@
+2018-10-16 Chris Dumez <[email protected]>
+
+ window.navigator should not become null after the window loses its browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=190595
+
+ Reviewed by Ryosuke Niwa.
+
+ Extend layout test coverage.
+
+ * fast/frames/detached-frame-property-expected.txt:
+ * fast/frames/detached-frame-property.html:
+ * http/tests/dom/cross-origin-detached-window-properties-expected.txt:
+ * http/tests/dom/cross-origin-detached-window-properties.html:
+ * http/tests/dom/same-origin-detached-window-properties-expected.txt:
+ * http/tests/dom/same-origin-detached-window-properties.html:
+
2018-10-16 Charlie Turner <[email protected]>
[EME] Multiple ClearKey tests crashing in gst_qtdemux_request_protection_context
Modified: trunk/LayoutTests/fast/frames/detached-frame-property-expected.txt (237184 => 237185)
--- trunk/LayoutTests/fast/frames/detached-frame-property-expected.txt 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/fast/frames/detached-frame-property-expected.txt 2018-10-16 16:24:12 UTC (rev 237185)
@@ -9,6 +9,7 @@
PASS !!detachedWindow.history is true
PASS !!detachedWindow.screen is true
PASS !!detachedWindow.location is true
+PASS !!detachedWindow.navigator is true
PASS detachedWindow.closed is true
PASS detachedWindow.top is null
PASS detachedWindow.opener is null
@@ -17,7 +18,6 @@
PASS detachedWindow.window is null
PASS detachedWindow.frames is null
PASS detachedWindow.self is null
-PASS !detachedWindow.navigator is true
PASS !detachedWindow.localStorage is true
PASS !!detachedWindow.document is true
PASS !!detachedWindow.XMLHttpRequest is true
Modified: trunk/LayoutTests/fast/frames/detached-frame-property.html (237184 => 237185)
--- trunk/LayoutTests/fast/frames/detached-frame-property.html 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/fast/frames/detached-frame-property.html 2018-10-16 16:24:12 UTC (rev 237185)
@@ -13,6 +13,7 @@
shouldBeTrue("!!detachedWindow.history");
shouldBeTrue("!!detachedWindow.screen");
shouldBeTrue("!!detachedWindow.location");
+ shouldBeTrue("!!detachedWindow.navigator");
shouldBeTrue("detachedWindow.closed");
shouldBeNull("detachedWindow.top");
shouldBeNull("detachedWindow.opener");
@@ -24,7 +25,6 @@
shouldBeNull("detachedWindow.self");
// Chrome returns undefined but Firefox has a valid object.
- shouldBeTrue("!detachedWindow.navigator");
shouldBeTrue("!detachedWindow.localStorage");
shouldBeTrue("!!detachedWindow.document");
shouldBeTrue("!!detachedWindow.XMLHttpRequest");
Modified: trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties-expected.txt (237184 => 237185)
--- trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties-expected.txt 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties-expected.txt 2018-10-16 16:24:12 UTC (rev 237185)
@@ -29,6 +29,7 @@
PASS w.applicationCache threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.visualViewport threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.styleMedia threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
+PASS w.navigator threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.foo threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.location.foo threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
@@ -58,6 +59,7 @@
PASS w.applicationCache threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.visualViewport threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.styleMedia threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
+PASS w.navigator threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.foo threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS w.location.foo threw exception SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a cross-origin frame. Protocols, domains, and ports must match..
PASS successfullyParsed is true
Modified: trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties.html (237184 => 237185)
--- trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties.html 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/http/tests/dom/cross-origin-detached-window-properties.html 2018-10-16 16:24:12 UTC (rev 237185)
@@ -44,6 +44,7 @@
shouldThrowErrorName("w.applicationCache", "SecurityError");
shouldThrowErrorName("w.visualViewport", "SecurityError");
shouldThrowErrorName("w.styleMedia", "SecurityError");
+ shouldThrowErrorName("w.navigator", "SecurityError");
shouldThrowErrorName("w.foo", "SecurityError");
shouldThrowErrorName("w.location.foo", "SecurityError");
Modified: trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties-expected.txt (237184 => 237185)
--- trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties-expected.txt 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties-expected.txt 2018-10-16 16:24:12 UTC (rev 237185)
@@ -63,6 +63,17 @@
PASS !!w.styleMedia is true
PASS w.styleMedia.type is ""
PASS w.styleMedia.matchMedium('foo') is false
+PASS !!w.navigator is true
+PASS w.navigator.appCodeName is "Mozilla"
+PASS w.navigator.appName is "Netscape"
+PASS w.navigator.appVersion is ""
+PASS w.navigator.cookieEnabled is false
+PASS w.navigator.javaEnabled() is false
+PASS w.navigator.product is "Gecko"
+PASS w.navigator.userAgent is ""
+PASS w.navigator.plugins.length is 0
+PASS w.navigator.mimeTypes.length is 0
+PASS !!w.navigator.geolocation is true
PASS w.foo is undefined.
PASS w.location.foo is undefined.
@@ -126,6 +137,17 @@
PASS !!w.styleMedia is true
PASS w.styleMedia.type is ""
PASS w.styleMedia.matchMedium('foo') is false
+PASS !!w.navigator is true
+PASS w.navigator.appCodeName is "Mozilla"
+PASS w.navigator.appName is "Netscape"
+PASS w.navigator.appVersion is ""
+PASS w.navigator.cookieEnabled is false
+PASS w.navigator.javaEnabled() is false
+PASS w.navigator.product is "Gecko"
+PASS w.navigator.userAgent is ""
+PASS w.navigator.plugins.length is 0
+PASS w.navigator.mimeTypes.length is 0
+PASS !!w.navigator.geolocation is true
PASS w.foo is undefined.
PASS w.location.foo is undefined.
PASS successfullyParsed is true
Modified: trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties.html (237184 => 237185)
--- trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties.html 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/http/tests/dom/same-origin-detached-window-properties.html 2018-10-16 16:24:12 UTC (rev 237185)
@@ -119,6 +119,24 @@
}
try {
+ shouldBeTrue("!!w.navigator");
+ if (w.navigator) {
+ shouldBeEqualToString("w.navigator.appCodeName", "Mozilla");
+ shouldBeEqualToString("w.navigator.appName", "Netscape");
+ shouldBeEqualToString("w.navigator.appVersion", "");
+ shouldBeFalse("w.navigator.cookieEnabled");
+ shouldBeFalse("w.navigator.javaEnabled()");
+ shouldBeEqualToString("w.navigator.product", "Gecko");
+ shouldBeEqualToString("w.navigator.userAgent", "");
+ shouldBe("w.navigator.plugins.length", "0");
+ shouldBe("w.navigator.mimeTypes.length", "0");
+ shouldBeTrue("!!w.navigator.geolocation");
+ }
+ } catch (e) {
+ debug(e);
+ }
+
+ try {
shouldBeUndefined("w.foo");
shouldBeUndefined("w.location.foo");
} catch (e) {
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (237184 => 237185)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2018-10-16 16:24:12 UTC (rev 237185)
@@ -1,3 +1,19 @@
+2018-10-16 Chris Dumez <[email protected]>
+
+ window.navigator should not become null after the window loses its browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=190595
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline test which is not failing differently. The last check of this test is checking that
+ navigator.serviceWorker returns null after the frame has been detached. The test has been written
+ this way because this is how Chromium behaves. However, Firefox keeps returning the
+ ServiceWorkerContainer, as we do. Also, the specification indicates the the attribute cannot
+ return null (since the attribute is not nullable):
+ - https://w3c.github.io/ServiceWorker/#navigator-serviceworker
+
+ * web-platform-tests/service-workers/service-worker/detached-context.https-expected.txt:
+
2018-10-16 Charlie Turner <[email protected]>
[EME] Add some ClearKey baselines for passing tests
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/detached-context.https-expected.txt (237184 => 237185)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/detached-context.https-expected.txt 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/detached-context.https-expected.txt 2018-10-16 16:24:12 UTC (rev 237185)
@@ -4,5 +4,5 @@
PASS accessing a ServiceWorker object from a removed iframe
PASS accessing navigator.serviceWorker on a detached iframe
FAIL accessing navigator on a removed frame assert_throws: function "() => get_navigator()" did not throw
-FAIL accessing navigator.serviceWorker on a removed about:blank frame null is not an object (evaluating 'get_navigator().serviceWorker')
+FAIL accessing navigator.serviceWorker on a removed about:blank frame assert_equals: expected null but got object "[object ServiceWorkerContainer]"
Modified: trunk/Source/WebCore/ChangeLog (237184 => 237185)
--- trunk/Source/WebCore/ChangeLog 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/ChangeLog 2018-10-16 16:24:12 UTC (rev 237185)
@@ -1,3 +1,31 @@
+2018-10-16 Chris Dumez <[email protected]>
+
+ window.navigator should not become null after the window loses its browsing context
+ https://bugs.webkit.org/show_bug.cgi?id=190595
+
+ Reviewed by Ryosuke Niwa.
+
+ window.navigator should not become null after the window loses its browsing context.
+ This does not match the HTML specification or the behavior of other browsers.
+
+ No new tests, updated existing tests.
+
+ * Modules/geolocation/NavigatorGeolocation.cpp:
+ (WebCore::NavigatorGeolocation::geolocation const):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::navigator):
+ * page/Navigator.cpp:
+ (WebCore::Navigator::Navigator):
+ * page/Navigator.h:
+ * page/NavigatorBase.cpp:
+ (WebCore::NavigatorBase::NavigatorBase):
+ * page/NavigatorBase.h:
+ * page/WorkerNavigator.cpp:
+ (WebCore::WorkerNavigator::WorkerNavigator):
+ * workers/service/ServiceWorkerContainer.cpp:
+ (WebCore::ServiceWorkerContainer::ServiceWorkerContainer):
+ * workers/service/ServiceWorkerContainer.h:
+
2018-10-16 Alex Christensen <[email protected]>
Replace HistoryItem* with HistoryItem& where possible
Modified: trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp (237184 => 237185)
--- trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -26,6 +26,7 @@
#include "NavigatorGeolocation.h"
+#include "DOMWindow.h"
#include "Document.h"
#include "Frame.h"
#include "Geolocation.h"
@@ -71,8 +72,8 @@
Geolocation* NavigatorGeolocation::geolocation() const
{
- if (!m_geolocation && frame())
- m_geolocation = Geolocation::create(frame()->document());
+ if (!m_geolocation)
+ m_geolocation = Geolocation::create(window() ? window()->document() : nullptr);
return m_geolocation.get();
}
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (237184 => 237185)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -716,15 +716,9 @@
Navigator* DOMWindow::navigator()
{
- // FIXME: This should not return nullptr when frameless.
- if (!isCurrentlyDisplayedInFrame())
- return nullptr;
+ if (!m_navigator)
+ m_navigator = Navigator::create(scriptExecutionContext(), *this);
- if (!m_navigator) {
- ASSERT(scriptExecutionContext());
- m_navigator = Navigator::create(*scriptExecutionContext(), *this);
- }
-
return m_navigator.get();
}
Modified: trunk/Source/WebCore/page/Navigator.cpp (237184 => 237185)
--- trunk/Source/WebCore/page/Navigator.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/Navigator.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -49,7 +49,7 @@
namespace WebCore {
using namespace WTF;
-Navigator::Navigator(ScriptExecutionContext& context, DOMWindow& window)
+Navigator::Navigator(ScriptExecutionContext* context, DOMWindow& window)
: NavigatorBase(context)
, DOMWindowProperty(&window)
{
Modified: trunk/Source/WebCore/page/Navigator.h (237184 => 237185)
--- trunk/Source/WebCore/page/Navigator.h 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/Navigator.h 2018-10-16 16:24:12 UTC (rev 237185)
@@ -33,7 +33,7 @@
class Navigator final : public NavigatorBase, public ScriptWrappable, public DOMWindowProperty, public Supplementable<Navigator> {
public:
- static Ref<Navigator> create(ScriptExecutionContext& context, DOMWindow& window) { return adoptRef(*new Navigator(context, window)); }
+ static Ref<Navigator> create(ScriptExecutionContext* context, DOMWindow& window) { return adoptRef(*new Navigator(context, window)); }
virtual ~Navigator();
String appVersion() const;
@@ -53,7 +53,7 @@
void getStorageUpdates();
private:
- explicit Navigator(ScriptExecutionContext&, DOMWindow&);
+ explicit Navigator(ScriptExecutionContext*, DOMWindow&);
mutable RefPtr<DOMPluginArray> m_plugins;
mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
Modified: trunk/Source/WebCore/page/NavigatorBase.cpp (237184 => 237185)
--- trunk/Source/WebCore/page/NavigatorBase.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/NavigatorBase.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -75,7 +75,7 @@
namespace WebCore {
-NavigatorBase::NavigatorBase(ScriptExecutionContext& context)
+NavigatorBase::NavigatorBase(ScriptExecutionContext* context)
#if ENABLE(SERVICE_WORKER)
: m_serviceWorkerContainer(makeUniqueRef<ServiceWorkerContainer>(context, *this))
#endif
Modified: trunk/Source/WebCore/page/NavigatorBase.h (237184 => 237185)
--- trunk/Source/WebCore/page/NavigatorBase.h 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/NavigatorBase.h 2018-10-16 16:24:12 UTC (rev 237185)
@@ -57,7 +57,7 @@
static Vector<String> languages();
protected:
- explicit NavigatorBase(ScriptExecutionContext&);
+ explicit NavigatorBase(ScriptExecutionContext*);
#if ENABLE(SERVICE_WORKER)
public:
Modified: trunk/Source/WebCore/page/WorkerNavigator.cpp (237184 => 237185)
--- trunk/Source/WebCore/page/WorkerNavigator.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/page/WorkerNavigator.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -30,7 +30,7 @@
namespace WebCore {
WorkerNavigator::WorkerNavigator(ScriptExecutionContext& context, const String& userAgent, bool isOnline)
- : NavigatorBase(context)
+ : NavigatorBase(&context)
, m_userAgent(userAgent)
, m_isOnline(isOnline)
{
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (237184 => 237185)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2018-10-16 16:24:12 UTC (rev 237185)
@@ -57,8 +57,8 @@
namespace WebCore {
-ServiceWorkerContainer::ServiceWorkerContainer(ScriptExecutionContext& context, NavigatorBase& navigator)
- : ActiveDOMObject(&context)
+ServiceWorkerContainer::ServiceWorkerContainer(ScriptExecutionContext* context, NavigatorBase& navigator)
+ : ActiveDOMObject(context)
, m_navigator(navigator)
{
suspendIfNeeded();
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h (237184 => 237185)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2018-10-16 15:58:10 UTC (rev 237184)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2018-10-16 16:24:12 UTC (rev 237185)
@@ -52,7 +52,7 @@
WTF_MAKE_NONCOPYABLE(ServiceWorkerContainer);
WTF_MAKE_FAST_ALLOCATED;
public:
- ServiceWorkerContainer(ScriptExecutionContext&, NavigatorBase&);
+ ServiceWorkerContainer(ScriptExecutionContext*, NavigatorBase&);
~ServiceWorkerContainer();
ServiceWorker* controller() const;
