[webkit-changes] [211922] branches/safari-604.1.5-branch/Source/WebCore

[matthew_hanson]

Title: [211922] branches/safari-604.1.5-branch/Source/WebCore








Revision 211922
Author matthew_han...@apple.com
Date 2017-02-08 18:06:03 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211716. rdar://problem/30368405

Modified Paths

branches/safari-604.1.5-branch/Source/WebCore/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.h
branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm




Diff

Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211921 => 211922)

--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:06:00 UTC (rev 211921)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:06:03 UTC (rev 211922)
@@ -1,5 +1,26 @@
 2017-02-08  Matthew Hanson  
 
+Merge r211716. rdar://problem/30368405
+
+2017-02-05  Wenson Hsieh  
+
+Data interaction fails in Safari splitscreen mode when dropping into a contenteditable
+https://bugs.webkit.org/show_bug.cgi?id=167862
+
+
+Reviewed by Tim Horton.
+
+Adds a counter to WebItemProviderPasteboard that can incremented, decremented, and queried by clients.
+
+* platform/ios/WebItemProviderPasteboard.h:
+* platform/ios/WebItemProviderPasteboard.mm:
+(-[WebItemProviderPasteboard init]):
+(-[WebItemProviderPasteboard hasPendingOperation]):
+(-[WebItemProviderPasteboard incrementPendingOperationCount]):
+(-[WebItemProviderPasteboard decrementPendingOperationCount]):
+
+2017-02-08  Matthew Hanson  
+
 Merge r211597. rdar://problem/30295261
 
 2017-02-02  Wenson Hsieh  


Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.h (211921 => 211922)

--- branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.h	2017-02-09 02:06:00 UTC (rev 211921)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.h	2017-02-09 02:06:03 UTC (rev 211922)
@@ -41,6 +41,10 @@
 @property (readonly, nonatomic) NSInteger numberOfItems;
 @property (readonly, nonatomic) NSInteger changeCount;
 
+@property (readonly, nonatomic) BOOL hasPendingOperation;
+- (void)incrementPendingOperationCount;
+- (void)decrementPendingOperationCount;
+
 @end
 
 NS_ASSUME_NONNULL_END


Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (211921 => 211922)

--- branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-02-09 02:06:00 UTC (rev 211921)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-02-09 02:06:03 UTC (rev 211922)
@@ -72,6 +72,7 @@
 
 @property (nonatomic) NSInteger numberOfItems;
 @property (nonatomic) NSInteger changeCount;
+@property (nonatomic) NSInteger pendingOperationCount;
 
 @end
 
@@ -92,6 +93,7 @@
 if (self = [super init]) {
 _itemProviders = [[NSArray alloc] init];
 _changeCount = 0;
+_pendingOperationCount = 0;
 }
 return self;
 }
@@ -211,6 +213,21 @@
 return 0 <= index && index < (NSInteger)_itemProviders.count ? _itemProviders[index] : nil;
 }
 
+- (BOOL)hasPendingOperation
+{
+return _pendingOperationCount;
+}
+
+- (void)incrementPendingOperationCount
+{
+_pendingOperationCount++;
+}
+
+- (void)decrementPendingOperationCount
+{
+_pendingOperationCount--;
+}
+
 @end
 
 #endif // ENABLE(DATA_INTERACTION)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211924] branches/safari-604.1.5-branch/Source/JavaScriptCore

[matthew_hanson]

Title: [211924] branches/safari-604.1.5-branch/Source/_javascript_Core








Revision 211924
Author matthew_han...@apple.com
Date 2017-02-08 18:06:10 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211300. rdar://problem/30425272

Modified Paths

branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm
branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog




Diff

Modified: branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm (211923 => 211924)

--- branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm	2017-02-09 02:06:07 UTC (rev 211923)
+++ branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm	2017-02-09 02:06:10 UTC (rev 211924)
@@ -326,6 +326,8 @@
 }
 [externalRememberedSet removeAllObjects];
 }
+
+visitor.mergeIfNecessary();
 }
 
 #endif // JSC_OBJC_API_ENABLED


Modified: branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog (211923 => 211924)

--- branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog	2017-02-09 02:06:07 UTC (rev 211923)
+++ branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog	2017-02-09 02:06:10 UTC (rev 211924)
@@ -1,3 +1,25 @@
+2017-02-08  Matthew Hanson  
+
+Merge r211300. rdar://problem/30425272
+
+2017-01-27  Filip Pizlo  
+
+scanExternalRememberedSet needs to mergeIfNecessary
+https://bugs.webkit.org/show_bug.cgi?id=167523
+
+Reviewed by Keith Miller.
+
+The protocol for opaque roots is that if you add to them outside of draining, then you need to call
+mergeIfNecessary.
+
+This means that every MarkingConstraint that adds opaque roots needs to mergeIfNecessary after.
+
+scanExternalRememberedSet transitively calls addOpaqueRoot, is called from a MarkingConstraint, and
+was missing a call to mergeIfNecessary. This fixes it.
+
+* API/JSVirtualMachine.mm:
+(scanExternalRememberedSet):
+
 2017-02-07  Matthew Hanson  
 
 Merge r211630. rdar://problem/30357032






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211919] branches/safari-604.1.5-branch/Source

[matthew_hanson]

Title: [211919] branches/safari-604.1.5-branch/Source








Revision 211919
Author matthew_han...@apple.com
Date 2017-02-08 18:05:51 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211597. rdar://problem/30295261

Modified Paths

branches/safari-604.1.5-branch/Source/WebCore/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/loader/EmptyClients.cpp
branches/safari-604.1.5-branch/Source/WebCore/page/DragClient.h
branches/safari-604.1.5-branch/Source/WebCore/page/DragController.cpp
branches/safari-604.1.5-branch/Source/WebCore/page/DragController.h
branches/safari-604.1.5-branch/Source/WebCore/platform/DragImage.h
branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.h
branches/safari-604.1.5-branch/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm
branches/safari-604.1.5-branch/Source/WebKit/win/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
branches/safari-604.1.5-branch/Source/WebKit/win/WebCoreSupport/WebDragClient.h
branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/PageClient.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp
branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
branches/safari-604.1.5-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm




Diff

Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211918 => 211919)

--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:05:42 UTC (rev 211918)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:05:51 UTC (rev 211919)
@@ -1,5 +1,30 @@
 2017-02-08  Matthew Hanson  
 
+Merge r211597. rdar://problem/30295261
+
+2017-02-02  Wenson Hsieh  
+
+Drag images should be anchored to the mouse location
+https://bugs.webkit.org/show_bug.cgi?id=167690
+
+
+Reviewed by Enrica Casucci.
+
+Adds logic to compute the mouse anchor point. This is a point in the unit square indicating where the drag
+origin is relative to the bounds of the drag image. There is no behavior change, since this anchor point is not
+used by any client yet; this patch only computes and vends this information from WebCore.
+
+* loader/EmptyClients.cpp:
+* page/DragClient.h:
+* page/DragController.cpp:
+(WebCore::DragController::startDrag):
+(WebCore::DragController::doImageDrag):
+(WebCore::DragController::doSystemDrag):
+* page/DragController.h:
+* platform/DragImage.h:
+
+2017-02-08  Matthew Hanson  
+
 Merge r211453. rdar://problem/30294240
 
 2017-01-31  Wenson Hsieh  


Modified: branches/safari-604.1.5-branch/Source/WebCore/loader/EmptyClients.cpp (211918 => 211919)

--- branches/safari-604.1.5-branch/Source/WebCore/loader/EmptyClients.cpp	2017-02-09 02:05:42 UTC (rev 211918)
+++ branches/safari-604.1.5-branch/Source/WebCore/loader/EmptyClients.cpp	2017-02-09 02:05:51 UTC (rev 211919)
@@ -126,7 +126,7 @@
 void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) final { }
 DragDestinationAction actionMaskForDrag(const DragData&) final { return DragDestinationActionNone; }
 DragSourceAction dragSourceActionMaskForPoint(const IntPoint&) final { return DragSourceActionNone; }
-void startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool) final { }
+void startDrag(DragImageRef, const IntPoint&, const IntPoint&, const FloatPoint&, DataTransfer&, Frame&, bool) final { }
 void dragControllerDestroyed() final { }
 };
 


Modified: branches/safari-604.1.5-branch/Source/WebCore/page/DragClient.h (211918 => 211919)

