Changeset 163660 in webkit

Timestamp:

Feb 7, 2014 4:19:49 PM (10 years ago)

Author:

mitz@apple.com

Message:

iOS build fix.

• Misc/WebElementDictionary.mm:

(+[WebElementDictionary initializeLookupTable]):
(-[WebElementDictionary _image]):
(-[WebElementDictionary _imageRect]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebElementDictionary.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-02-07  Dan Bernstein  <mitz@apple.com>
+
+        iOS build fix.
+
+        * Misc/WebElementDictionary.mm:
+        (+[WebElementDictionary initializeLookupTable]):
+        (-[WebElementDictionary _image]):
+        (-[WebElementDictionary _imageRect]):
+
 2014-02-06  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm

@@ -84 +84 @@
     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));
@@ -205 +207 @@
 }
 
+#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
-}
 
 - (NSURL *)_absoluteImageURL