Title: [104066] trunk/Source/WebKit/mac
- Revision
- 104066
- Author
- [email protected]
- Date
- 2012-01-04 14:02:53 -0800 (Wed, 04 Jan 2012)
Log Message
Ambiguous if-then-else in Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
https://bugs.webkit.org/show_bug.cgi?id=75447
Reviewed by Brian Weinstein.
Resolve the ambiguity.
* Misc/WebNSPasteboardExtras.mm:
(-[NSPasteboard _web_writeImage:element:URL:title:archive:types:source:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (104065 => 104066)
--- trunk/Source/WebKit/mac/ChangeLog 2012-01-04 22:01:14 UTC (rev 104065)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-01-04 22:02:53 UTC (rev 104066)
@@ -1,3 +1,15 @@
+2012-01-04 Anders Carlsson <[email protected]>
+
+ Ambiguous if-then-else in Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+ https://bugs.webkit.org/show_bug.cgi?id=75447
+
+ Reviewed by Brian Weinstein.
+
+ Resolve the ambiguity.
+
+ * Misc/WebNSPasteboardExtras.mm:
+ (-[NSPasteboard _web_writeImage:element:URL:title:archive:types:source:]):
+
2012-01-04 Mihnea Ovidenie <[email protected]>
[Mac]Fix build after changeset 103997
Modified: trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (104065 => 104066)
--- trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2012-01-04 22:01:14 UTC (rev 104065)
+++ trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2012-01-04 22:02:53 UTC (rev 104066)
@@ -248,14 +248,15 @@
[self setData:[element _imageTIFFRepresentation] forType:NSTIFFPboardType];
}
- if (archive)
+ if (archive) {
if ([types containsObject:WebArchivePboardType])
[self setData:[archive data] forType:WebArchivePboardType];
- else {
- // We should not have declared types that we aren't going to write (4031826).
- ASSERT(![types containsObject:NSRTFDPboardType]);
- ASSERT(![types containsObject:WebArchivePboardType]);
+ return;
}
+
+ // We should not have declared types that we aren't going to write (4031826).
+ ASSERT(![types containsObject:NSRTFDPboardType]);
+ ASSERT(![types containsObject:WebArchivePboardType]);
}
- (id)_web_declareAndWriteDragImageForElement:(DOMElement *)element
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