--- branches/safari-604.1.5-branch/Source/WebCore/page/DragClient.h	2017-02-09 02:05:42 UTC (rev 211918)
+++ branches/safari-604.1.5-branch/Source/WebCore/page/DragClient.h	2017-02-09 02:05:51 UTC (rev 211919)
@@ -27,6 +27,7 @@
 
 #include 

[webkit-changes] [211918] branches/safari-604.1.5-branch/Source/WebCore

[matthew_hanson]

Title: [211918] branches/safari-604.1.5-branch/Source/WebCore








Revision 211918
Author matthew_han...@apple.com
Date 2017-02-08 18:05:42 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211453. rdar://problem/30294240

Modified Paths

branches/safari-604.1.5-branch/Source/WebCore/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm




Diff

Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211917 => 211918)

--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:05:40 UTC (rev 211917)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:05:42 UTC (rev 211918)
@@ -1,5 +1,23 @@
 2017-02-08  Matthew Hanson  
 
+Merge r211453. rdar://problem/30294240
+
+2017-01-31  Wenson Hsieh  
+
+WebItemProviderPasteboard should be robust when UIItemProvider fails to initialize an object
+https://bugs.webkit.org/show_bug.cgi?id=167663
+
+
+Reviewed by Tim Horton.
+
+Adds a nil check for the result of -createObjectOfClass:error:.
+
+* platform/ios/WebItemProviderPasteboard.mm:
+(-[WebItemProviderPasteboard valuesForPasteboardType:inItemSet:]):
+(-[WebItemProviderPasteboard _tryToCreateAndAppendObjectOfClass:toArray:usingProvider:]):
+
+2017-02-08  Matthew Hanson  
+
 Merge r211377. rdar://problem/30267849
 
 2017-01-30  Wenson Hsieh  


Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (211917 => 211918)

--- branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-02-09 02:05:40 UTC (rev 211917)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-02-09 02:05:42 UTC (rev 211918)
@@ -169,30 +169,20 @@
 return;
 
 // FIXME: These should be refactored to use asynchronous calls.
-if (isColorType(pasteboardType) && [provider canCreateObjectOfClass:[getUIColorClass() class]]) {
-[values addObject:[provider createObjectOfClass:[getUIColorClass() class] error:nil]];
+if (isColorType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[getUIColorClass() class] toArray:values usingProvider:provider])
 return;
-}
 
-if (isImageType(pasteboardType) && [provider canCreateObjectOfClass:[getUIImageClass() class]]) {
-[values addObject:[provider createObjectOfClass:[getUIImageClass() class] error:nil]];
+if (isImageType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSString class] toArray:values usingProvider:provider])
 return;
-}
 
-if (isURLType(pasteboardType) && [provider canCreateObjectOfClass:[NSURL class]]) {
-[values addObject:[provider createObjectOfClass:[NSURL class] error:nil]];
+if (isURLType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSURL class] toArray:values usingProvider:provider])
 return;
-}
 
-if (isRichTextType(pasteboardType) && [provider canCreateObjectOfClass:[NSAttributedString class]]) {
-[values addObject:[provider createObjectOfClass:[NSAttributedString class] error:nil]];
+if (isRichTextType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSAttributedString class] toArray:values usingProvider:provider])
 return;
-}
 
-if (isStringType(pasteboardType) && [provider canCreateObjectOfClass:[NSString class]]) {
-[values addObject:[provider createObjectOfClass:[NSString class] error:nil]];
+if (isStringType(pasteboardType) && [self _tryToCreateAndAppendObjectOfClass:[NSString class] toArray:values usingProvider:provider])
 return;
-}
 
 WTFLogAlways("Failed to instantiate object for type: '%s' at index: %tu", pasteboardType.UTF8String, index);
 }];
@@ -199,6 +189,18 @@
 return values;
 }
 
+- (BOOL)_tryToCreateAndAppendObjectOfClass:(Class)objectClass toArray:(NSMutableArray *)array usingProvider:(UIItemProvider *)provider
+{
+if (![provider canCreateObjectOfClass:objectClass])
+return NO;
+
+id object = [provider createObjectOfClass:objectClass error:nil];
+if (object)
+[array addObject:object];
+
+return !!object;
+}
+
 - (NSInteger)changeCount
 {
 return _changeCount;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211923] branches/safari-604.1.5-branch

[matthew_hanson]

Title: [211923] branches/safari-604.1.5-branch








