<!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>[161910] 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/161910">161910</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 14:55:47 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Various iOS WebKit1 build fixes.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: iOS WebKit1 needs various
headers to be Private.
Source/WebKit/mac:
* Configurations/WebKit.xcconfig: Add more Mac-only files
to the excluded files list for iOS.
* DefaultDelegates/WebDefaultUIDelegate.m: Don't include WebJavaScriptTextInputPanel.h
on iOS
* History/WebHistory.h: NSCalendarDate doesn't exist on iOS.
* Misc/WebDownload.h: Need WAKAppKitStubs.h
* Misc/WebNSViewExtras.m: No WebNSPasteboardExtras on iOS
* Storage/WebDatabaseManagerClient.mm: Need DatabaseTracker.h, no harm
in including it for all platforms.
* WebCoreSupport/WebEditorClient.h: Remove useless comment.
* WebCoreSupport/WebEditorClient.mm:
(nsStringWithoutCopying): Moved
(WebEditorClient::checkTextOfParagraph): Modernized.
* WebInspector/WebNodeHighlightView.mm: Need FloatQuad.h.
* WebView/WebDataSource.mm: Need WebFrameViewInternal.h
* WebView/WebDocument.h: Needs WAKView.h.
* WebView/WebFrameView.h: Ditto.
* WebView/WebHTMLView.h: Ditto.
* WebView/WebPDFDocumentExtras.mm:
(allScriptsInPDFDocument): No PDFDocument on iOS.
* WebView/WebPolicyDelegate.h:
* WebView/WebView.h: Fix incorrect #if.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitxcconfig">trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem">trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryh">trunk/Source/WebKit/mac/History/WebHistory.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrasm">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerClientmm">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewh">trunk/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewh">trunk/Source/WebKit/mac/WebView/WebHTMLView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFDocumentExtrasmm">trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPolicyDelegateh">trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewh">trunk/Source/WebKit/mac/WebView/WebView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-01-13 Simon Fraser <simon.fraser@apple.com>
+
+ Various iOS WebKit1 build fixes.
+
+ * WebCore.xcodeproj/project.pbxproj: iOS WebKit1 needs various
+ headers to be Private.
+
</ins><span class="cx"> 2014-01-13 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Map RootInlineBox to containing region via bit+hashmap.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -454,6 +454,7 @@
</span><span class="cx"> 0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C45342510CDBBFA00869157 /* JSWebGLUniformLocation.cpp */; };
</span><span class="cx"> 0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */; };
</span><span class="cx"> 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F03C0731884695E00A5F8CA /* SystemMemory.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C522D4A15B478B2009B7C95 /* InspectorOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0F09087F1444FDB200028917 /* ScrollbarTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */; };
</span><span class="cx"> 0F099D0817B968A100FF84B9 /* WebCoreTypedArrayController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */; };
</span><span class="cx"> 0F099D0917B968A100FF84B9 /* WebCoreTypedArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -980,7 +981,7 @@
</span><span class="cx"> 26B999971804D54200D01121 /* SelectorCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 26B999951804D54200D01121 /* SelectorCompiler.h */; };
</span><span class="cx"> 26C15CF61857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C15CF41857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp */; };
</span><span class="cx"> 26C15CF71857E15E00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C15CF51857E15D00F15C03 /* ResourceHandleCFURLConnectionDelegateWithOperationQueue.h */; };
</span><del>- 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */; };
</del><ins>+ 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 26C17A3F1491D2D400D12BA2 /* FileSystemIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26C17A3D1491D2D400D12BA2 /* FileSystemIOS.mm */; };
</span><span class="cx"> 26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 26E98A0F130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h */; };
</span><span class="cx"> 26F40D4A14904A6300CA67C4 /* EventLoopIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */; };
</span><span class="lines">@@ -3673,7 +3674,7 @@
</span><span class="cx"> A54A82EC15228D2F00C72BA6 /* DOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
</span><span class="cx"> A54A82F115228DF600C72BA6 /* DOMNodePrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A54A82EA15228CA300C72BA6 /* DOMNodePrivate.h */; };
</span><span class="cx"> A5732B0A136A161D005C8D7C /* DateComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5732B08136A161D005C8D7C /* DateComponents.cpp */; };
</span><del>- A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; };
</del><ins>+ A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */; };
</span><span class="cx"> A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A5840E24187B8AC200843B10 /* PageInjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E22187B8AC200843B10 /* PageInjectedScriptHost.cpp */; };
</span><span class="lines">@@ -4000,7 +4001,7 @@
</span><span class="cx"> A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C2280D11D4A59700D5A7D3 /* DocumentParser.cpp */; };
</span><span class="cx"> A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C2289F11D5722E00D5A7D3 /* DecodedDataDocumentParser.h */; };
</span><span class="cx"> A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C228A011D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp */; };
</span><del>- A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C402921348B2220063F1E5 /* BidiRunList.h */; };
</del><ins>+ A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C402921348B2220063F1E5 /* BidiRunList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C4A7EB09D563270003AC8D /* StyledElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C4A7EC09D563270003AC8D /* StyledElement.cpp */; };
</span><span class="cx"> A8C4A80009D563270003AC8D /* Node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C4A7EE09D563270003AC8D /* Node.cpp */; };
</span><span class="lines">@@ -4197,7 +4198,7 @@
</span><span class="cx"> AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AB31C91D10AE1B8E000C7B92 /* LineClampValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> AB4CB4EB0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = AB4CB4EA0B8BDA3D009F40B0 /* JSHTMLSelectElementCustom.h */; };
</span><span class="cx"> AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
</span><del>- AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; };
</del><ins>+ AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AB7170880B3118080017123E /* SearchPopupMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */; };
</span><span class="cx"> ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */; };
</span><span class="lines">@@ -5307,7 +5308,7 @@
</span><span class="cx"> BCEA4790097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA477D097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCEA4852097D93020094C9E4 /* RenderBlockLineLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4813097D93020094C9E4 /* RenderBlockLineLayout.cpp */; };
</span><span class="cx"> BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4815097D93020094C9E4 /* break_lines.cpp */; };
</span><del>- BCEA4855097D93020094C9E4 /* break_lines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* break_lines.h */; };
</del><ins>+ BCEA4855097D93020094C9E4 /* break_lines.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4816097D93020094C9E4 /* break_lines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> BCEA4859097D93020094C9E4 /* InlineTextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA481A097D93020094C9E4 /* InlineTextBox.cpp */; };
</span><span class="cx"> BCEA485A097D93020094C9E4 /* InlineTextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA481B097D93020094C9E4 /* InlineTextBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCEA485F097D93020094C9E4 /* RenderBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4820097D93020094C9E4 /* RenderBlock.cpp */; };
</span><span class="lines">@@ -25940,6 +25941,7 @@
</span><span class="cx"> 2542F4DB1166C25A00E89A86 /* UserGestureIndicator.h in Headers */,
</span><span class="cx"> BCA2B061105047600043BD1C /* UserScript.h in Headers */,
</span><span class="cx"> BCA2B08B10505BCD0043BD1C /* UserScriptTypes.h in Headers */,
</span><ins>+ 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
</ins><span class="cx"> BC8BF151105813BF00A40A07 /* UserStyleSheet.h in Headers */,
</span><span class="cx"> BC8BF15A1058141800A40A07 /* UserStyleSheetTypes.h in Headers */,
</span><span class="cx"> BCDF317C11F8D683003C5BF8 /* UserTypingGestureIndicator.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-13 Simon Fraser <simon.fraser@apple.com>
+
+ Various iOS WebKit1 build fixes.
+
+ * Configurations/WebKit.xcconfig: Add more Mac-only files
+ to the excluded files list for iOS.
+ * DefaultDelegates/WebDefaultUIDelegate.m: Don't include WebJavaScriptTextInputPanel.h
+ on iOS
+ * History/WebHistory.h: NSCalendarDate doesn't exist on iOS.
+ * Misc/WebDownload.h: Need WAKAppKitStubs.h
+ * Misc/WebNSViewExtras.m: No WebNSPasteboardExtras on iOS
+ * Storage/WebDatabaseManagerClient.mm: Need DatabaseTracker.h, no harm
+ in including it for all platforms.
+ * WebCoreSupport/WebEditorClient.h: Remove useless comment.
+ * WebCoreSupport/WebEditorClient.mm:
+ (nsStringWithoutCopying): Moved
+ (WebEditorClient::checkTextOfParagraph): Modernized.
+ * WebInspector/WebNodeHighlightView.mm: Need FloatQuad.h.
+ * WebView/WebDataSource.mm: Need WebFrameViewInternal.h
+ * WebView/WebDocument.h: Needs WAKView.h.
+ * WebView/WebFrameView.h: Ditto.
+ * WebView/WebHTMLView.h: Ditto.
+ * WebView/WebPDFDocumentExtras.mm:
+ (allScriptsInPDFDocument): No PDFDocument on iOS.
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebView.h: Fix incorrect #if.
+
</ins><span class="cx"> 2014-01-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] More build fixes for WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.mm WebDashboardRegion.h WebDynamicScrollBarsView.h WebIconDatabase.h WebIconDatabasePrivate.h WebInspectorClient.mm WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebNetscapeContainerCheckContextInfo.mm WebNetscapeContainerCheckPrivate.mm WebPanelAuthenticationHandler.h WebPluginsPrivate.h WebRenderNode.mm WebStringTruncator.mm WebTextCompletionController.mm;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebOpenPanelResultListener.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacDefaultDelegatesWebDefaultUIDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultUIDelegate.m 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -28,11 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDefaultUIDelegate.h"
</span><span class="cx">
</span><del>-#import "WebJavaScriptTextInputPanel.h"
</del><span class="cx"> #import "WebTypesInternal.h"
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import "WebView.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import "WebJavaScriptTextInputPanel.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/WAKViewPrivate.h>
</span><span class="cx"> #import <WebCore/WAKWindow.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, copy) NSArray *orderedLastVisitedDays;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method orderedItemsLastVisitedOnDay:
</span><span class="cx"> @discussion Get an array of WebHistoryItem that were last visited on the day represented by the
</span><span class="lines">@@ -131,6 +132,7 @@
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> - (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
</span><span class="cx"> #pragma clang diagnostic pop
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method itemForURL:
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -28,6 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class WebDownloadInternal;
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -33,10 +33,13 @@
</span><span class="cx"> #import <WebKit/WebFramePrivate.h>
</span><span class="cx"> #import <WebKit/WebFrameViewInternal.h>
</span><span class="cx"> #import <WebKit/WebNSImageExtras.h>
</span><del>-#import <WebKit/WebNSPasteboardExtras.h>
</del><span class="cx"> #import <WebKit/WebNSURLExtras.h>
</span><span class="cx"> #import <WebKit/WebView.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import <WebKit/WebNSPasteboardExtras.h>
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/WAKViewPrivate.h>
</span><span class="cx"> #import <WebCore/WAKWindow.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.mm 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <WebCore/DatabaseTracker.h>
</ins><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -172,7 +172,6 @@
</span><span class="cx"> virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE { }
</span><span class="cx"> virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) OVERRIDE { return ""; }
</span><span class="cx"> virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE { }
</span><del>- // Note: checkTextOfParagraph() is implemented.
</del><span class="cx"> virtual Vector<WebCore::TextCheckingResult> checkTextOfParagraph(StringView, WebCore::TextCheckingTypeMask checkingTypes) OVERRIDE;
</span><span class="cx"> virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&) OVERRIDE { }
</span><span class="cx"> virtual void updateSpellingUIWithMisspelledWord(const WTF::String&) OVERRIDE { }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -797,6 +797,14 @@
</span><span class="cx"> CallFormDelegate(m_webView, @selector(textDidChangeInTextArea:inFrame:), textAreaElement, kit(element->document().frame()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<NSString> nsStringWithoutCopying(StringView stringView)
+{
+ if (stringView.is8Bit())
+ return adoptNS([[NSString alloc] initWithBytesNoCopy:const_cast<LChar*>(stringView.characters8()) length:stringView.length() encoding:NSISOLatin1StringEncoding freeWhenDone:NO]);
+
+ return adoptNS([[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(stringView.characters16()) length:stringView.length() freeWhenDone:NO]);
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void WebEditorClient::suppressSelectionNotifications()
</span><span class="cx"> {
</span><span class="lines">@@ -875,14 +883,15 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebEditorClient::checkTextOfParagraph(StringView string, TextCheckingTypeMask checkingTypes)
</del><ins>+Vector<TextCheckingResult> WebEditorClient::checkTextOfParagraph(StringView string, TextCheckingTypeMask checkingTypes)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(checkingTypes & NSTextCheckingTypeSpelling);
</span><span class="cx">
</span><del>- NSArray *incomingResults = [[m_webView _UIKitDelegateForwarder] checkSpellingOfString:nsStringWithoutCopying(string).get()];
-
</del><span class="cx"> Vector<TextCheckingResult> results;
</span><span class="cx">
</span><ins>+ auto textString = nsStringWithoutCopying(string);
+ NSArray *incomingResults = [[m_webView _UIKitDelegateForwarder] checkSpellingOfString:textString.get()];
+ [textString release];
</ins><span class="cx"> for (NSValue *incomingResult in incomingResults) {
</span><span class="cx"> NSRange resultRange = [incomingResult rangeValue];
</span><span class="cx"> ASSERT(resultRange.location != NSNotFound && resultRange.length > 0);
</span><span class="lines">@@ -897,14 +906,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-static RetainPtr<NSString> nsStringWithoutCopying(StringView stringView)
-{
- if (stringView.is8Bit())
- return adoptNS([[NSString alloc] initWithBytesNoCopy:const_cast<LChar*>(stringView.characters8()) length:stringView.length() encoding:NSISOLatin1StringEncoding freeWhenDone:NO]);
-
- return adoptNS([[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(stringView.characters16()) length:stringView.length() freeWhenDone:NO]);
-}
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(TextCheckingType type) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><ins>+#import <WebCore/FloatQuad.h>
</ins><span class="cx"> #import <WebCore/InspectorOverlay.h>
</span><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import "WebFrameInternal.h"
</span><span class="cx"> #import "WebFrameLoadDelegate.h"
</span><span class="cx"> #import "WebFrameLoaderClient.h"
</span><ins>+#import "WebFrameViewInternal.h"
</ins><span class="cx"> #import "WebHTMLRepresentation.h"
</span><span class="cx"> #import "WebKitErrorsPrivate.h"
</span><span class="cx"> #import "WebKitLogging.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><span class="cx"> #import <WebKit/WAKView.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -28,6 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebDocument.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <WebKit/WAKView.h>
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class WebDataSource;
</span><span class="cx"> @class WebHTMLViewPrivate;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFDocumentExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -64,10 +64,9 @@
</span><span class="cx"> appendValuesInPDFNameSubtreeToVector(tree, allValues);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSArray *allScriptsInPDFDocument(PDFDocument *document)
</del><ins>+NSArray *allScriptsInPDFDocument(CGPDFDocumentRef pdfDocument)
</ins><span class="cx"> {
</span><span class="cx"> NSMutableArray *scripts = [NSMutableArray array];
</span><del>- CGPDFDocumentRef pdfDocument = [document documentRef];
</del><span class="cx"> if (!pdfDocument)
</span><span class="cx"> return scripts;
</span><span class="cx">
</span><span class="lines">@@ -130,3 +129,10 @@
</span><span class="cx">
</span><span class="cx"> return scripts;
</span><span class="cx"> }
</span><ins>+
+#if !PLATFORM(IOS)
+NSArray *allScriptsInPDFDocument(PDFDocument *document)
+{
+ return allScriptsInPDFDocument([document documentRef]);
+}
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.h (161909 => 161910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:33:08 UTC (rev 161909)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:55:47 UTC (rev 161910)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><span class="cx"> #import <WebKit/WAKView.h>
</span><span class="cx"> #if !defined(IBAction)
</span></span></pre>
</div>
</div>
</body>
</html>