Changeset 283345 in webkit

Timestamp:

Sep 30, 2021, 4:12:10 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r280861. rdar://problem/81757530

Deploy some more smart pointers in DOMWindow.cpp
​https://bugs.webkit.org/show_bug.cgi?id=228883

Reviewed by Darin Adler.

A follow up to r279661. Deploy even more smart pointers.

• page/DOMWindow.cpp: (WebCore::DOMWindow::dispatchAllPendingBeforeUnloadEvents): (WebCore::DOMWindow::failedToRegisterDeviceMotionEventListener): (WebCore::DOMWindow::dispatchEvent):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@280861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-611.4.2.0-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (5 diffs)

branches/safari-611.4.2.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r280861. rdar://problem/81757530
+
+    Deploy some more smart pointers in DOMWindow.cpp
+    https://bugs.webkit.org/show_bug.cgi?id=228883
+    
+    Reviewed by Darin Adler.
+    
+    A follow up to r279661. Deploy even more smart pointers.
+    
+    * page/DOMWindow.cpp:
+    (WebCore::DOMWindow::dispatchAllPendingBeforeUnloadEvents):
+    (WebCore::DOMWindow::failedToRegisterDeviceMotionEventListener):
+    (WebCore::DOMWindow::dispatchEvent):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280861 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+            Deploy some more smart pointers in DOMWindow.cpp
+            https://bugs.webkit.org/show_bug.cgi?id=228883
+
+            Reviewed by Darin Adler.
+
+            A follow up to r279661. Deploy even more smart pointers.
+
+            * page/DOMWindow.cpp:
+            (WebCore::DOMWindow::dispatchAllPendingBeforeUnloadEvents):
+            (WebCore::DOMWindow::failedToRegisterDeviceMotionEventListener):
+            (WebCore::DOMWindow::dispatchEvent):
+
 2021-09-03  Alan Coon  <alancoon@apple.com>
 

branches/safari-611.4.2.0-branch/Source/WebCore/page/DOMWindow.cpp

@@ -246 +246 @@
             continue;
 
-        Frame* frame = window->frame();
+        RefPtr frame = window->frame();
         if (!frame)
             continue;
@@ -2104 +2104 @@
         // Fire a fake DeviceMotionEvent with acceleration data to unblock the site's login flow.
         document()->postTask([](auto& context) {
-            if (auto* window = downcast<Document>(context).domWindow()) {
+            if (RefPtr window = downcast<Document>(context).domWindow()) {
                 auto acceleration = DeviceMotionData::Acceleration::create();
                 window->dispatchEvent(DeviceMotionEvent::create(eventNames().devicemotionEvent, DeviceMotionData::create(acceleration.copyRef(), acceleration.copyRef(), DeviceMotionData::RotationRate::create(), WTF::nullopt).ptr()));
@@ -2261 +2261 @@
     event.resetBeforeDispatch();
 
-    Frame* protectedFrame = nullptr;
+    RefPtr<Frame> protectedFrame;
     bool hasListenersForEvent = false;
     if (UNLIKELY(InspectorInstrumentation::hasFrontends())) {
@@ -2267 +2267 @@
         hasListenersForEvent = hasEventListeners(event.type());
         if (hasListenersForEvent)
-            InspectorInstrumentation::willDispatchEventOnWindow(protectedFrame, event, *this);
+            InspectorInstrumentation::willDispatchEventOnWindow(protectedFrame.get(), event, *this);
     }
 
@@ -2275 +2275 @@
 
     if (hasListenersForEvent)
-        InspectorInstrumentation::didDispatchEventOnWindow(protectedFrame, event);
+        InspectorInstrumentation::didDispatchEventOnWindow(protectedFrame.get(), event);
 
     event.resetAfterDispatch();