Revision 211923
Author matthew_han...@apple.com
Date 2017-02-08 18:06:07 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211906. rdar://problem/30315079

Modified Paths

branches/safari-604.1.5-branch/Source/WebCore/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/platform/mac/DragDataMac.mm
branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm
branches/safari-604.1.5-branch/Tools/ChangeLog
branches/safari-604.1.5-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

branches/safari-604.1.5-branch/Tools/TestWebKitAPI/Tests/mac/DragAndDropPasteboardTests.mm
branches/safari-604.1.5-branch/Tools/TestWebKitAPI/Tests/mac/full-page-contenteditable.html




Diff

Modified: branches/safari-604.1.5-branch/Source/WebCore/ChangeLog (211922 => 211923)

--- branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:06:03 UTC (rev 211922)
+++ branches/safari-604.1.5-branch/Source/WebCore/ChangeLog	2017-02-09 02:06:07 UTC (rev 211923)
@@ -1,5 +1,29 @@
 2017-02-08  Matthew Hanson  
 
+Merge r211906. rdar://problem/30315079
+
+2017-02-08  Wenson Hsieh  
+
+Add kUTTypeUTF8PlainText and kUTTypeJPEG to the list of compatible content types in DragData
+https://bugs.webkit.org/show_bug.cgi?id=167942
+
+
+Reviewed by Tim Horton.
+
+Adds UTI types for dragging UTF8 plain text and JPEG images to the list of supported types in DragDataMac.mm.
+Also handles reading these types in PasteboardMac.mm. I verified manually with a test app that if a platform
+NSView vends only UTF8 plaintext or JPEG images when dragging, WebKit is able to read the contents of the
+pasteboard as text and an image, respectively.
+
+New TestWebKitAPI tests in DragAndDropPasteboardTests.mm.
+
+* platform/mac/DragDataMac.mm:
+(WebCore::DragData::containsCompatibleContent):
+* platform/mac/PasteboardMac.mm:
+(WebCore::Pasteboard::read):
+
+2017-02-08  Matthew Hanson  
+
 Merge r211716. rdar://problem/30368405
 
 2017-02-05  Wenson Hsieh  


Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/mac/DragDataMac.mm (211922 => 211923)

--- branches/safari-604.1.5-branch/Source/WebCore/platform/mac/DragDataMac.mm	2017-02-09 02:06:03 UTC (rev 211922)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/mac/DragDataMac.mm	2017-02-09 02:06:07 UTC (rev 211923)
@@ -204,8 +204,10 @@
 || types.contains(urlPasteboardType())
 || types.contains(rtfdPasteboardType())
 || types.contains(rtfPasteboardType())
+|| types.contains(String(kUTTypeUTF8PlainText))
 || types.contains(stringPasteboardType())
 || types.contains(colorPasteboardType())
+|| types.contains(String(kUTTypeJPEG))
 || types.contains(String(kUTTypePNG));
 }
 


Modified: branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm (211922 => 211923)

--- branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm	2017-02-09 02:06:03 UTC (rev 211922)
+++ branches/safari-604.1.5-branch/Source/WebCore/platform/mac/PasteboardMac.mm	2017-02-09 02:06:07 UTC (rev 211923)
@@ -414,6 +414,13 @@
 }
 }
 
+if (types.contains(String(kUTTypeJPEG))) {
+if (RefPtr buffer = strategy.bufferForType(kUTTypeJPEG, m_pasteboardName)) {
+if (reader.readImage(buffer.releaseNonNull(), ASCIILiteral("image/jpeg")))
+return;
+}
+}
+
 if (types.contains(String(NSURLPboardType))) {
 URL url = ""
 String title = strategy.stringForType(WebURLNamePboardType, m_pasteboardName);
@@ -426,6 +433,12 @@
 if (!string.isNull() && reader.readPlainText(string))
 return;
 }
+
+if (types.contains(String(kUTTypeUTF8PlainText))) {
+String string = strategy.stringForType(kUTTypeUTF8PlainText, m_pasteboardName);
+if (!string.isNull() && reader.readPlainText(string))
+return;
+}
 }
 
 bool Pasteboard::hasData()


Modified: branches/safari-604.1.5-branch/Tools/ChangeLog (211922 => 211923)

