Title: [162831] trunk/Source/WebKit/mac
- Revision
- 162831
- Author
- [email protected]
- Date
- 2014-01-27 01:09:18 -0800 (Mon, 27 Jan 2014)
Log Message
Another iOS build fix.
* Misc/WebElementDictionary.mm:
(-[WebElementDictionary _image]):
We were apparently depending on Image::getNSImage() being defined
(yet always returning nullptr) on iOS.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (162830 => 162831)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-27 08:27:01 UTC (rev 162830)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-27 09:09:18 UTC (rev 162831)
@@ -1,3 +1,12 @@
+2014-01-27 Tim Horton <[email protected]>
+
+ Another iOS build fix.
+
+ * Misc/WebElementDictionary.mm:
+ (-[WebElementDictionary _image]):
+ We were apparently depending on Image::getNSImage() being defined
+ (yet always returning nullptr) on iOS.
+
2014-01-26 David Kilzer <[email protected]>
Remove duplicate settings for ENABLE(DISK_IMAGE_CACHE)
Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (162830 => 162831)
--- trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-01-27 08:27:01 UTC (rev 162830)
+++ trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-01-27 09:09:18 UTC (rev 162831)
@@ -206,8 +206,12 @@
- (NSImage *)_image
{
+#if !PLATFORM(IOS)
Image* image = _result->image();
return image ? image->getNSImage() : nil;
+#else
+ return nil;
+#endif
}
- (NSValue *)_imageRect
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
