Title: [161592] trunk/Source/WebCore
- Revision
- 161592
- Author
- [email protected]
- Date
- 2014-01-09 15:59:13 -0800 (Thu, 09 Jan 2014)
Log Message
Attempt to fix the Mountain Lion Release (32-bit) build following <http://trac.webkit.org/changeset/161589>
(https://bugs.webkit.org/show_bug.cgi?id=126654)
* platform/ios/WebEvent.h:
* platform/ios/WebEvent.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161591 => 161592)
--- trunk/Source/WebCore/ChangeLog 2014-01-09 23:56:57 UTC (rev 161591)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 23:59:13 UTC (rev 161592)
@@ -1,5 +1,13 @@
2014-01-09 Daniel Bates <[email protected]>
+ Attempt to fix the Mountain Lion Release (32-bit) build following <http://trac.webkit.org/changeset/161589>
+ (https://bugs.webkit.org/show_bug.cgi?id=126654)
+
+ * platform/ios/WebEvent.h:
+ * platform/ios/WebEvent.mm:
+
+2014-01-09 Daniel Bates <[email protected]>
+
[iOS] Upstream WebCore/platform changes
https://bugs.webkit.org/show_bug.cgi?id=126654
Modified: trunk/Source/WebCore/platform/ios/WebEvent.h (161591 => 161592)
--- trunk/Source/WebCore/platform/ios/WebEvent.h 2014-01-09 23:56:57 UTC (rev 161591)
+++ trunk/Source/WebCore/platform/ios/WebEvent.h 2014-01-09 23:59:13 UTC (rev 161592)
@@ -23,13 +23,15 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-// FIXME: Rename this file to WebEventIOS.h after we upstream the iOS port.
+// FIXME: Rename this file to WebEventIOS.mm after we upstream the iOS port and remove the PLATFORM(IOS)-guard.
#ifndef WebEventIOS_h
#define WebEventIOS_h
#import <CoreGraphics/CoreGraphics.h>
#import <Foundation/Foundation.h>
+#if PLATFORM(IOS)
+
typedef enum {
WebEventMouseDown,
WebEventMouseUp,
@@ -189,4 +191,5 @@
@interface WebIOSEvent : WebEvent
@end
+#endif // PLATFORM(IOS)
#endif // WebEventIOS_h
Modified: trunk/Source/WebCore/platform/ios/WebEvent.mm (161591 => 161592)
--- trunk/Source/WebCore/platform/ios/WebEvent.mm 2014-01-09 23:56:57 UTC (rev 161591)
+++ trunk/Source/WebCore/platform/ios/WebEvent.mm 2014-01-09 23:59:13 UTC (rev 161592)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-// FIXME: Rename this file to WebEventIOS.mm after we upstream the iOS port.
+// FIXME: Rename this file to WebEventIOS.mm after we upstream the iOS port and remove the PLATFORM(IOS)-guard.
#import "config.h"
#import "WebEvent.h"
@@ -34,6 +34,8 @@
using namespace WebCore;
+#if PLATFORM(IOS)
+
@implementation WebEvent
@synthesize type = _type;
@@ -493,3 +495,5 @@
}
@end
+
+#endif // PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