--- branches/safari-604.1.5-branch/Tools/ChangeLog	2017-02-09 02:06:03 UTC (rev 211922)
+++ branches/safari-604.1.5-branch/Tools/ChangeLog	2017-02-09 02:06:07 UTC (rev 211923)
@@ -1,3 +1,56 @@
+2017-02-08  Matthew Hanson  
+
+Merge r211906. rdar://problem/30315079
+
+2017-02-08  Wenson Hsieh  
+
+Add kUTTypeUTF8PlainText and kUTTypeJPEG to the list of compatible content types in DragData
+https://bugs.webkit.org/show_bug.cgi?id=167942
+
+
+Reviewed by Tim Horton.
+
+Adds a new test case that simulates dragging from a source 

[webkit-changes] [211920] branches/safari-604.1.5-branch/Source/WebKit2

[matthew_hanson]

Title: [211920] branches/safari-604.1.5-branch/Source/WebKit2








Revision 211920
Author matthew_han...@apple.com
Date 2017-02-08 18:05:54 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211643. rdar://problem/30334861

Modified Paths

branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211919 => 211920)

--- branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-09 02:05:51 UTC (rev 211919)
+++ branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-09 02:05:54 UTC (rev 211920)
@@ -1,5 +1,28 @@
 2017-02-08  Matthew Hanson  
 
+Merge r211643. rdar://problem/30334861
+
+2017-02-03  Wenson Hsieh  
+
+WKActionSheet should dismiss with animation when done with the sheet
+https://bugs.webkit.org/show_bug.cgi?id=167804
+
+
+Reviewed by Tim Horton.
+
+Currently, we do not dismiss the action menu when -doneWithSheet is invoked. While this is okay when the menu is
+dismissed via tap (since it will be dismissed as default behavior by the popover controller) we need to manually
+dismiss it if we are trying to programmatically dismiss the action sheet/menu.
+
+* UIProcess/ios/WKActionSheet.mm:
+(-[WKActionSheet presentSheetFromRect:]):
+(-[WKActionSheet doneWithSheet]):
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView setupInteraction]):
+(-[WKContentView resignFirstResponder]):
+
+2017-02-08  Matthew Hanson  
+
 Merge r211597. rdar://problem/30295261
 
 2017-02-02  Wenson Hsieh  


Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm (211919 => 211920)

--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm	2017-02-09 02:05:51 UTC (rev 211919)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm	2017-02-09 02:05:54 UTC (rev 211920)
@@ -37,6 +37,7 @@
 BOOL _isRotating;
 BOOL _readyToPresentAfterRotation;
 
+RetainPtr _currentPresentingViewController;
 RetainPtr _presentedViewControllerWhileRotating;
 RetainPtr> _popoverPresentationControllerDelegateWhileRotating;
 }
@@ -99,8 +100,8 @@
 if (_popoverPresentationControllerDelegateWhileRotating)
 presentationController.delegate = _popoverPresentationControllerDelegateWhileRotating.get();
 
-UIViewController *presentingViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:view];
-[presentingViewController presentViewController:presentedViewController animated:YES completion:NULL];
+_currentPresentingViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:view];
+[_currentPresentingViewController presentViewController:presentedViewController animated:YES completion:nil];
 
 return YES;
 }
@@ -107,6 +108,10 @@
 
 - (void)doneWithSheet
 {
+if (_currentPresentingViewController)
+[_currentPresentingViewController dismissViewControllerAnimated:YES completion:nil];
+
+_currentPresentingViewController = nil;
 _presentedViewControllerWhileRotating = nil;
 _popoverPresentationControllerDelegateWhileRotating = nil;
 


Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211919 => 211920)

--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-09 02:05:51 UTC (rev 211919)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-09 02:05:54 UTC (rev 211920)
@@ -580,7 +580,7 @@
 
 #if ENABLE(DATA_INTERACTION)
 _dataInteractionGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_dataInteractionGestureRecognizer:)]);
-[_dataInteractionGestureRecognizer setDelay:0.25];
+[_dataInteractionGestureRecognizer setDelay:0.5];
 [_dataInteractionGestureRecognizer setDelegate:self];
 [_dataInteractionGestureRecognizer _setRequiresQuietImpulse:YES];
 [self addGestureRecognizer:_dataInteractionGestureRecognizer.get()];
