<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176105] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176105">176105</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-13 16:34:29 -0800 (Thu, 13 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] NSGeometry data types are not available in the public SDK
https://bugs.webkit.org/show_bug.cgi?id=137536
Reviewed by David Kilzer.
Source/WebCore:
Towards building iOS WebKit with the public iOS SDK, define NSGeometry
data types and functions in terms of CGGeometry data types and functions
because the former is SPI on iOS.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Include
header WAKAppKitStubs.h when building for iOS. Otherwise, include header NSGeometry.h.
* platform/graphics/ca/mac/PlatformCALayerMac.mm: Remove import of private header NSGeometry.h.
We will use the NSGeometry data types defined in WAKAppKitStubs.h, which is implicitly imported
by header WAKWindow.h.
* platform/graphics/mac/MediaPlayerProxy.h: Substitute WAKAppKitStubs.h for NSGeometry.h.
* platform/ios/PlatformEventFactoryIOS.mm: Ditto. Also fix up style issues with #import directives.
* platform/ios/WebEvent.mm: Ditto.
* platform/ios/wak/WAKAppKitStubs.h: Define typedefs and macros that map NSGeometry data types
and functions to the analogous CGGeometry data types and functions. Also, remove #ifdef __OBJC__-
guard as the existing content in WAKAppKitStubs.h assumes that this file will only be included
in an Objective-C/Objective-C++ file.
* platform/ios/wak/WAKView.h: Import header WAKAppKitStubs.h instead of defining macros for some
NSGeometry data types.
Source/WebKit/mac:
Substitute header WAKAppKitStubs.h for NSGeometry.h as the latter is a
private header.
* DOM/WebDOMOperationsPrivate.h:
Source/WebKit2:
Substitute header WAKAppKitStubs.h for NSGeometry.h as the latter is a
private header.
* Shared/ios/NativeWebTouchEventIOS.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerProxyh">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformEventFactoryIOSmm">trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebEventmm">trunk/Source/WebCore/platform/ios/WebEvent.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKAppKitStubsh">trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewh">trunk/Source/WebCore/platform/ios/wak/WAKView.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMWebDOMOperationsPrivateh">trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm">trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/ChangeLog 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-11-13 Daniel Bates <dabates@apple.com>
+
+ [iOS] NSGeometry data types are not available in the public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=137536
+
+ Reviewed by David Kilzer.
+
+ Towards building iOS WebKit with the public iOS SDK, define NSGeometry
+ data types and functions in terms of CGGeometry data types and functions
+ because the former is SPI on iOS.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: Include
+ header WAKAppKitStubs.h when building for iOS. Otherwise, include header NSGeometry.h.
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm: Remove import of private header NSGeometry.h.
+ We will use the NSGeometry data types defined in WAKAppKitStubs.h, which is implicitly imported
+ by header WAKWindow.h.
+ * platform/graphics/mac/MediaPlayerProxy.h: Substitute WAKAppKitStubs.h for NSGeometry.h.
+ * platform/ios/PlatformEventFactoryIOS.mm: Ditto. Also fix up style issues with #import directives.
+ * platform/ios/WebEvent.mm: Ditto.
+ * platform/ios/wak/WAKAppKitStubs.h: Define typedefs and macros that map NSGeometry data types
+ and functions to the analogous CGGeometry data types and functions. Also, remove #ifdef __OBJC__-
+ guard as the existing content in WAKAppKitStubs.h assumes that this file will only be included
+ in an Objective-C/Objective-C++ file.
+ * platform/ios/wak/WAKView.h: Import header WAKAppKitStubs.h instead of defining macros for some
+ NSGeometry data types.
+
</ins><span class="cx"> 2014-11-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Fire a layout milestone on session restore based on render tree size
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -76,11 +76,12 @@
</span><span class="cx"> #include "TextTrack.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#import <Foundation/NSGeometry.h>
</del><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#import "WAKAppKitStubs.h"
</ins><span class="cx"> #import <CoreImage/CoreImage.h>
</span><span class="cx"> #else
</span><ins>+#import <Foundation/NSGeometry.h>
</ins><span class="cx"> #import <QuartzCore/CoreImage.h>
</span><span class="cx"> #endif
</span><span class="cx"> #import <CoreMedia/CoreMedia.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #import "WKGraphics.h"
</span><span class="cx"> #import "WebCoreThread.h"
</span><span class="cx"> #import "WebTiledLayer.h"
</span><del>-#import <Foundation/NSGeometry.h>
</del><span class="cx"> #import <QuartzCore/CATiledLayerPrivate.h>
</span><span class="cx"> #else
</span><span class="cx"> #import "ThemeMac.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #if defined(__OBJC__)
</span><del>-#import <Foundation/NSGeometry.h>
</del><ins>+#import <WebCore/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Needed since this is a WebKit private header on iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformEventFactoryIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "PlatformEventFactoryIOS.h"
</span><span class="cx">
</span><del>-#import <Foundation/NSGeometry.h>
-#import <IntPoint.h>
-#import <KeyEventCocoa.h>
-#import <Logging.h>
-#import <WebEvent.h>
</del><ins>+#import "IntPoint.h"
+#import "KeyEventCocoa.h"
+#import "Logging.h"
+#import "WAKAppKitStubs.h"
+#import "WebEvent.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebEventmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebEvent.mm (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebEvent.mm 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/ios/WebEvent.mm 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -29,13 +29,14 @@
</span><span class="cx"> #import "WebEvent.h"
</span><span class="cx">
</span><span class="cx"> #import "KeyEventCocoa.h"
</span><del>-#import <Foundation/NSGeometry.h>
</del><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "WAKAppKitStubs.h"
+
</ins><span class="cx"> @implementation WebEvent
</span><span class="cx">
</span><span class="cx"> @synthesize type = _type;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKAppKitStubsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-// FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
-#import <Foundation/NSGeometry.h>
</del><span class="cx">
</span><span class="cx"> #ifndef NSClipView
</span><span class="cx"> #define NSClipView WAKClipView
</span><span class="lines">@@ -54,13 +52,105 @@
</span><span class="cx"> #define NSResponder WAKResponder
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifdef __OBJC__
</del><ins>+// FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
+//
+// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
+// the condition for including the header Foundation/NSGeometry.h to support internal Apple
+// clients that build without header wtf/Platform.h.
+#if __has_include(<Foundation/NSGeometry.h>)
+
+#import <Foundation/NSGeometry.h>
+
+#else
+
+typedef CGPoint NSPoint;
+typedef CGRect NSRect;
+typedef CGSize NSSize;
+typedef NSUInteger NSRectEdge;
+
+#ifndef NSZeroPoint
+#define NSZeroPoint CGPointZero
+#endif
+#ifndef NSZeroRect
+#define NSZeroRect CGRectZero
+#endif
+#ifndef NSZeroSize
+#define NSZeroSize CGSizeZero
+#endif
+#ifndef NSMakePoint
+#define NSMakePoint CGPointMake
+#endif
+#ifndef NSMakeRect
+#define NSMakeRect CGRectMake
+#endif
+#ifndef NSMakeSize
+#define NSMakeSize CGSizeMake
+#endif
+#ifndef NSEqualPoints
+#define NSEqualPoints CGPointEqualToPoint
+#endif
+#ifndef NSEqualRects
+#define NSEqualRects CGRectEqualToRect
+#endif
+#ifndef NSEqualSizes
+#define NSEqualSizes CGSizeEqualToSize
+#endif
+#ifndef NSInsetRect
+#define NSInsetRect CGRectInset
+#endif
+#ifndef NSIntersectionRect
+#define NSIntersectionRect CGRectIntersection
+#endif
+#ifndef NSIsEmptyRect
+#define NSIsEmptyRect CGRectIsEmpty
+#endif
+#ifndef NSContainsRect
+#define NSContainsRect CGRectContainsRect
+#endif
+#ifndef NSPointInRect
+#define NSPointInRect(x, y) CGRectContainsPoint((y), (x))
+#endif
+#ifndef NSMinX
+#define NSMinX CGRectGetMinX
+#endif
+#ifndef NSMinY
+#define NSMinY CGRectGetMinY
+#endif
+#ifndef NSMaxX
+#define NSMaxX CGRectGetMaxX
+#endif
+#ifndef NSMaxY
+#define NSMaxY CGRectGetMaxY
+#endif
+#ifndef NSMinXEdge
+#define NSMinXEdge CGRectMinXEdge
+#endif
+#ifndef NSMinYEdge
+#define NSMinYEdge CGRectMinYEdge
+#endif
+#ifndef NSMaxXEdge
+#define NSMaxXEdge CGRectMaxXEdge
+#endif
+#ifndef NSMaxYEdge
+#define NSMaxYEdge CGRectMaxYEdge
+#endif
+
+@interface NSValue (NSGeometryDetails)
++ (NSValue *)valueWithPoint:(NSPoint)point;
++ (NSValue *)valueWithRect:(NSRect)rect;
++ (NSValue *)valueWithSize:(NSSize)size;
+@property (readonly) NSPoint pointValue;
+@property (readonly) NSRect rectValue;
+@property (readonly) NSSize sizeValue;
+@end
+
+#endif // __has_include(<Foundation/NSGeometry.h>)
+
</ins><span class="cx"> @class WAKClipView;
</span><span class="cx"> @class WAKResponder;
</span><span class="cx"> @class WAKScrollView;
</span><span class="cx"> @class WAKView;
</span><span class="cx"> @class WAKWindow;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> /* Device-independent bits found in event modifier flags */
</span><span class="cx"> enum {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.h (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.h 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.h 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -28,16 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span><ins>+#import "WAKAppKitStubs.h"
</ins><span class="cx"> #import "WAKResponder.h"
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx">
</span><del>-#ifndef NSRect
-#define NSRect CGRect
-#endif
-#define NSPoint CGPoint
-#define NSSize CGSize
-
</del><span class="cx"> extern NSString *WAKViewFrameSizeDidChangeNotification;
</span><span class="cx"> extern NSString *WAKViewDidScrollNotification;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-13 Daniel Bates <dabates@apple.com>
+
+ [iOS] NSGeometry data types are not available in the public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=137536
+
+ Reviewed by David Kilzer.
+
+ Substitute header WAKAppKitStubs.h for NSGeometry.h as the latter is a
+ private header.
+
+ * DOM/WebDOMOperationsPrivate.h:
+
</ins><span class="cx"> 2014-11-13 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1: Support default actions for video
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <Foundation/NSGeometry.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #else
</span><span class="cx"> #import <AppKit/NSEvent.h>
</span><span class="cx"> #import <WebKitLegacy/DOMWheelEvent.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-13 Daniel Bates <dabates@apple.com>
+
+ [iOS] NSGeometry data types are not available in the public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=137536
+
+ Reviewed by David Kilzer.
+
+ Substitute header WAKAppKitStubs.h for NSGeometry.h as the latter is a
+ private header.
+
+ * Shared/ios/NativeWebTouchEventIOS.mm:
+
</ins><span class="cx"> 2014-11-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Fire a layout milestone on session restore based on render tree size
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (176104 => 176105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2014-11-14 00:33:03 UTC (rev 176104)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm 2014-11-14 00:34:29 UTC (rev 176105)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "WebEvent.h"
</span><del>-#import <Foundation/NSGeometry.h>
</del><span class="cx"> #import <UIKit/UITouch.h>
</span><span class="cx"> #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
</span><span class="cx"> #import <WebCore/IntPoint.h>
</span><ins>+#import <WebCore/WAKAppKitStubs.h>
</ins><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>
</body>
</html>