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
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 <matt_han...@apple.com>
+ Merge r211716. rdar://problem/30368405
+
+ 2017-02-05 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Data interaction fails in Safari splitscreen mode when dropping into a contenteditable
+ https://bugs.webkit.org/show_bug.cgi?id=167862
+ <rdar://problem/30368405>
+
+ 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 <matt_han...@apple.com>
+
Merge r211597. rdar://problem/30295261
2017-02-02 Wenson Hsieh <wenson_hs...@apple.com>
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
