Title: [225203] trunk/Source/WebCore
- Revision
- 225203
- Author
- cdu...@apple.com
- Date
- 2017-11-27 16:22:14 -0800 (Mon, 27 Nov 2017)
Log Message
NavigatorBase::serviceWorker() should return a reference instead of a raw pointer
https://bugs.webkit.org/show_bug.cgi?id=180059
Reviewed by Geoffrey Garen.
NavigatorBase::serviceWorker() should return a reference instead of a raw pointer
as it can never return null.
* bindings/js/JSNavigatorCustom.cpp:
(WebCore::JSNavigator::visitAdditionalChildren):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::serviceWorkerContainer):
* page/NavigatorBase.cpp:
(WebCore::NavigatorBase::serviceWorker):
* page/NavigatorBase.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225202 => 225203)
--- trunk/Source/WebCore/ChangeLog 2017-11-28 00:14:07 UTC (rev 225202)
+++ trunk/Source/WebCore/ChangeLog 2017-11-28 00:22:14 UTC (rev 225203)
@@ -1,3 +1,21 @@
+2017-11-27 Chris Dumez <cdu...@apple.com>
+
+ NavigatorBase::serviceWorker() should return a reference instead of a raw pointer
+ https://bugs.webkit.org/show_bug.cgi?id=180059
+
+ Reviewed by Geoffrey Garen.
+
+ NavigatorBase::serviceWorker() should return a reference instead of a raw pointer
+ as it can never return null.
+
+ * bindings/js/JSNavigatorCustom.cpp:
+ (WebCore::JSNavigator::visitAdditionalChildren):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::serviceWorkerContainer):
+ * page/NavigatorBase.cpp:
+ (WebCore::NavigatorBase::serviceWorker):
+ * page/NavigatorBase.h:
+
2017-11-27 Antoine Quint <grao...@apple.com>
Pressing the space bar while watching a fullscreen video doesn't play or pause
Modified: trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp (225202 => 225203)
--- trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2017-11-28 00:14:07 UTC (rev 225202)
+++ trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2017-11-28 00:22:14 UTC (rev 225203)
@@ -31,7 +31,7 @@
void JSNavigator::visitAdditionalChildren(SlotVisitor& visitor)
{
#if ENABLE(SERVICE_WORKER)
- visitor.addOpaqueRoot(wrapped().serviceWorker());
+ visitor.addOpaqueRoot(&wrapped().serviceWorker());
#else
UNUSED_PARAM(visitor);
#endif
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (225202 => 225203)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-11-28 00:14:07 UTC (rev 225202)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-11-28 00:22:14 UTC (rev 225203)
@@ -569,7 +569,7 @@
} else
navigator = downcast<WorkerGlobalScope>(*this).optionalNavigator();
- return navigator ? navigator->serviceWorker() : nullptr;
+ return navigator ? &navigator->serviceWorker() : nullptr;
}
#endif
Modified: trunk/Source/WebCore/page/NavigatorBase.cpp (225202 => 225203)
--- trunk/Source/WebCore/page/NavigatorBase.cpp 2017-11-28 00:14:07 UTC (rev 225202)
+++ trunk/Source/WebCore/page/NavigatorBase.cpp 2017-11-28 00:22:14 UTC (rev 225203)
@@ -149,9 +149,9 @@
}
#if ENABLE(SERVICE_WORKER)
-ServiceWorkerContainer* NavigatorBase::serviceWorker()
+ServiceWorkerContainer& NavigatorBase::serviceWorker()
{
- return &m_serviceWorkerContainer;
+ return m_serviceWorkerContainer;
}
#endif
Modified: trunk/Source/WebCore/page/NavigatorBase.h (225202 => 225203)
--- trunk/Source/WebCore/page/NavigatorBase.h 2017-11-28 00:14:07 UTC (rev 225202)
+++ trunk/Source/WebCore/page/NavigatorBase.h 2017-11-28 00:22:14 UTC (rev 225203)
@@ -60,7 +60,7 @@
#if ENABLE(SERVICE_WORKER)
public:
- ServiceWorkerContainer* serviceWorker();
+ ServiceWorkerContainer& serviceWorker();
private:
UniqueRef<ServiceWorkerContainer> m_serviceWorkerContainer;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