@@ -848,9 +848,6 @@
 
 - (BOOL)resignFirstResponder
 {
-#if ENABLE(DATA_INTERACTION)
-_dataInteractionState.shouldHandleLongPressAction = NO;
-#endif
 // FIXME: Maybe we should call resignFirstResponder on the superclass
 // and do nothing if the return value is NO.
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211917] branches/safari-604.1.5-branch/Source/WebKit2

[matthew_hanson]

Title: [211917] branches/safari-604.1.5-branch/Source/WebKit2








Revision 211917
Author matthew_han...@apple.com
Date 2017-02-08 18:05:40 -0800 (Wed, 08 Feb 2017)


Log Message
Merge r211442. rdar://problem/30272380

Modified Paths

branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211916 => 211917)

--- branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-09 02:05:40 UTC (rev 211917)
@@ -1,3 +1,22 @@
+2017-02-08  Matthew Hanson  
+
+Merge r211442. rdar://problem/30272380
+
+2017-01-31  Wenson Hsieh  
+
+Crash when trying to compute global location when the WKContentView does not have a window
+https://bugs.webkit.org/show_bug.cgi?id=167627
+
+
+Reviewed by Beth Dakin.
+
+Moves data interaction state out of OpenSource and into WebKitAdditions. Work towards fixing a crash in
+.
+
+* UIProcess/ios/WKContentViewInteraction.h:
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView resignFirstResponder]):
+
 2017-02-07  Matthew Hanson  
 
 Merge r211752. rdar://problem/30119091


Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211916 => 211917)

--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2017-02-09 02:05:40 UTC (rev 211917)
@@ -118,6 +118,9 @@
 RetainPtr _twoFingerDoubleTapGestureRecognizer;
 RetainPtr _twoFingerSingleTapGestureRecognizer;
 RetainPtr _inspectorNodeSearchGestureRecognizer;
+#if ENABLE(DATA_INTERACTION)
+RetainPtr _dataInteractionGestureRecognizer;
+#endif
 
 RetainPtr _textSelectionAssistant;
 RetainPtr _webSelectionAssistant;
@@ -185,10 +188,7 @@
 BOOL _needsDeferredEndScrollingSelectionUpdate;
 
 #if ENABLE(DATA_INTERACTION)
-RetainPtr _dataInteractionGestureRecognizer;
-RetainPtr _currentDataInteractionImage;
-CGPoint _currentDataInteractionOrigin;
-BOOL _shouldHandleLongPressActionAfterDataInteraction;
+WebKit::WKDataInteractionState _dataInteractionState;
 #endif
 }
 


Modified: branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211916 => 211917)

--- branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-09 02:05:36 UTC (rev 211916)
+++ branches/safari-604.1.5-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-02-09 02:05:40 UTC (rev 211917)
@@ -849,7 +849,7 @@
 - (BOOL)resignFirstResponder
 {
 #if ENABLE(DATA_INTERACTION)
-_shouldHandleLongPressActionAfterDataInteraction = NO;
+_dataInteractionState.shouldHandleLongPressAction = NO;
 #endif
 // FIXME: Maybe we should call resignFirstResponder on the superclass
 // and do nothing if the return value is NO.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211911] branches/safari-604.1.5-branch/Source

[matthew_hanson]

Title: [211911] branches/safari-604.1.5-branch/Source








Revision 211911
Author matthew_han...@apple.com
Date 2017-02-08 17:24:36 -0800 (Wed, 08 Feb 2017)


Log Message
Versioning.

Modified Paths

branches/safari-604.1.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-604.1.5-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-604.1.5-branch/Source/WebCore/PAL/Configurations/Version.xcconfig
branches/safari-604.1.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-604.1.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-604.1.5-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-604.1.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.5-branch/Source/WebCore/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/WebCore/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/WebCore/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.5-branch/Source/WebCore/PAL/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/WebCore/PAL/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: branches/safari-604.1.5-branch/Source/WebKit2/Configurations/Version.xcconfig (211910 => 211911)

--- branches/safari-604.1.5-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-02-09 00:56:42 UTC (rev 211910)
+++ branches/safari-604.1.5-branch/Source/WebKit2/Configurations/Version.xcconfig	2017-02-09 01:24:36 UTC (rev 211911)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 604;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
-MICRO_VERSION = 4;
+MICRO_VERSION = 5;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211850] tags/Safari-604.1.5.4/

[matthew_hanson]

Title: [211850] tags/Safari-604.1.5.4/








