[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mitz at apple.com
mitz at apple.com
Wed Dec 22 14:54:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2586fa1e6d82f89fe2c130ab4d3489ff9a7eeebb
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 23:24:19 2010 +0000
Build fix. Add stub implementations for required NSDraggingInfo methods.
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
(-[DumpRenderTreeDraggingInfo draggingFormation]):
(-[DumpRenderTreeDraggingInfo setDraggingFormation:]):
(-[DumpRenderTreeDraggingInfo animatesToDestination]):
(-[DumpRenderTreeDraggingInfo setAnimatesToDestination:]):
(-[DumpRenderTreeDraggingInfo numberOfValidItemsForDrop]):
(-[DumpRenderTreeDraggingInfo setNumberOfValidItemsForDrop:]):
(-[DumpRenderTreeDraggingInfo enumerateDraggingItemsWithOptions:forView:classes:searchOptions:usingBlock:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 67a1cee..8f43b20 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-23 Dan Bernstein <mitz at apple.com>
+
+ Build fix. Add stub implementations for required NSDraggingInfo methods.
+
+ * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
+ (-[DumpRenderTreeDraggingInfo draggingFormation]):
+ (-[DumpRenderTreeDraggingInfo setDraggingFormation:]):
+ (-[DumpRenderTreeDraggingInfo animatesToDestination]):
+ (-[DumpRenderTreeDraggingInfo setAnimatesToDestination:]):
+ (-[DumpRenderTreeDraggingInfo numberOfValidItemsForDrop]):
+ (-[DumpRenderTreeDraggingInfo setNumberOfValidItemsForDrop:]):
+ (-[DumpRenderTreeDraggingInfo enumerateDraggingItemsWithOptions:forView:classes:searchOptions:usingBlock:]):
+
2010-10-23 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
index 02280a1..8eded66 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
@@ -105,5 +105,42 @@
return nil;
}
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+- (NSDraggingFormation)draggingFormation
+{
+ return NSDraggingFormationDefault;
+}
+
+- (void)setDraggingFormation:(NSDraggingFormation)formation
+{
+ // Ignored.
+}
+
+- (BOOL)animatesToDestination
+{
+ return NO;
+}
+
+- (void)setAnimatesToDestination:(BOOL)flag
+{
+ // Ignored.
+}
+
+- (NSInteger)numberOfValidItemsForDrop
+{
+ return 1;
+}
+
+- (void)setNumberOfValidItemsForDrop:(NSInteger)number
+{
+ // Ignored.
+}
+
+- (void)enumerateDraggingItemsWithOptions:(NSEnumerationOptions)enumOpts forView:(NSView *)view classes:(NSArray *)classArray searchOptions:(NSDictionary *)searchOptions usingBlock:(void (^)(NSDraggingItem *draggingItem, NSInteger idx, BOOL *stop))block
+{
+ // Ignored.
+}
+#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list