Title: [163660] trunk/Source/WebKit/mac
- Revision
- 163660
- Author
- m...@apple.com
- Date
- 2014-02-07 16:19:49 -0800 (Fri, 07 Feb 2014)
Log Message
iOS build fix.
* Misc/WebElementDictionary.mm:
(+[WebElementDictionary initializeLookupTable]):
(-[WebElementDictionary _image]):
(-[WebElementDictionary _imageRect]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (163659 => 163660)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-08 00:16:51 UTC (rev 163659)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-08 00:19:49 UTC (rev 163660)
@@ -1,3 +1,12 @@
+2014-02-07 Dan Bernstein <m...@apple.com>
+
+ iOS build fix.
+
+ * Misc/WebElementDictionary.mm:
+ (+[WebElementDictionary initializeLookupTable]):
+ (-[WebElementDictionary _image]):
+ (-[WebElementDictionary _imageRect]):
+
2014-02-06 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Add Console support to JSContext Inspection
Modified: trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm (163659 => 163660)
--- trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-02-08 00:16:51 UTC (rev 163659)
+++ trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-02-08 00:19:49 UTC (rev 163660)
@@ -83,8 +83,10 @@
addLookupKey(WebElementDOMNodeKey, @selector(_domNode));
addLookupKey(WebElementFrameKey, @selector(_webFrame));
addLookupKey(WebElementImageAltStringKey, @selector(_altDisplayString));
+#if !PLATFORM(IOS)
addLookupKey(WebElementImageKey, @selector(_image));
addLookupKey(WebElementImageRectKey, @selector(_imageRect));
+#endif
addLookupKey(WebElementImageURLKey, @selector(_absoluteImageURL));
addLookupKey(WebElementIsSelectedKey, @selector(_isSelected));
addLookupKey(WebElementMediaURLKey, @selector(_absoluteMediaURL));
@@ -204,26 +206,22 @@
return NSStringOrNil(_result->spellingToolTip(dir));
}
+#if !PLATFORM(IOS)
+
- (NSImage *)_image
{
-#if !PLATFORM(IOS)
Image* image = _result->image();
return image ? image->getNSImage() : nil;
-#else
- return nil;
-#endif
}
- (NSValue *)_imageRect
{
-#if !PLATFORM(IOS)
IntRect rect = _result->imageRect();
return rect.isEmpty() ? nil : [NSValue valueWithRect:rect];
-#else
- return nil;
-#endif
}
+#endif
+
- (NSURL *)_absoluteImageURL
{
return _result->absoluteImageURL();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
