Title: [211716] trunk/Source/WebCore
- Revision
- 211716
- Author
- [email protected]
- Date
- 2017-02-05 22:23:50 -0800 (Sun, 05 Feb 2017)
Log Message
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]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211715 => 211716)
--- trunk/Source/WebCore/ChangeLog 2017-02-06 06:17:55 UTC (rev 211715)
+++ trunk/Source/WebCore/ChangeLog 2017-02-06 06:23:50 UTC (rev 211716)
@@ -1,3 +1,20 @@
+2017-02-05 Wenson Hsieh <[email protected]>
+
+ 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-05 Simon Fraser <[email protected]>
Remove unparentsOffscreenTiles logic in TileController
Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h (211715 => 211716)
--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h 2017-02-06 06:17:55 UTC (rev 211715)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h 2017-02-06 06:23:50 UTC (rev 211716)
@@ -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: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (211715 => 211716)
--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-02-06 06:17:55 UTC (rev 211715)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2017-02-06 06:23:50 UTC (rev 211716)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
