Changeset 220064 in webkit

Timestamp:

Jul 31, 2017, 7:37:34 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220033. rdar://problem/33619596

Location:

branches/safari-604-branch

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebURLSchemeHandler.cpp (modified) (2 diffs)
• Source/WebKit/UIProcess/WebURLSchemeHandler.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKURLSchemeHandler-1.mm (modified) (4 diffs)

branches/safari-604-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2017-07-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220033. rdar://problem/33619596
+
+    2017-07-28  Brady Eidson  <beidson@apple.com>
+
+            API tests that use URLSchemeHandler are failing.
+            https://bugs.webkit.org/show_bug.cgi?id=174950
+
+            Reviewed by Alex Christensen.
+
+            Make sure that in all cases where we remove the last task from the page->task map...
+            ...We also remove the map itself.
+
+            * UIProcess/WebURLSchemeHandler.cpp:
+            (WebKit::WebURLSchemeHandler::stopTask):
+            (WebKit::WebURLSchemeHandler::taskCompleted):
+            (WebKit::WebURLSchemeHandler::removeTaskFromPageMap):
+            * UIProcess/WebURLSchemeHandler.h:
+
 2017-07-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebKit/UIProcess/WebURLSchemeHandler.cpp

@@ -81 +81 @@
         return;
 
-    auto pageIterator = m_tasksByPageIdentifier.find(page.pageID());
-    ASSERT(pageIterator != m_tasksByPageIdentifier.end());
-    ASSERT(pageIterator->value.contains(taskIdentifier));
-    pageIterator->value.remove(taskIdentifier);
-
     iterator->value->stop();
     platformStopTask(page, iterator->value);
 
+    removeTaskFromPageMap(page.pageID(), taskIdentifier);
     m_tasks.remove(iterator);
-    if (pageIterator->value.isEmpty())
-        m_tasksByPageIdentifier.remove(pageIterator);
 }
 
@@ -98 +92 @@
     auto takenTask = m_tasks.take(task.identifier());
     ASSERT_UNUSED(takenTask, takenTask->ptr() == &task);
-
-    ASSERT(m_tasksByPageIdentifier.get(task.pageID()).contains(task.identifier()));
-    m_tasksByPageIdentifier.get(task.pageID()).remove(task.identifier());
+    removeTaskFromPageMap(task.pageID(), task.identifier());
 
     platformTaskCompleted(task);
 }
 
+void WebURLSchemeHandler::removeTaskFromPageMap(uint64_t pageID, uint64_t taskID)
+{
+    auto iterator = m_tasksByPageIdentifier.find(pageID);
+    ASSERT(iterator != m_tasksByPageIdentifier.end());
+    ASSERT(iterator->value.contains(taskID));
+    iterator->value.remove(taskID);
+    if (iterator->value.isEmpty())
+        m_tasksByPageIdentifier.remove(iterator);
+}
+
 } // namespace WebKit

branches/safari-604-branch/Source/WebKit/UIProcess/WebURLSchemeHandler.h

@@ -60 +60 @@
     virtual void platformTaskCompleted(WebURLSchemeTask&) = 0;
 
+    void removeTaskFromPageMap(uint64_t pageID, uint64_t taskID);
+
     uint64_t m_identifier;
 

branches/safari-604-branch/Tools/ChangeLog

@@ +1 @@
+2017-07-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220033. rdar://problem/33619596
+
+    2017-07-28  Brady Eidson  <beidson@apple.com>
+
+            API tests that use URLSchemeHandler are failing.
+            https://bugs.webkit.org/show_bug.cgi?id=174950
+
+            Reviewed by Alex Christensen.
+
+            Fix the NoMIMEType test to be correct.
+
+            * TestWebKitAPI/Tests/WebKit2Cocoa/WKURLSchemeHandler-1.mm:
+            (-[SchemeHandler initWithData:mimeType:]):
+            (-[SchemeHandler webView:startURLSchemeTask:]):
+            (TEST):
+
 2017-07-28  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKURLSchemeHandler-1.mm

@@ -42 +42 @@
 @property (readonly) NSMutableArray<NSURL *> *startedURLs;
 @property (readonly) NSMutableArray<NSURL *> *stoppedURLs;
+@property (assign) BOOL shouldFinish;
 - (instancetype)initWithData:(NSData *)data mimeType:(NSString *)inMIMEType;
 @end
@@ -60 +61 @@
     _startedURLs = [[NSMutableArray alloc] init];
     _stoppedURLs = [[NSMutableArray alloc] init];
+    _shouldFinish = YES;
 
     return self;
@@ -85 +87 @@
     [task didReceiveResponse:response.get()];
     [task didReceiveData:resourceData.get()];
-    [task didFinish];
+    if (_shouldFinish)
+        [task didFinish];
 }
 
@@ -134 +137 @@
 
     RetainPtr<SchemeHandler> handler = adoptNS([[SchemeHandler alloc] initWithData:[NSData dataWithBytesNoCopy:(void*)mainBytes length:sizeof(mainBytes) freeWhenDone:NO] mimeType:nil]);
+    handler.get().shouldFinish = NO;
     [configuration setURLSchemeHandler:handler.get() forURLScheme:@"testing"];