Revision 211850
Author matthew_han...@apple.com
Date 2017-02-07 17:14:42 -0800 (Tue, 07 Feb 2017)


Log Message
Tag Safari-604.1.5.4.

Added Paths

tags/Safari-604.1.5.4/




Diff




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211810] branches/safari-604.1.5-branch/Source/WebKit2

[matthew_hanson]

Title: [211810] branches/safari-604.1.5-branch/Source/WebKit2








Revision 211810
Author matthew_han...@apple.com
Date 2017-02-07 06:50:04 -0800 (Tue, 07 Feb 2017)


Log Message
Merge r211752. rdar://problem/30119091

Modified Paths

branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.5-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb




Diff

Modified: branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog (211809 => 211810)

--- branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-07 14:50:01 UTC (rev 211809)
+++ branches/safari-604.1.5-branch/Source/WebKit2/ChangeLog	2017-02-07 14:50:04 UTC (rev 211810)
@@ -1,3 +1,16 @@
+2017-02-07  Matthew Hanson  
+
+Merge r211752. rdar://problem/30119091
+
+2017-02-06  Jer Noble  
+
+Update sandbox to allow CoreMedia to perform custom media loading.
+https://bugs.webkit.org/show_bug.cgi?id=167700
+
+Reviewed by Alexey Proskuryakov.
+
+* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+
 2017-02-02  Matthew Hanson  
 
 Merge r211438.


Modified: branches/safari-604.1.5-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (211809 => 211810)

--- branches/safari-604.1.5-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2017-02-07 14:50:01 UTC (rev 211809)
+++ branches/safari-604.1.5-branch/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2017-02-07 14:50:04 UTC (rev 211810)
@@ -97,3 +97,7 @@
 (allow file-issue-extension (require-all
 (extension "com.apple.app-sandbox.read")
 (extension-class "com.apple.mediaserverd.read")))
+
+;; Allow CoreMedia to communicate with mediaserverd in order to implement custom media loading
+(allow mach-lookup
+(global-name "com.apple.coremedia.customurlloader.xpc"))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [211809] branches/safari-604.1.5-branch

[matthew_hanson]

Title: [211809] branches/safari-604.1.5-branch








Revision 211809
Author matthew_han...@apple.com
Date 2017-02-07 06:50:01 -0800 (Tue, 07 Feb 2017)


Log Message
Merge r211659. rdar://problem/30386165

Modified Paths

branches/safari-604.1.5-branch/LayoutTests/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/ChangeLog
branches/safari-604.1.5-branch/Source/WebCore/html/HTMLMediaElement.cpp


Added Paths

branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash-expected.txt
branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash.html




Diff

Modified: branches/safari-604.1.5-branch/LayoutTests/ChangeLog (211808 => 211809)

--- branches/safari-604.1.5-branch/LayoutTests/ChangeLog	2017-02-07 14:49:57 UTC (rev 211808)
+++ branches/safari-604.1.5-branch/LayoutTests/ChangeLog	2017-02-07 14:50:01 UTC (rev 211809)
@@ -1,3 +1,17 @@
+2017-02-07  Matthew Hanson  
+
+Merge r211659. rdar://problem/30386165
+
+2017-02-03  Jer Noble  
+
+ASSERT in HTMLMediaElement::~HTMLMediaElement
+https://bugs.webkit.org/show_bug.cgi?id=167818
+
+Reviewed by Brent Fulgham.
+
+* media/audio-dealloc-crash-expected.txt: Added.
+* media/audio-dealloc-crash.html: Added.
+
 2017-02-02  Matthew Hanson  
 
 Merge r211495. rdar://problem/30106362


Added: branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash-expected.txt (0 => 211809)

--- branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash-expected.txt	(rev 0)
+++ branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash-expected.txt	2017-02-07 14:50:01 UTC (rev 211809)
@@ -0,0 +1,2 @@
+END OF TEST
+


Added: branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash.html (0 => 211809)

--- branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash.html	(rev 0)
+++ branches/safari-604.1.5-branch/LayoutTests/media/audio-dealloc-crash.html	2017-02-07 14:50:01 UTC (rev 211809)
@@ -0,0 +1,20 @@
+
+
+
+
+
+
Creating and immediately destroying an Audio element should not crash.
+