<!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>[160622] trunk/Source/WebKit/mac</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/160622">160622</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2013-12-15 13:13:54 -0800 (Sun, 15 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream changes to WebKit Public and Private headers
https://bugs.webkit.org/show_bug.cgi?id=125745
Reviewed by Dan Bernstein.
* Configurations/WebKit.xcconfig: Ignore headers that are completely
excluded on iOS. This prevents empty headers from being installed into
the iOS SDK.
* DOM/WebDOMOperationsPrivate.h: Upstream iOS changes.
* History/WebBackForwardListPrivate.h: Ditto.
* History/WebHistoryItem.h: Ditto.
* History/WebHistoryItemPrivate.h: Ditto.
* Misc/WebCache.h: Ditto.
* Misc/WebIconDatabase.h: Ditto.
* Misc/WebIconDatabasePrivate.h: Ditto.
* Misc/WebKitNSStringExtras.h: Ditto.
* Misc/WebLocalizableStrings.h: Ditto.
* Misc/WebNSEventExtras.h: Ditto.
* Misc/WebNSFileManagerExtras.h: Ditto.
* Misc/WebNSPasteboardExtras.h: Ditto.
* Misc/WebNSURLExtras.h: Ditto.
* Misc/WebNSViewExtras.h: Ditto.
* Misc/WebNSWindowExtras.h: Ditto.
* Panels/WebPanelAuthenticationHandler.h: Ditto.
* Plugins/WebPlugin.h: Ditto.
* Plugins/WebPluginContainer.h: Ditto.
* Plugins/WebPluginContainerPrivate.h: Ditto.
* Plugins/WebPluginDatabase.h: Ditto.
* Plugins/WebPluginPrivate.h: Ditto.
* Plugins/WebPluginViewFactory.h: Ditto.
* Plugins/WebPluginsPrivate.h: Ditto.
* Storage/WebDatabaseManagerPrivate.h: Ditto.
* WebCoreSupport/WebApplicationCache.h: Ditto.
* WebCoreSupport/WebJavaScriptTextInputPanel.h: Ditto.
* WebCoreSupport/WebKeyGenerator.h: Ditto.
* WebCoreSupport/WebSecurityOriginPrivate.h: Ditto.
* WebView/WebDashboardRegion.h: Ditto.
* WebView/WebDataSource.h: Ditto.
* WebView/WebDataSourcePrivate.h: Ditto.
* WebView/WebDocument.h: Ditto.
* WebView/WebDocumentPrivate.h: Ditto.
* WebView/WebDynamicScrollBarsView.h: Ditto.
* WebView/WebEditingDelegate.h: Ditto.
* WebView/WebEditingDelegatePrivate.h: Ditto.
* WebView/WebFormDelegate.h: Ditto.
* WebView/WebFrameLoadDelegate.h: Ditto.
* WebView/WebFramePrivate.h: Ditto.
* WebView/WebFrameView.h: Ditto.
* WebView/WebFrameViewPrivate.h: Ditto.
* WebView/WebHTMLRepresentation.h: Ditto.
* WebView/WebHTMLView.h: Ditto.
* WebView/WebHTMLViewPrivate.h: Ditto.
* WebView/WebPolicyDelegate.h: Ditto.
* WebView/WebPreferenceKeysPrivate.h: Ditto.
* WebView/WebPreferences.h: Ditto.
* WebView/WebPreferencesPrivate.h: Ditto.
* WebView/WebRenderLayer.h: Ditto.
* WebView/WebResourceLoadDelegatePrivate.h: Ditto.
* WebView/WebResourcePrivate.h: Ditto.
* WebView/WebUIDelegate.h: Ditto.
* WebView/WebUIDelegatePrivate.h: Ditto.
* WebView/WebView.h: Ditto.
* WebView/WebViewPrivate.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKitmacDOMWebDOMOperationsPrivateh">trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListPrivateh">trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemh">trunk/Source/WebKit/mac/History/WebHistoryItem.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemPrivateh">trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCacheh">trunk/Source/WebKit/mac/Misc/WebCache.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebIconDatabaseh">trunk/Source/WebKit/mac/Misc/WebIconDatabase.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebIconDatabasePrivateh">trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrash">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebLocalizableStringsh">trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSEventExtrash">trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSFileManagerExtrash">trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSPasteboardExtrash">trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrash">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrash">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSWindowExtrash">trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacPanelsWebPanelAuthenticationHandlerh">trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginh">trunk/Source/WebKit/mac/Plugins/WebPlugin.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginContainerh">trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginContainerPrivateh">trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginDatabaseh">trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginPrivateh">trunk/Source/WebKit/mac/Plugins/WebPluginPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginViewFactoryh">trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginsPrivateh">trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh">trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebApplicationCacheh">trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebJavaScriptTextInputPanelh">trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebKeyGeneratorh">trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSecurityOriginPrivateh">trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDashboardRegionh">trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourceh">trunk/Source/WebKit/mac/WebView/WebDataSource.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcePrivateh">trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDocumenth">trunk/Source/WebKit/mac/WebView/WebDocument.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDocumentPrivateh">trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDynamicScrollBarsViewh">trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebEditingDelegateh">trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebEditingDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFormDelegateh">trunk/Source/WebKit/mac/WebView/WebFormDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameLoadDelegateh">trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramePrivateh">trunk/Source/WebKit/mac/WebView/WebFramePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewh">trunk/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewPrivateh">trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationh">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewh">trunk/Source/WebKit/mac/WebView/WebHTMLView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewPrivateh">trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPolicyDelegateh">trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesh">trunk/Source/WebKit/mac/WebView/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebRenderLayerh">trunk/Source/WebKit/mac/WebView/WebRenderLayer.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourceLoadDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourcePrivateh">trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegateh">trunk/Source/WebKit/mac/WebView/WebUIDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewh">trunk/Source/WebKit/mac/WebView/WebView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -1,5 +1,71 @@
</span><span class="cx"> 2013-12-15 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Upstream changes to WebKit Public and Private headers
+ https://bugs.webkit.org/show_bug.cgi?id=125745
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebKit.xcconfig: Ignore headers that are completely
+ excluded on iOS. This prevents empty headers from being installed into
+ the iOS SDK.
+ * DOM/WebDOMOperationsPrivate.h: Upstream iOS changes.
+ * History/WebBackForwardListPrivate.h: Ditto.
+ * History/WebHistoryItem.h: Ditto.
+ * History/WebHistoryItemPrivate.h: Ditto.
+ * Misc/WebCache.h: Ditto.
+ * Misc/WebIconDatabase.h: Ditto.
+ * Misc/WebIconDatabasePrivate.h: Ditto.
+ * Misc/WebKitNSStringExtras.h: Ditto.
+ * Misc/WebLocalizableStrings.h: Ditto.
+ * Misc/WebNSEventExtras.h: Ditto.
+ * Misc/WebNSFileManagerExtras.h: Ditto.
+ * Misc/WebNSPasteboardExtras.h: Ditto.
+ * Misc/WebNSURLExtras.h: Ditto.
+ * Misc/WebNSViewExtras.h: Ditto.
+ * Misc/WebNSWindowExtras.h: Ditto.
+ * Panels/WebPanelAuthenticationHandler.h: Ditto.
+ * Plugins/WebPlugin.h: Ditto.
+ * Plugins/WebPluginContainer.h: Ditto.
+ * Plugins/WebPluginContainerPrivate.h: Ditto.
+ * Plugins/WebPluginDatabase.h: Ditto.
+ * Plugins/WebPluginPrivate.h: Ditto.
+ * Plugins/WebPluginViewFactory.h: Ditto.
+ * Plugins/WebPluginsPrivate.h: Ditto.
+ * Storage/WebDatabaseManagerPrivate.h: Ditto.
+ * WebCoreSupport/WebApplicationCache.h: Ditto.
+ * WebCoreSupport/WebJavaScriptTextInputPanel.h: Ditto.
+ * WebCoreSupport/WebKeyGenerator.h: Ditto.
+ * WebCoreSupport/WebSecurityOriginPrivate.h: Ditto.
+ * WebView/WebDashboardRegion.h: Ditto.
+ * WebView/WebDataSource.h: Ditto.
+ * WebView/WebDataSourcePrivate.h: Ditto.
+ * WebView/WebDocument.h: Ditto.
+ * WebView/WebDocumentPrivate.h: Ditto.
+ * WebView/WebDynamicScrollBarsView.h: Ditto.
+ * WebView/WebEditingDelegate.h: Ditto.
+ * WebView/WebEditingDelegatePrivate.h: Ditto.
+ * WebView/WebFormDelegate.h: Ditto.
+ * WebView/WebFrameLoadDelegate.h: Ditto.
+ * WebView/WebFramePrivate.h: Ditto.
+ * WebView/WebFrameView.h: Ditto.
+ * WebView/WebFrameViewPrivate.h: Ditto.
+ * WebView/WebHTMLRepresentation.h: Ditto.
+ * WebView/WebHTMLView.h: Ditto.
+ * WebView/WebHTMLViewPrivate.h: Ditto.
+ * WebView/WebPolicyDelegate.h: Ditto.
+ * WebView/WebPreferenceKeysPrivate.h: Ditto.
+ * WebView/WebPreferences.h: Ditto.
+ * WebView/WebPreferencesPrivate.h: Ditto.
+ * WebView/WebRenderLayer.h: Ditto.
+ * WebView/WebResourceLoadDelegatePrivate.h: Ditto.
+ * WebView/WebResourcePrivate.h: Ditto.
+ * WebView/WebUIDelegate.h: Ditto.
+ * WebView/WebUIDelegatePrivate.h: Ditto.
+ * WebView/WebView.h: Ditto.
+ * WebView/WebViewPrivate.h: Ditto.
+
+2013-12-15 Andy Estes <aestes@apple.com>
+
</ins><span class="cx"> [iOS] Upstream changes to FeatureDefines.xcconfig
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125742
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-12-15 21:13:54 UTC (rev 160622)
</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;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff WebIconDatabase.h WebIconDatabasePrivate.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebPluginsPrivate.h WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebDashboardRegion.h WebDynamicScrollBarsView.h;
</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 WebGeolocationCoreLocationProvider.h WebGeolocationProviderIOS.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebUIKitSupport.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationPrivate.h WebMIMETypeRegistry.h WebSelectionRect.h WebVisiblePosition.h WebUIKitDelegate.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -46,4 +46,9 @@
</span><span class="cx">
</span><span class="cx"> @interface DOMNode (WebDOMNodeOperationsPrivate)
</span><span class="cx"> - (WebArchive *)webArchiveByFilteringSubframes:(WebArchiveSubframeFilter)webArchiveSubframeFilter;
</span><ins>+#if TARGET_OS_IPHONE
+- (BOOL)isHorizontalWritingMode;
+- (void)hidePlaceholder;
+- (void)showPlaceholderIfNecessary;
+#endif
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
-
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <WebKit/WebBackForwardList.h>
</span><span class="cx">
</span><span class="cx"> @interface WebBackForwardList (WebBackForwardListPrivate)
</span><span class="lines">@@ -39,4 +38,11 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)removeItem:(WebHistoryItem *)item;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+// These methods are used by MobileSafari to save the back/forward state
+// to disk.
+- (NSDictionary *)dictionaryRepresentation;
+- (void)setToMatchDictionaryRepresentation:(NSDictionary *)dictionary;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> @class WebHistoryItemPrivate;
</span><span class="cx"> @class NSURL;
</span><span class="cx">
</span><span class="lines">@@ -103,11 +107,13 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, copy) NSString *alternateTitle;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property icon
</span><span class="cx"> @abstract The favorite icon of the page represented by this item.
</span><span class="cx"> @discussion This icon returned will be determined by the WebKit.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, strong) NSImage *icon;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -28,9 +28,23 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebHistoryItem.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <Foundation/NSCalendarDate.h>
+
+extern NSString *WebViewportInitialScaleKey;
+extern NSString *WebViewportMinimumScaleKey;
+extern NSString *WebViewportMaximumScaleKey;
+extern NSString *WebViewportUserScalableKey;
+extern NSString *WebViewportWidthKey;
+extern NSString *WebViewportHeightKey;
+extern NSString *WebViewportMinimalUIKey;
+#endif
+
</ins><span class="cx"> @interface WebHistoryItem (WebPrivate)
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> + (void)_releaseAllPendingPageCaches;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (id)initWithURL:(NSURL *)URL title:(NSString *)title;
</span><span class="cx">
</span><span class="lines">@@ -51,6 +65,9 @@
</span><span class="cx"> - (BOOL)isTargetItem;
</span><span class="cx"> - (NSArray *)children;
</span><span class="cx"> - (NSDictionary *)dictionaryRepresentation;
</span><ins>+#if TARGET_OS_IPHONE
+- (NSDictionary *)dictionaryRepresentationIncludingChildren:(BOOL)includesChildren;
+#endif
</ins><span class="cx">
</span><span class="cx"> // This should not be called directly for WebHistoryItems that are already included
</span><span class="cx"> // in WebHistory. Use -[WebHistory setLastVisitedTimeInterval:forItem:] instead.
</span><span class="lines">@@ -63,6 +80,21 @@
</span><span class="cx"> - (size_t)_getDailyVisitCounts:(const int**)counts;
</span><span class="cx"> - (size_t)_getWeeklyVisitCounts:(const int**)counts;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_setScale:(float)scale isInitial:(BOOL)aFlag;
+- (float)_scale;
+- (BOOL)_scaleIsInitial;
+- (NSDictionary *)_viewportArguments;
+- (void)_setViewportArguments:(NSDictionary *)arguments;
+- (CGPoint)_scrollPoint;
+- (void)_setScrollPoint:(CGPoint)scrollPoint;
+
+- (uint32_t)_bookmarkID;
+- (void)_setBookmarkID:(uint32_t)bookmarkID;
+- (NSString *)_sharedLinkUniqueIdentifier;
+- (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier;
+#endif
+
</ins><span class="cx"> - (BOOL)_isInPageCache;
</span><span class="cx"> - (BOOL)_hasCachedPageExpired;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebCache.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -23,12 +23,27 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+@class WebFrame;
+#endif
+
</ins><span class="cx"> @interface WebCache : NSObject
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSArray *)statistics;
</span><span class="cx"> + (void)empty;
</span><ins>+#if TARGET_OS_IPHONE
++ (void)emptyInMemoryResources;
++ (void)sizeOfDeadResources:(int *)resources;
++ (void)clearCachedCredentials;
+// SPI to add a CGImageRef directly to the WebCore cache.
++ (bool)addImageToCache:(CGImageRef)image forURL:(NSURL *)url;
++ (bool)addImageToCache:(CGImageRef)image forURL:(NSURL *)url forFrame:(WebFrame *)frame;
++ (void)removeImageFromCacheForURL:(NSURL *)url;
++ (void)removeImageFromCacheForURL:(NSURL *)url forFrame:(WebFrame *)frame;
++ (CGImageRef)imageForURL:(NSURL *)url;
+#endif
</ins><span class="cx"> + (void)setDisabled:(BOOL)disabled;
</span><span class="cx"> + (BOOL)isDisabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabase.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebIconDatabase.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabase.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -142,5 +142,3 @@
</span><span class="cx"> - (id)delegate;
</span><span class="cx">
</span><span class="cx"> @end
</span><del>-
-
</del></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebIconDatabasePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <WebKit/WebIconDatabase.h>
</span><span class="cx">
</span><span class="cx"> // FIXME: Some of the following is not API and should be moved
</span><span class="lines">@@ -68,3 +70,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#endif // !TARGET_OS_IPHONE
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,17 +26,23 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> extern NSString *WebKitLocalCacheDefaultsKey;
</span><span class="cx">
</span><span class="cx"> @interface NSString (WebKitExtras)
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_web_drawAtPoint:(NSPoint)point font:(NSFont *)font textColor:(NSColor *)textColor allowingFontSmoothing:(BOOL)fontSmoothingIsAllowed;
</span><span class="cx"> - (void)_web_drawAtPoint:(NSPoint)point font:(NSFont *)font textColor:(NSColor *)textColor;
</span><span class="cx"> - (void)_web_drawDoubledAtPoint:(NSPoint)textPoint withTopColor:(NSColor *)topColor bottomColor:(NSColor *)bottomColor font:(NSFont *)font;
</span><span class="cx">
</span><span class="cx"> - (float)_web_widthWithFont:(NSFont *)font;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Handles home directories that have symlinks in their paths.
</span><span class="cx"> // This works around 2774250.
</span><span class="lines">@@ -44,7 +50,9 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)_web_stringByStrippingReturnCharacters;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> + (NSStringEncoding)_web_encodingForResource:(Handle)resource;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)_webkit_isCaseInsensitiveEqualToString:(NSString *)string;
</span><span class="cx"> - (BOOL)_webkit_hasCaseInsensitivePrefix:(NSString *)suffix;
</span><span class="lines">@@ -55,8 +63,14 @@
</span><span class="cx"> - (NSString *)_webkit_stringByTrimmingWhitespace;
</span><span class="cx"> - (NSString *)_webkit_stringByCollapsingNonPrintingCharacters;
</span><span class="cx"> - (NSString *)_webkit_stringByCollapsingWhitespaceCharacters;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSString *)_webkit_fixedCarbonPOSIXPath;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
++ (NSString *)_web_stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName;
+#endif
+
</ins><span class="cx"> + (NSString *)_webkit_localCacheDirectoryWithBundleIdentifier:(NSString*)bundleIdentifier;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebLocalizableStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> CFStringRef WebLocalizedString(WebLocalizableStringsBundle *bundle, const char *key);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+void LoadWebLocalizedStrings(void); // The first WebLocalizedString call can take over 20ms unless this function is called beforehand.
+#endif
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSEventExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSEventExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx">
</span><span class="cx"> @interface NSEvent (WebExtras)
</span><span class="lines">@@ -39,3 +41,5 @@
</span><span class="cx"> -(BOOL)_web_isTabKeyEvent;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSFileManagerExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -29,9 +29,13 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><span class="cx"> @interface NSFileManager (WebNSFileManagerExtras)
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_webkit_setMetadataURL:(NSString *)URLString referrer:(NSString *)referrer atPath:(NSString *)path;
</span><span class="cx"> - (NSString *)_webkit_startupVolumeName;
</span><ins>+#endif
</ins><span class="cx"> - (NSString *)_webkit_pathWithUniqueFilenameForPath:(NSString *)path;
</span><ins>+
+#if TARGET_OS_IPHONE
+- (NSString *)_webkit_createTemporaryDirectoryWithTemplatePrefix:(NSString *)prefix;
+#endif
</ins><span class="cx"> @end
</span><del>-
-
</del></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSPasteboardExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><span class="cx"> @class DOMElement;
</span><span class="lines">@@ -87,3 +89,5 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+#endif // !TARGET_OS_IPHONE
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -71,6 +71,11 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)_webkit_URLFromURLOrSchemelessFileURL;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (NSURL *)_webkit_youTubeURL;
+
++ (NSURL *)uniqueURLWithRelativePart:(NSString *)relativePart;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSString (WebNSURLExtras)
</span><span class="lines">@@ -94,4 +99,9 @@
</span><span class="cx"> - (NSString *)_webkit_URLFragment;
</span><span class="cx"> - (NSString *)_webkit_scriptIfJavaScriptURL;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (NSString *)_webkit_unescapedQueryValue;
+- (NSDictionary *)_webkit_queryKeysAndValues;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,7 +26,14 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><ins>+#else
+#import <WebKit/WAKAppKitStubs.h>
+#import <WebKit/WAKView.h>
+#endif
</ins><span class="cx">
</span><span class="cx"> #define WebDragImageAlpha 0.75f
</span><span class="cx">
</span><span class="lines">@@ -39,8 +46,11 @@
</span><span class="cx"> // Returns the nearest enclosing view of the given class, or nil if none.
</span><span class="cx"> - (NSView *)_web_superviewOfClass:(Class)viewClass;
</span><span class="cx"> - (WebFrameView *)_web_parentWebFrameView;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (WebView *)_webView;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // returns whether a drag should begin starting with mouseDownEvent; if the time
</span><span class="cx"> // passes expiration or the mouse moves less than the hysteresis before the mouseUp event,
</span><span class="cx"> // returns NO, else returns YES.
</span><span class="lines">@@ -65,9 +75,20 @@
</span><span class="cx"> pasteboard:(NSPasteboard *)pasteboard
</span><span class="cx"> source:(id)source
</span><span class="cx"> offset:(NSPoint *)dragImageOffset;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)_web_firstResponderIsSelfOrDescendantView;
</span><span class="cx">
</span><span class="cx"> - (NSRect)_web_convertRect:(NSRect)aRect toView:(NSView *)aView;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#if TARGET_OS_IPHONE
+@class WebFrame;
+@class WebView;
+
+@interface NSView (WebDocumentViewExtras)
+- (WebFrame *)_frame;
+- (WebView *)_webView;
+@end
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSWindowExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Misc/WebNSWindowExtras.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx">
</span><span class="cx"> @interface NSWindow (WebExtras)
</span><span class="lines">@@ -33,3 +35,5 @@
</span><span class="cx"> - (void)centerOverMainWindow;
</span><span class="cx"> - (void)makeResponder:(NSResponder *)responder firstResponderIfDescendantOfView:(NSView *)view;
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacPanelsWebPanelAuthenticationHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <Foundation/NSURLCredentialStorage.h>
</span><span class="cx">
</span><span class="lines">@@ -43,3 +45,5 @@
</span><span class="cx"> - (void)cancelAuthentication:(NSURLAuthenticationChallenge *)challenge;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPlugin.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPlugin.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPlugin.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,9 +26,13 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <JavaScriptCore/WebKitAvailability.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> /*!
</span><span class="cx"> WebPlugIn is an informal protocol that enables interaction between an application
</span><span class="cx"> and web related plug-ins it may contain.
</span><span class="lines">@@ -76,12 +80,14 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)webPlugInDestroy;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method webPlugInSetIsSelected:
</span><span class="cx"> @discusssion Informs the plug-in whether or not it is selected. This is typically
</span><span class="cx"> used to allow the plug-in to alter it's appearance when selected.
</span><span class="cx"> */
</span><span class="cx"> - (void)webPlugInSetIsSelected:(BOOL)isSelected;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property objectForWebScript
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> /*!
</span><span class="cx"> This informal protocol enables a plug-in to request that its containing application
</span><span class="cx"> perform certain operations.
</span><span class="lines">@@ -53,12 +57,14 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)webPlugInContainerShowStatus:(NSString *)message;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property webPlugInContainerSelectionColor
</span><span class="cx"> @abstract The color that should be used for any special drawing when
</span><span class="cx"> plug-in is selected.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, strong) NSColor *webPlugInContainerSelectionColor;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property webFrame
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginContainerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,11 +26,17 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #if !defined(ENABLE_PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> #define ENABLE_PLUGIN_PROXY_FOR_VIDEO 0
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE_PLUGIN_PROXY_FOR_VIDEO
</span><span class="cx"> @class WebMediaPlayerProxy;
</span><span class="lines">@@ -48,4 +54,21 @@
</span><span class="cx"> - (void)_webPluginContainerPostMediaPlayerNotification:(int)notification forElement:(DOMElement *)element;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+// Call when the plug-in shows/hides its full-screen UI.
+- (void)webPlugInContainerWillShowFullScreenForView:(id)plugInView;
+- (void)webPlugInContainerDidHideFullScreenForView:(id)plugInView;
+
+/*!
+ @method processingUserGesture
+ @discussion The processingUserGesture method allows the plug-in to find out if
+ a user gesture is currently being processed. The plug-in may use this information
+ to allow or deny certain actions. This method will not be implemented by containers that
+ are not WebKit based.
+ @result Returns a boolean value, YES to indicate that a user gesture is being processed,
+ NO otherwise.
+ */
+- (BOOL)processingUserGesture;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -28,6 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class WebBasePluginPackage;
</span><span class="cx"> @class WebFrame;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -28,4 +28,37 @@
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebPlugInPrivate)
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+
+// FIXME: Comment me
+- (Class)webPlugInFullScreenWindowClass;
+
+// FIXME: Comment me
+- (void)webPlugInWillEnterFullScreenWithFrame:(CGRect)newFrame;
+
+// FIXME: Comment me
+- (void)webPlugInWillLeaveFullScreenWithFrame:(CGRect)newFrame;
+
+// FIXME: Comment me
+- (BOOL)webPlugInReceivesEventsDirectly;
+
+// FIXME: Comment me
+- (void)webPlugInLayout;
+
+// FIXME: Comment me
+- (void)webPlugInDidDraw;
+
+/*!
+ @method webPlugInStopForPageCache
+ @abstract Tell the plug-in to stop normal operation because the page the plug-in
+ belongs to is entering a cache.
+ @discussion A page in the PageCache can be quickly resumed. This is much like
+ pausing and resuming a plug-in except the frame containing the plug-in will
+ not be visible, is not active, and may even have been torn down. The API contract
+ for messages before and after this message are the same as -webPlugInStop.
+ */
+- (void)webPlugInStopForPageCache;
+
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginViewFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,9 +26,13 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <JavaScriptCore/WebKitAvailability.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> /*!
</span><span class="cx"> @constant WebPlugInBaseURLKey REQUIRED. The base URL of the document containing
</span><span class="cx"> the plug-in's view.
</span><span class="lines">@@ -81,6 +85,11 @@
</span><span class="cx"> @param arguments The arguments dictionary with the mentioned keys and objects. This method is required to implement.
</span><span class="cx"> @result Returns an NSView object that conforms to the WebPlugIn informal protocol.
</span><span class="cx"> */
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> + (NSView *)plugInViewWithArguments:(NSDictionary *)arguments;
</span><ins>+#else
+// +plugInViewWithArguments: returns a UIView subclass
++ (id)plugInViewWithArguments:(NSDictionary *)arguments;
+#endif
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginsPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginsPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> // WebPluginWillPresentNativeUserInterfaceNotification is sent by plugins to notify the WebKit client
</span><span class="cx"> // application that the plugin will present a dialog or some other "native" user interface to the user.
</span><span class="cx"> // This is currently only needed by Dashboard, which must hide itself when a plugin presents a dialog
</span><span class="cx"> // box (4318632).
</span><span class="cx"> extern NSString *WebPluginWillPresentNativeUserInterfaceNotification;
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebDatabaseManagerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -44,6 +44,13 @@
</span><span class="cx"> extern NSString *WebDatabaseDidModifyDatabaseNotification;
</span><span class="cx"> extern NSString *WebDatabaseIdentifierKey;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <WebKit/WebUIKitSupport.h>
+
+// Posted when origins have changed.
+extern CFStringRef WebDatabaseOriginsDidChangeNotification;
+#endif
+
</ins><span class="cx"> @class WebSecurityOrigin;
</span><span class="cx">
</span><span class="cx"> @interface WebDatabaseManager : NSObject
</span><span class="lines">@@ -63,6 +70,9 @@
</span><span class="cx"> - (BOOL)deleteOrigin:(WebSecurityOrigin *)origin;
</span><span class="cx"> - (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
++ (void)scheduleEmptyDatabaseRemoval;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebApplicationCache.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -29,6 +29,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WebApplicationCache: NSObject
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
++ (void)initializeWithBundleIdentifier:(NSString *)bundleIdentifier;
+#endif
</ins><span class="cx"> + (long long)maximumSize;
</span><span class="cx"> + (void)setMaximumSize:(long long)size;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebJavaScriptTextInputPanelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx">
</span><span class="cx"> @interface WebJavaScriptTextInputPanel : NSWindowController
</span><span class="lines">@@ -41,3 +43,5 @@
</span><span class="cx"> - (IBAction)pressedOK:(id)sender;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebKeyGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> typedef enum {
</span><span class="cx"> WebCertificateParseResultSucceeded = 0,
</span><span class="cx"> WebCertificateParseResultFailed = 1,
</span><span class="lines">@@ -39,3 +41,5 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSecurityOriginPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -41,6 +41,9 @@
</span><span class="cx"> - (NSString *)host;
</span><span class="cx">
</span><span class="cx"> - (NSString *)databaseIdentifier;
</span><ins>+#if TARGET_OS_IPHONE
+- (NSString *)toString;
+#endif
</ins><span class="cx"> - (NSString *)stringValue;
</span><span class="cx">
</span><span class="cx"> // Returns zero if the port is the default port for the protocol, non-zero otherwise.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDashboardRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDashboardRegion.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="cx"> #define ENABLE_DASHBOARD_SUPPORT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -49,3 +51,5 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
-
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <WebKit/WebDocument.h>
</span><span class="cx">
</span><span class="cx"> @class NSMutableURLRequest;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -36,7 +36,9 @@
</span><span class="cx">
</span><span class="cx"> @interface WebDataSource (WebPrivate)
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL;
</span><ins>+#endif
</ins><span class="cx"> - (void)_addSubframeArchives:(NSArray *) archives;
</span><span class="cx"> - (NSError *)_mainDocumentError;
</span><span class="cx"> - (NSString *)_responseMIMEType;
</span><span class="lines">@@ -45,6 +47,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setDeferMainResourceDataLoad:(BOOL)flag;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_setOverrideTextEncodingName:(NSString *)encoding;
+#endif
</ins><span class="cx"> - (void)_setAllowToBeMemoryMapped;
</span><span class="cx"> - (void)setDataSourceDelegate:(NSObject<WebDataSourcePrivateDelegate> *)dataSourceDelegate;
</span><span class="cx"> - (NSObject<WebDataSourcePrivateDelegate> *)dataSourceDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDocument.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDocument.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDocument.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,14 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#else
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class NSError;
</span><span class="cx"> @class WebDataSource;
</span><span class="cx">
</span><span class="lines">@@ -118,11 +124,13 @@
</span><span class="cx"> */
</span><span class="cx"> - (NSString *)string;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method attributedString
</span><span class="cx"> @result Attributed string that represents the entire document.
</span><span class="cx"> */
</span><span class="cx"> - (NSAttributedString *)attributedString;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method selectedString
</span><span class="lines">@@ -130,11 +138,13 @@
</span><span class="cx"> */
</span><span class="cx"> - (NSString *)selectedString;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method selectedAttributedString
</span><span class="cx"> @result Attributed string that represents the current selection.
</span><span class="cx"> */
</span><span class="cx"> - (NSAttributedString *)selectedAttributedString;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDocumentPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -32,9 +32,11 @@
</span><span class="cx"> @class DOMDocument;
</span><span class="cx"> @class PDFDocument;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> @protocol WebDocumentImage <NSObject>
</span><span class="cx"> - (NSImage *)image;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // This method is deprecated as it now lives on WebFrame.
</span><span class="cx"> @protocol WebDocumentDOM <NSObject>
</span><span class="lines">@@ -43,8 +45,10 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol WebDocumentSelection <WebDocumentText>
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSArray *)pasteboardTypesForSelection;
</span><span class="cx"> - (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Array of rects that tightly enclose the selected text, in coordinates of selectinView.
</span><span class="cx"> - (NSArray *)selectionTextRects;
</span><span class="lines">@@ -52,9 +56,13 @@
</span><span class="cx"> // Rect tightly enclosing the entire selected area, in coordinates of selectionView.
</span><span class="cx"> - (NSRect)selectionRect;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // NSImage of the portion of the selection that's in view. This does not draw backgrounds.
</span><span class="cx"> // The text is all black according to the parameter.
</span><span class="cx"> - (NSImage *)selectionImageForcingBlackText:(BOOL)forceBlackText;
</span><ins>+#else
+- (CGImageRef)selectionImageForcingBlackText:(BOOL)forceBlackText;
+#endif
</ins><span class="cx">
</span><span class="cx"> // Rect tightly enclosing the entire selected area, in coordinates of selectionView.
</span><span class="cx"> // NOTE: This method is equivalent to selectionRect and shouldn't be used; use selectionRect instead.
</span><span class="lines">@@ -85,3 +93,23 @@
</span><span class="cx">
</span><span class="cx"> @interface WebHTMLView (WebDocumentPrivateProtocols) <WebDocumentSelection, WebDocumentIncrementalSearching>
</span><span class="cx"> @end
</span><ins>+
+#if TARGET_OS_IPHONE
+@protocol WebPDFDocumentRepresentation <WebDocumentRepresentation>
+/*!
+ @method supportedMIMETypes
+ @abstract Returns list of MIME types handled by this view.
+ @result Array of strings representing the supported MIME types.
+*/
++ (NSArray *)supportedMIMETypes;
+@end
+
+@protocol WebPDFDocumentView <WebDocumentView>
+/*!
+ @method supportedMIMETypes
+ @abstract Returns list of MIME types handled by this view.
+ @result Array of strings representing the supported MIME types.
+*/
++ (NSArray *)supportedMIMETypes;
+@end
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDynamicScrollBarsViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -23,6 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+// In iOS WebKit, WebDynamicScrollBarsView is a WAKScrollView.
+// See WebCore/WAKAppKitStubs.h.
+#else
</ins><span class="cx"> // This is a Private header (containing SPI), despite the fact that its name
</span><span class="cx"> // does not contain the word Private.
</span><span class="cx">
</span><span class="lines">@@ -62,3 +66,5 @@
</span><span class="cx"> - (BOOL)horizontalScrollingAllowed;
</span><span class="cx"> - (BOOL)verticalScrollingAllowed;
</span><span class="cx"> @end
</span><ins>+
+#endif // !TARGET_OS_IPHONE
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebEditingDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> @class DOMCSSStyleDeclaration;
</span><span class="cx"> @class DOMRange;
</span><span class="cx"> @class WebView;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebEditingDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -32,6 +32,11 @@
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebViewEditingDelegatePrivate)
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)webView:(WebView *)webView didWriteSelectionToPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#else
+- (NSArray *)supportedPasteboardTypesForCurrentSelection;
+- (DOMDocumentFragment *)documentFragmentForPasteboardItemAtIndex:(NSInteger)index;
+#endif
</ins><span class="cx"> - (BOOL)webView:(WebView *)webView shouldMoveRangeAfterDelete:(DOMRange *)range replacingRange:(DOMRange *)rangeToBeReplaced;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFormDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFormDelegate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFormDelegate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebFormDelegate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,12 +26,19 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @class DOMElement;
</span><span class="cx"> @class DOMHTMLFormElement;
</span><span class="cx"> @class DOMHTMLInputElement;
</span><span class="cx"> @class DOMHTMLTextAreaElement;
</span><ins>+#if TARGET_OS_IPHONE
+@class DOMNode;
+#endif
</ins><span class="cx"> @class WebFrame;
</span><span class="cx">
</span><span class="cx"> /*!
</span><span class="lines">@@ -57,8 +64,9 @@
</span><span class="cx"> - (void)didFocusTextField:(DOMHTMLInputElement *)element inFrame:(WebFrame *)frame;
</span><span class="cx">
</span><span class="cx"> - (BOOL)textField:(DOMHTMLInputElement *)element doCommandBySelector:(SEL)commandSelector inFrame:(WebFrame *)frame;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (BOOL)textField:(DOMHTMLInputElement *)element shouldHandleEvent:(NSEvent *)event inFrame:(WebFrame *)frame;
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> // Sent when a form is just about to be submitted (before the load is started)
</span><span class="cx"> // listener must be sent continue when the delegate is done.
</span><span class="cx"> - (void)frame:(WebFrame *)frame sourceFrame:(WebFrame *)sourceFrame willSubmitForm:(DOMElement *)form
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,10 +26,14 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx"> #import <JavaScriptCore/WebKitAvailability.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> @class NSError;
</span><span class="cx"> @class WebFrame;
</span><span class="cx"> @class WebScriptObject;
</span><span class="lines">@@ -109,7 +113,9 @@
</span><span class="cx"> @param image The icon image. Also known as a "favicon".
</span><span class="cx"> @param frame The frame for which a page icon has been received
</span><span class="cx"> */
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:didFinishLoadForFrame:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFramePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -31,16 +31,29 @@
</span><span class="cx"> #import <WebKit/WebFrame.h>
</span><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> #define ENABLE_NETSCAPE_PLUGIN_API 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#include <CoreText/CoreText.h>
+#include <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> @class DOMDocumentFragment;
</span><span class="cx"> @class DOMNode;
</span><span class="cx"> @class DOMRange;
</span><span class="cx"> @class WebScriptObject;
</span><span class="cx"> @class WebScriptWorld;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+@class DOMElement;
+@class DOMRange;
+@class WebEvent;
+#endif
+
</ins><span class="cx"> // Keys for accessing the values in the page cache dictionary.
</span><span class="cx"> extern NSString *WebPageCacheEntryDateKey;
</span><span class="cx"> extern NSString *WebPageCacheDataSourceKey;
</span><span class="lines">@@ -71,18 +84,131 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
</span><span class="cx"> - (void)_setShouldCreateRenderers:(BOOL)shouldCreateRenderers;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSColor *)_bodyBackgroundColor;
</span><ins>+#else
+- (CGColorRef)_bodyBackgroundColor;
+#endif
</ins><span class="cx"> - (BOOL)_isFrameSet;
</span><span class="cx"> - (BOOL)_firstLayoutDone;
</span><span class="cx"> - (BOOL)_isVisuallyNonEmpty;
</span><span class="cx"> - (WebFrameLoadType)_loadType;
</span><ins>+#if TARGET_OS_IPHONE
+- (BOOL)needsLayout; // Needed for Mail <rdar://problem/6228038>
+- (void)_setLoadsSynchronously:(BOOL)flag;
+- (BOOL)_loadsSynchronously;
+- (unsigned)formElementsCharacterCount;
+- (void)setTimeoutsPaused:(BOOL)flag;
</ins><span class="cx">
</span><ins>+/*!
+ @method setPluginsPaused
+ @abstract Stop/start all plugins based on the flag passed if we have a WebHTMLView
+ @param flag YES to stop plugins on the html view, NO to start them
+ */
+- (void)setPluginsPaused:(BOOL)flag;
+- (void)prepareForPause;
+- (void)resumeFromPause;
+- (void)updateLayout;
+- (void)selectNSRange:(NSRange)range;
+- (void)selectWithoutClosingTypingNSRange:(NSRange)range;
+- (NSRange)selectedNSRange;
+- (void)forceLayoutAdjustingViewSize:(BOOL)adjust;
+- (void)_handleKeyEvent:(WebEvent *)event;
+- (void)_selectAll;
+- (void)_setSelectionFromNone;
+- (void)_saveViewState;
+- (void)_restoreViewState;
+- (void)sendOrientationChangeEvent:(int)newOrientation;
+- (void)setNeedsLayout;
+- (CGSize)renderedSizeOfNode:(DOMNode *)node constrainedToWidth:(float)width;
+- (DOMNode *)deepestNodeAtViewportLocation:(CGPoint)aViewportLocation;
+- (DOMNode *)scrollableNodeAtViewportLocation:(CGPoint)aViewportLocation;
+- (DOMNode *)approximateNodeAtViewportLocation:(CGPoint *)aViewportLocation;
+- (CGRect)renderRectForPoint:(CGPoint)point isReplaced:(BOOL *)isReplaced fontSize:(float *)fontSize;
+
+- (void)_setProhibitsScrolling:(BOOL)flag;
+
+- (void)revealSelectionAtExtent:(BOOL)revealExtent;
+- (void)resetSelection;
+- (BOOL)hasEditableSelection;
+
+- (int)preferredHeight;
+// Returns the line height of the inner node of a text control.
+// For other nodes, the value is the same as lineHeight.
+- (int)innerLineHeight:(DOMNode *)node;
+- (void)setIsActive:(BOOL)flag;
+- (void)setSelectionChangeCallbacksDisabled:(BOOL)flag;
+- (NSRect)caretRect;
+- (NSRect)rectForScrollToVisible; // return caretRect if selection is caret, selectionRect otherwise
+- (void)setCaretColor:(CGColorRef)color;
+- (NSView *)documentView;
+- (int)layoutCount;
+- (BOOL)isTelephoneNumberParsingAllowed;
+- (BOOL)isTelephoneNumberParsingEnabled;
+- (BOOL)mediaDataLoadsAutomatically;
+- (void)setMediaDataLoadsAutomatically:(BOOL)flag;
+
+- (DOMRange *)selectedDOMRange;
+- (void)setSelectedDOMRange:(DOMRange *)range affinity:(NSSelectionAffinity)affinity closeTyping:(BOOL)closeTyping;
+- (NSSelectionAffinity)selectionAffinity;
+- (void)expandSelectionToElementContainingCaretSelection;
+- (DOMRange *)elementRangeContainingCaretSelection;
+- (void)expandSelectionToWordContainingCaretSelection;
+- (void)expandSelectionToStartOfWordContainingCaretSelection;
+- (unichar)characterInRelationToCaretSelection:(int)amount;
+- (unichar)characterBeforeCaretSelection;
+- (unichar)characterAfterCaretSelection;
+- (DOMRange *)wordRangeContainingCaretSelection;
+- (NSString *)wordInRange:(DOMRange *)range;
+- (int)wordOffsetInRange:(DOMRange *)range;
+- (BOOL)spaceFollowsWordInRange:(DOMRange *)range;
+- (NSArray *)wordsInCurrentParagraph;
+- (BOOL)selectionAtDocumentStart;
+- (BOOL)selectionAtSentenceStart;
+- (BOOL)selectionAtWordStart;
+- (DOMRange *)rangeByMovingCurrentSelection:(int)amount;
+- (DOMRange *)rangeByExtendingCurrentSelection:(int)amount;
+- (void)selectNSRange:(NSRange)range onElement:(DOMElement *)element;
+- (DOMRange *)markedTextDOMRange;
+- (void)setMarkedText:(NSString *)text selectedRange:(NSRange)newSelRange;
+- (void)setMarkedText:(NSString *)text forCandidates:(BOOL)forCandidates;
+- (void)confirmMarkedText:(NSString *)text;
+- (void)setText:(NSString *)text asChildOfElement:(DOMElement *)element;
+- (void)setDictationPhrases:(NSArray *)dictationPhrases metadata:(id)metadata asChildOfElement:(DOMElement *)element;
+- (NSArray *)interpretationsForCurrentRoot;
+- (void)getDictationResultRanges:(NSArray **)ranges andMetadatas:(NSArray **)metadatas;
+- (id)dictationResultMetadataForRange:(DOMRange *)range;
+- (void)recursiveSetUpdateAppearanceEnabled:(BOOL)enabled;
+
+// WebCoreFrameBridge methods used by iOS applications and frameworks
++ (NSString *)stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName;
+
+- (NSRect)caretRectAtNode:(DOMNode *)node offset:(int)offset affinity:(NSSelectionAffinity)affinity;
+- (DOMRange *)characterRangeAtPoint:(NSPoint)point;
+- (NSRange)convertDOMRangeToNSRange:(DOMRange *)range;
+- (DOMRange *)convertNSRangeToDOMRange:(NSRange)nsrange;
+- (NSRect)firstRectForDOMRange:(DOMRange *)range;
+- (CTFontRef)fontForSelection:(BOOL *)hasMultipleFonts;
+- (void)sendScrollEvent;
+- (void)_userScrolled;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string forceUserGesture:(BOOL)forceUserGesture;
+- (NSString *)stringForRange:(DOMRange *)range;
+- (void)_replaceSelectionWithText:(NSString *)text selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle;
+#endif // TARGET_OS_IPHONE
+
</ins><span class="cx"> // These methods take and return NSRanges based on the root editable element as the positional base.
</span><span class="cx"> // This fits with AppKit's idea of an input context. These methods are slow compared to their DOMRange equivalents.
</span><span class="cx"> // You should use WebView's selectedDOMRange and setSelectedDOMRange whenever possible.
</span><span class="cx"> - (NSRange)_selectedNSRange;
</span><span class="cx"> - (void)_selectNSRange:(NSRange)range;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+// FIXME: selection
+- (NSArray *)_rectsForRange:(DOMRange *)domRange;
+- (DOMRange *)_selectionRangeForPoint:(CGPoint)point;
+- (DOMRange *)_selectionRangeForFirstPoint:(CGPoint)first secondPoint:(CGPoint)second;
+#endif
+
</ins><span class="cx"> - (BOOL)_isDisplayingStandaloneImage;
</span><span class="cx">
</span><span class="cx"> - (unsigned)_pendingFrameUnloadEventCount;
</span><span class="lines">@@ -103,16 +229,23 @@
</span><span class="cx"> - (void)_setVisibleSize:(CGSize)size;
</span><span class="cx"> - (void)_setTextAutosizingWidth:(CGFloat)width;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_replaceSelectionWithWebArchive:(WebArchive *)webArchive selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace;
+#endif
+
</ins><span class="cx"> - (void)_replaceSelectionWithFragment:(DOMDocumentFragment *)fragment selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace matchStyle:(BOOL)matchStyle;
</span><span class="cx"> - (void)_replaceSelectionWithText:(NSString *)text selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace;
</span><span class="cx"> - (void)_replaceSelectionWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString selectReplacement:(BOOL)selectReplacement smartReplace:(BOOL)smartReplace;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_smartInsertForString:(NSString *)pasteString replacingRange:(DOMRange *)rangeToReplace beforeString:(NSString **)beforeString afterString:(NSString **)afterString;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (NSMutableDictionary *)_cacheabilityDictionary;
</span><span class="cx">
</span><span class="cx"> - (BOOL)_allowsFollowingLink:(NSURL *)URL;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // Sets whether the scrollbars, if any, should be shown inside the document's border
</span><span class="cx"> // (thus overlapping some content) or outside the webView's border (default behavior).
</span><span class="cx"> // Changing this flag changes the size of the contentView and maintains the size of the frameView.
</span><span class="lines">@@ -122,6 +255,7 @@
</span><span class="cx"> // This does not affect the scrollability of the document.
</span><span class="cx"> - (void)setAlwaysHideHorizontalScroller:(BOOL)flag;
</span><span class="cx"> - (void)setAlwaysHideVerticalScroller:(BOOL)flag;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Sets the name presented to accessibility clients for the web area object.
</span><span class="cx"> - (void)setAccessibleName:(NSString *)name;
</span><span class="lines">@@ -137,6 +271,19 @@
</span><span class="cx"> // Printing.
</span><span class="cx"> - (NSArray *)_computePageRectsWithPrintScaleFactor:(float)printWidthScaleFactor pageSize:(NSSize)pageSize;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (DOMDocumentFragment *)_documentFragmentForText:(NSString *)text;
+// These have the side effect of adding subresources to our WebDataSource where appropriate.
+- (DOMDocumentFragment *)_documentFragmentForWebArchive:(WebArchive *)webArchive;
+- (DOMDocumentFragment *)_documentFragmentForImageData:(NSData *)data withRelativeURLPart:(NSString *)relativeURLPart andMIMEType:(NSString *)mimeType;
+
+- (BOOL)focusedNodeHasContent;
+
+- (void)_dispatchDidReceiveTitle:(NSString *)title;
+- (void)removeUnchangeableStyles;
+- (BOOL)hasRichlyEditableSelection;
+#endif
+
</ins><span class="cx"> - (JSValueRef)jsWrapperForNode:(DOMNode *)node inScriptWorld:(WebScriptWorld *)world;
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)elementAtPoint:(NSPoint)point;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,7 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+#else
+#import <WebKit/WAKAppKitStubs.h>
+#endif
</ins><span class="cx">
</span><span class="cx"> @class WebDataSource;
</span><span class="cx"> @class WebFrame;
</span><span class="lines">@@ -62,6 +66,7 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL allowsScrolling;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property canPrintHeadersAndFooters
</span><span class="cx"> @abstract Whether this frame can print headers and footers
</span><span class="lines">@@ -74,6 +79,7 @@
</span><span class="cx"> @result A newly created print operation object
</span><span class="cx"> */
</span><span class="cx"> - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property documentViewShouldHandlePrint
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -76,11 +76,13 @@
</span><span class="cx"> */
</span><span class="cx"> - (Class)_customScrollViewClass;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method _setCustomScrollViewClass:
</span><span class="cx"> @result Switches the WebFrameView's scroll view class, this class needs to be a subclass of WebDynamicScrollBarsView.
</span><span class="cx"> Passing nil will switch back to the default WebDynamicScrollBarsView class.
</span><span class="cx"> */
</span><span class="cx"> - (void)_setCustomScrollViewClass:(Class)scrollViewClass;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -53,7 +53,9 @@
</span><span class="cx"> + (NSArray *)supportedImageMIMETypes;
</span><span class="cx"> + (NSArray *)unsupportedTextMIMETypes;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSAttributedString *)attributedStringFrom:(DOMNode *)startNode startOffset:(int)startOffset to:(DOMNode *)endNode endOffset:(int)endOffset;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (DOMElement *)elementWithName:(NSString *)name inForm:(DOMElement *)form;
</span><span class="cx"> - (BOOL)elementDoesAutoComplete:(DOMElement *)element;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -37,7 +37,11 @@
</span><span class="cx"> WebHTMLView is a NSControl because it hosts NSCells that are painted by WebCore's Aqua theme
</span><span class="cx"> renderer (and those cells must be hosted by an enclosing NSControl in order to paint properly).
</span><span class="cx"> */
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> @interface WebHTMLView : NSControl <WebDocumentView, WebDocumentSearching>
</span><ins>+#else
+@interface WebHTMLView : NSView <WebDocumentView, WebDocumentSearching>
+#endif
</ins><span class="cx"> {
</span><span class="cx"> @private
</span><span class="cx"> WebHTMLViewPrivate *_private;
</span><span class="lines">@@ -57,7 +61,9 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)reapplyStyles;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)outdent:(id)sender;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -28,9 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebHTMLView.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> #define ENABLE_NETSCAPE_PLUGIN_API 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @class DOMDocumentFragment;
</span><span class="cx"> @class DOMNode;
</span><span class="lines">@@ -54,31 +56,41 @@
</span><span class="cx">
</span><span class="cx"> - (void)close;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // Modifier (flagsChanged) tracking SPI
</span><span class="cx"> + (void)_postFlagsChangedEvent:(NSEvent *)flagsChangedEvent;
</span><span class="cx"> - (void)_updateMouseoverWithFakeEvent;
</span><span class="cx">
</span><span class="cx"> - (void)_setAsideSubviews;
</span><span class="cx"> - (void)_restoreSubviews;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)_insideAnotherHTMLView;
</span><span class="cx"> - (void)_clearLastHitViewIfSelf;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_updateMouseoverWithEvent:(NSEvent *)event;
</span><span class="cx">
</span><span class="cx"> + (NSArray *)_insertablePasteboardTypes;
</span><span class="cx"> + (NSArray *)_selectionPasteboardTypes;
</span><span class="cx"> - (void)_writeSelectionToPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (void)_frameOrBoundsChanged;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_handleAutoscrollForMouseDragged:(NSEvent *)event;
</span><ins>+#endif
</ins><span class="cx"> - (WebPluginController *)_pluginController;
</span><span class="cx">
</span><span class="cx"> // FIXME: _selectionRect is deprecated in favor of selectionRect, which is in protocol WebDocumentSelection.
</span><span class="cx"> // We can't remove this yet because it's still in use by Mail.
</span><span class="cx"> - (NSRect)_selectionRect;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_startAutoscrollTimer:(NSEvent *)event;
</span><ins>+#else
+- (void)_startAutoscrollTimer:(WebEvent *)event;
+#endif
</ins><span class="cx"> - (void)_stopAutoscrollTimer;
</span><span class="cx">
</span><span class="cx"> - (BOOL)_canEdit;
</span><span class="lines">@@ -93,6 +105,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_setToolTip:(NSString *)string;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // SPI used by Mail.
</span><span class="cx"> // FIXME: These should all be moved to WebView; we won't always have a WebHTMLView.
</span><span class="cx"> - (NSImage *)_selectionDraggingImage;
</span><span class="lines">@@ -108,6 +121,7 @@
</span><span class="cx"> - (void)_setHighlighter:(id <WebHTMLHighlighter>)highlighter ofType:(NSString *)type;
</span><span class="cx"> - (void)_removeHighlighterOfType:(NSString *)type;
</span><span class="cx"> - (DOMDocumentFragment *)_documentFragmentFromPasteboard:(NSPasteboard *)pasteboard forType:(NSString *)pboardType inContext:(DOMRange *)context subresources:(NSArray **)subresources;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE_NETSCAPE_PLUGIN_API
</span><span class="cx"> - (void)_resumeNullEventsForAllNetscapePlugins;
</span><span class="lines">@@ -117,10 +131,12 @@
</span><span class="cx"> - (BOOL)_isUsingAcceleratedCompositing;
</span><span class="cx"> - (NSView *)_compositingLayersHostingView;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // SPI for printing (should be converted to API someday). When the WebHTMLView isn't being printed
</span><span class="cx"> // directly, this method must be called before paginating, or the computed height might be incorrect.
</span><span class="cx"> // Typically this would be called from inside an override of -[NSView knowsPageRange:].
</span><span class="cx"> - (void)_layoutForPrinting;
</span><ins>+#endif
</ins><span class="cx"> - (CGFloat)_adjustedBottomOfPageWithTop:(CGFloat)top bottom:(CGFloat)bottom limit:(CGFloat)bottomLimit;
</span><span class="cx"> - (BOOL)_isInPrintMode;
</span><span class="cx"> - (BOOL)_beginPrintModeWithPageWidth:(float)pageWidth height:(float)pageHeight shrinkToFit:(BOOL)shrinkToFit;
</span><span class="lines">@@ -133,6 +149,12 @@
</span><span class="cx"> - (BOOL)_beginScreenPaginationModeWithPageSize:(CGSize)pageSize shrinkToFit:(BOOL)shrinkToFit;
</span><span class="cx"> - (void)_endScreenPaginationMode;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (BOOL)_canSmartReplaceWithPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (id)accessibilityRootElement;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,8 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#endif
+
</ins><span class="cx"> @class NSError;
</span><span class="cx"> @class NSURLResponse;
</span><span class="cx"> @class NSURLRequest;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -44,8 +44,10 @@
</span><span class="cx"> #define WebKitUsesEncodingDetectorPreferenceKey @"WebKitUsesEncodingDetector"
</span><span class="cx"> #define WebKitUserStyleSheetEnabledPreferenceKey @"WebKitUserStyleSheetEnabledPreferenceKey"
</span><span class="cx"> #define WebKitUserStyleSheetLocationPreferenceKey @"WebKitUserStyleSheetLocationPreferenceKey"
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #define WebKitShouldPrintBackgroundsPreferenceKey @"WebKitShouldPrintBackgroundsPreferenceKey"
</span><span class="cx"> #define WebKitTextAreasAreResizablePreferenceKey @"WebKitTextAreasAreResizable"
</span><ins>+#endif
</ins><span class="cx"> #define WebKitShrinksStandaloneImagesToFitPreferenceKey @"WebKitShrinksStandaloneImagesToFit"
</span><span class="cx"> #define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
</span><span class="cx"> #define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
</span><span class="lines">@@ -62,11 +64,15 @@
</span><span class="cx"> #define WebKitDisplayImagesKey @"WebKitDisplayImagesKey"
</span><span class="cx"> #define WebKitLoadSiteIconsKey @"WebKitLoadSiteIconsKey"
</span><span class="cx"> #define WebKitBackForwardCacheExpirationIntervalKey @"WebKitBackForwardCacheExpirationIntervalKey"
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #define WebKitTabToLinksPreferenceKey @"WebKitTabToLinksPreferenceKey"
</span><ins>+#endif
</ins><span class="cx"> #define WebKitPrivateBrowsingEnabledPreferenceKey @"WebKitPrivateBrowsingEnabled"
</span><span class="cx"> #define WebSmartInsertDeleteEnabled @"WebSmartInsertDeleteEnabled"
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #define WebContinuousSpellCheckingEnabled @"WebContinuousSpellCheckingEnabled"
</span><span class="cx"> #define WebGrammarCheckingEnabled @"WebGrammarCheckingEnabled"
</span><ins>+#endif
</ins><span class="cx"> #define WebAutomaticQuoteSubstitutionEnabled @"WebAutomaticQuoteSubstitutionEnabled"
</span><span class="cx"> #define WebAutomaticLinkDetectionEnabled @"WebAutomaticLinkDetectionEnabled"
</span><span class="cx"> #define WebAutomaticDashSubstitutionEnabled @"WebAutomaticDashSubstitutionEnabled"
</span><span class="lines">@@ -124,6 +130,10 @@
</span><span class="cx"> #define WebKitShouldDisplayTextDescriptionsPreferenceKey @"WebKitShouldDisplayTextDescriptions"
</span><span class="cx"> #define WebKitNotificationsEnabledKey @"WebKitNotificationsEnabled"
</span><span class="cx"> #define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
</span><ins>+#if TARGET_OS_IPHONE
+#define WebKitMediaPlaybackAllowsAirPlayPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
+#define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
+#endif
</ins><span class="cx"> #define WebKitRegionBasedColumnsEnabledKey @"WebKitRegionBasedColumnsEnabled"
</span><span class="cx"> #define WebKitShouldRespectImageOrientationKey @"WebKitShouldRespectImageOrientation"
</span><span class="cx"> #define WebKitRequestAnimationFrameEnabledPreferenceKey @"WebKitRequestAnimationFrameEnabled"
</span><span class="lines">@@ -138,6 +148,7 @@
</span><span class="cx"> #define WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey @"WebKitUseLegacyTextAlignPositionedElementBehavior"
</span><span class="cx"> #define WebKitMediaSourceEnabledPreferenceKey @"WebKitMediaSourceEnabled"
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span><span class="cx"> // cover methods themselves are private.
</span><span class="cx"> #define WebKitRespectStandardStyleKeyEquivalentsPreferenceKey @"WebKitRespectStandardStyleKeyEquivalents"
</span><span class="lines">@@ -145,6 +156,7 @@
</span><span class="cx"> #define WebKitShowsToolTipOverTruncatedTextPreferenceKey @"WebKitShowsToolTipOverTruncatedText"
</span><span class="cx"> #define WebKitPDFDisplayModePreferenceKey @"WebKitPDFDisplayMode"
</span><span class="cx"> #define WebKitPDFScaleFactorPreferenceKey @"WebKitPDFScaleFactor"
</span><ins>+#endif
</ins><span class="cx"> #define WebKitUseSiteSpecificSpoofingPreferenceKey @"WebKitUseSiteSpecificSpoofing"
</span><span class="cx"> #define WebKitEditableLinkBehaviorPreferenceKey @"WebKitEditableLinkBehavior"
</span><span class="cx"> #define WebKitCacheModelPreferenceKey @"WebKitCacheModelPreferenceKey"
</span><span class="lines">@@ -166,7 +178,33 @@
</span><span class="cx">
</span><span class="cx"> #define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#define WebKitMaximumImageSizePreferenceKey @"WebKitMaximumImageSize"
+#define WebKitStandalonePreferenceKey @"WebKitStandalonePreferenceKey"
+#define WebKitTelephoneParsingEnabledPreferenceKey @"WebKitTelephoneParsingEnabledPreferenceKey"
+#define WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey @"WebKitAlwaysUseBaselineOfPrimaryFontPreferenceKey"
+#define WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey @"WebKitAllowMultiElementImplicitFormSubmissionPreferenceKey"
+#define WebKitNSURLMemoryCacheSizePreferenceKey @"WebKitNSURLMemoryCacheSizePreferenceKey"
+#define WebKitNSURLDiskCacheSizePreferenceKey @"WebKitNSURLDiskCacheSizePreferenceKey"
+#define WebKitAlwaysRequestGeolocationPermissionPreferenceKey @"WebKitAlwaysRequestGeolocationPermission"
+#define WebKitLayoutIntervalPreferenceKey @"WebKitLayoutIntervalPreferenceKey"
+#define WebKitMaxParseDurationPreferenceKey @"WebKitMaxParseDurationPreferenceKey"
+#define WebKitStorageTrackerEnabledPreferenceKey @"WebKitStorageTrackerEnabledPreferenceKey"
+#define WebKitAlwaysUseAcceleratedOverflowScrollPreferenceKey @"WebKitAlwaysUseAcceleratedOverflowScroll"
+#define WebKitInterpolationQualityPreferenceKey @"WebKitInterpolationQualityPreferenceKey"
+#define WebKitPasswordEchoEnabledPreferenceKey @"WebKitEnablePasswordEchoPreferenceKey"
+#define WebKitPasswordEchoDurationPreferenceKey @"WebKitPasswordEchoDurationPreferenceKey"
+#define WebKitNetworkDataUsageTrackingEnabledPreferenceKey @"WebKitNetworkDataUsageTrackingEnabledPreferenceKey"
+#define WebKitNetworkInterfaceNamePreferenceKey @"WebKitNetworkInterfaceNamePreferenceKey"
+#endif
+
</ins><span class="cx"> #define WebKitDiskImageCacheEnabledPreferenceKey @"WebKitDiskImageCacheEnabled"
</span><span class="cx"> #define WebKitDiskImageCacheMinimumImageSizePreferenceKey @"WebKitDiskImageCacheMinimumImageSize"
</span><span class="cx"> #define WebKitDiskImageCacheMaximumCacheSizePreferenceKey @"WebKitDiskImageCacheMaximumCacheSize"
</span><span class="cx"> #define WebKitDiskImageCacheSavedCacheDirectoryKey @"WebKitDiskImageCacheSavedCacheDirectory"
</span><ins>+
+#if TARGET_OS_IPHONE
+#if ENABLE(REMOTE_INSPECTOR)
+#define WebKitTextFieldRemoteInspectionEnabledPreferenceKey @"WebKitTextFieldRemoteInspectionEnabled"
+#endif
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -206,10 +206,12 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL autosaves;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property shouldPrintBackgrounds
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL shouldPrintBackgrounds;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property privateBrowsingEnabled:
</span><span class="lines">@@ -218,12 +220,14 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL privateBrowsingEnabled;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property tabsToLinks
</span><span class="cx"> @abstract If tabsToLinks is YES, the tab key will focus links and form controls.
</span><span class="cx"> The option key temporarily reverses this preference.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL tabsToLinks;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property usesPageCache
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -27,7 +27,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebPreferences.h>
</span><ins>+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <Quartz/Quartz.h>
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> WebKitEditableLinkDefaultBehavior,
</span><span class="lines">@@ -76,6 +79,7 @@
</span><span class="cx"> - (BOOL)usesEncodingDetector;
</span><span class="cx"> - (void)setUsesEncodingDetector:(BOOL)flag;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (BOOL)respectStandardStyleKeyEquivalents;
</span><span class="cx"> - (void)setRespectStandardStyleKeyEquivalents:(BOOL)flag;
</span><span class="cx">
</span><span class="lines">@@ -90,6 +94,7 @@
</span><span class="cx">
</span><span class="cx"> - (PDFDisplayMode)PDFDisplayMode;
</span><span class="cx"> - (void)setPDFDisplayMode:(PDFDisplayMode)mode;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)shrinksStandaloneImagesToFit;
</span><span class="cx"> - (void)setShrinksStandaloneImagesToFit:(BOOL)flag;
</span><span class="lines">@@ -109,6 +114,11 @@
</span><span class="cx"> - (BOOL)databasesEnabled;
</span><span class="cx"> - (void)setDatabasesEnabled:(BOOL)databasesEnabled;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (BOOL)storageTrackerEnabled;
+- (void)setStorageTrackerEnabled:(BOOL)storageTrackerEnabled;
+#endif
+
</ins><span class="cx"> - (BOOL)localStorageEnabled;
</span><span class="cx"> - (void)setLocalStorageEnabled:(BOOL)localStorageEnabled;
</span><span class="cx">
</span><span class="lines">@@ -139,9 +149,11 @@
</span><span class="cx"> - (BOOL)isSpatialNavigationEnabled;
</span><span class="cx"> - (void)setSpatialNavigationEnabled:(BOOL)flag;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // zero means do AutoScale
</span><span class="cx"> - (float)PDFScaleFactor;
</span><span class="cx"> - (void)setPDFScaleFactor:(float)scale;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (int64_t)applicationCacheTotalQuota;
</span><span class="cx"> - (void)setApplicationCacheTotalQuota:(int64_t)quota;
</span><span class="lines">@@ -242,11 +254,60 @@
</span><span class="cx"> - (BOOL)mockScrollbarsEnabled;
</span><span class="cx"> - (void)setMockScrollbarsEnabled:(BOOL)flag;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> // This is a global setting.
</span><ins>+- (unsigned)audioSessionCategoryOverride;
+- (void)setAudioSessionCategoryOverride:(unsigned)override;
+
+// WARNING: this affect network performance. This must not be enabled for production use.
+// Enabling this makes WebCore reports the network data usage.
+// This is a global setting.
+- (void)setNetworkDataUsageTrackingEnabled:(bool)trackingEnabled;
+- (BOOL)networkDataUsageTrackingEnabled;
+
+- (void)setNetworkInterfaceName:(NSString *)name;
+- (NSString *)networkInterfaceName;
+
+- (void)setMediaPlaybackAllowsAirPlay:(BOOL)flag;
+- (BOOL)mediaPlaybackAllowsAirPlay;
+#endif
+
+// This is a global setting.
</ins><span class="cx"> - (BOOL)seamlessIFramesEnabled;
</span><span class="cx"> - (void)setSeamlessIFramesEnabled:(BOOL)enabled;
</span><span class="cx">
</span><span class="cx"> // Other private methods
</span><ins>+#if TARGET_OS_IPHONE
+- (size_t)_maximumImageSize;
+- (BOOL)_standalone;
+- (void)_setStandalone:(BOOL)flag;
+- (void)_setTelephoneNumberParsingEnabled:(BOOL)flag;
+- (BOOL)_telephoneNumberParsingEnabled;
+- (void)_setAlwaysUseBaselineOfPrimaryFont:(BOOL)flag;
+- (BOOL)_alwaysUseBaselineOfPrimaryFont;
+- (void)_setAllowMultiElementImplicitFormSubmission:(BOOL)flag;
+- (BOOL)_allowMultiElementImplicitFormSubmission;
+- (void)_setAlwaysRequestGeolocationPermission:(BOOL)flag;
+- (BOOL)_alwaysRequestGeolocationPermission;
+- (void)_setAlwaysUseAcceleratedOverflowScroll:(BOOL)flag;
+- (BOOL)_alwaysUseAcceleratedOverflowScroll;
+- (void)_setLayoutInterval:(int)l;
+- (int)_layoutInterval;
+- (void)_setMaxParseDuration:(float)d;
+- (float)_maxParseDuration;
+- (void)_setPageCacheSize:(int)size;
+- (int)_pageCacheSize;
+- (void)_setObjectCacheSize:(int)size;
+- (int)_objectCacheSize;
+- (void)_setNSURLMemoryCacheSize:(int)size;
+- (int)_NSURLMemoryCacheSize;
+- (void)_setNSURLDiskCacheSize:(int)size;
+- (int)_NSURLDiskCacheSize;
+- (void)_setInterpolationQuality:(int)quality;
+- (int)_interpolationQuality;
+- (BOOL)_allowPasswordEcho;
+- (float)_passwordEchoDuration;
+#endif
</ins><span class="cx"> - (void)_postPreferencesChangedNotification;
</span><span class="cx"> - (void)_postPreferencesChangedAPINotification;
</span><span class="cx"> + (WebPreferences *)_getInstanceForIdentifier:(NSString *)identifier;
</span><span class="lines">@@ -301,6 +362,11 @@
</span><span class="cx"> - (void)setRegionBasedColumnsEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)regionBasedColumnsEnabled;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_invalidateCachedPreferences;
+- (void)_synchronizeWebStoragePolicyWithCookiePolicy;
+#endif
+
</ins><span class="cx"> - (void)setBackspaceKeyNavigationEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)backspaceKeyNavigationEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebRenderLayer.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebRenderLayer.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebRenderLayer.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -25,6 +25,10 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <Foundation/NSGeometry.h>
+#endif
+
</ins><span class="cx"> @class WebFrame;
</span><span class="cx">
</span><span class="cx"> @interface WebRenderLayer : NSObject
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourceLoadDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegatePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegatePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegatePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -54,4 +54,23 @@
</span><span class="cx"> @result return YES if WebKit should paint the default broken image.
</span><span class="cx"> */
</span><span class="cx"> - (BOOL)webView:(WebView*)sender shouldPaintBrokenImageForURL:(NSURL*)imageURL;
</span><ins>+
+#if TARGET_OS_IPHONE
+- (id)webThreadWebView:(WebView *)sender identifierForInitialRequest:(NSURLRequest *)request fromDataSource:(WebDataSource *)dataSource;
+- (NSURLRequest *)webThreadWebView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
+- (void)webThreadWebView:(WebView *)sender resource:(id)identifier didReceiveContentLength:(WebNSInteger)length fromDataSource:(WebDataSource *)dataSource;
+- (void)webThreadWebView:(WebView *)sender resource:(id)identifier didReceiveResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource;
+- (void)webThreadWebView:(WebView *)webView didLoadResourceFromMemoryCache:(NSURLRequest *)request response:(NSURLResponse *)response length:(WebNSInteger)length fromDataSource:(WebDataSource *)dataSource;
+- (void)webThreadWebView:(WebView *)sender resource:(id)identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
+- (void)webThreadWebView:(WebView *)sender resource:(id)identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource;
+- (NSCachedURLResponse *)webThreadWebView:(WebView *)sender resource:(id)identifier willCacheResponse:(NSCachedURLResponse *)response fromDataSource:(WebDataSource *)dataSource;
+
+/*!
+ @method webView:connectionPropertiesForResource:
+ @abstract Provide a CFStream level properties dictionary to be used by a connection
+ @result return an NSDictionary with the desired stream properties or nil
+ */
+- (NSDictionary *)webView:(WebView *)sender connectionPropertiesForResource:(id)identifier dataSource:(WebDataSource *)dataSource;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourcePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -42,7 +42,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_ignoreWhenUnarchiving;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSFileWrapper *)_fileWrapperRepresentation;
</span><ins>+#endif
</ins><span class="cx"> - (NSURLResponse *)_response;
</span><span class="cx"> - (NSString *)_stringValue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,10 +26,16 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <Foundation/NSURLRequest.h>
</span><span class="cx"> #import <JavaScriptCore/WebKitAvailability.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+#import <AppKit/AppKit.h>
+#else
+#import <WebKit/WAKAppKitStubs.h>
+#endif
+
</ins><span class="cx"> /*!
</span><span class="cx"> @enum WebMenuItemTag
</span><span class="cx"> @discussion Each menu item in the default menu items array passed in
</span><span class="lines">@@ -135,6 +141,11 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)cancel;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)chooseFilename:(NSString *)filename displayString:(NSString *)displayString iconImage:(CGImageRef)imageRef;
+- (void)chooseFilenames:(NSArray *)filenames displayString:(NSString *)displayString iconImage:(CGImageRef)imageRef;
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @class WebFrame;
</span><span class="lines">@@ -437,6 +448,7 @@
</span><span class="cx"> */
</span><span class="cx"> - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method webView:validateUserInterfaceItem:defaultValidation:
</span><span class="cx"> @abstract Controls UI validation
</span><span class="lines">@@ -448,6 +460,7 @@
</span><span class="cx"> NSValidatedUserInterfaceItem for information about UI validation.
</span><span class="cx"> */
</span><span class="cx"> - (BOOL)webView:(WebView *)webView validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item defaultValidation:(BOOL)defaultValidation;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:shouldPerformAction:fromSender:
</span><span class="lines">@@ -462,6 +475,7 @@
</span><span class="cx"> */
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldPerformAction:(SEL)action fromSender:(id)sender;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method webView:dragDestinationActionMaskForDraggingInfo:
</span><span class="cx"> @abstract Controls behavior when dragging to a WebView
</span><span class="lines">@@ -506,6 +520,7 @@
</span><span class="cx"> the contents of the dragging pasteboard.
</span><span class="cx"> */
</span><span class="cx"> - (void)webView:(WebView *)webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:(NSPoint)point withPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#endif /* !TARGET_OS_IPHONE */
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:printFrameView:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -29,13 +29,19 @@
</span><span class="cx"> #import <WebKit/WebAllowDenyPolicyListener.h>
</span><span class="cx"> #import <WebKit/WebUIDelegate.h>
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="cx"> #define ENABLE_DASHBOARD_SUPPORT 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_FULLSCREEN_API)
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #define ENABLE_FULLSCREEN_API 1
</span><ins>+#else
+#define ENABLE_FULLSCREEN_API 0
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Mail on Tiger expects the old value for WebMenuItemTagSearchInGoogle
</span><span class="cx"> #define WebMenuItemTagSearchInGoogle OldWebMenuItemTagSearchWeb
</span><span class="lines">@@ -174,14 +180,18 @@
</span><span class="cx"> - (void)webView:(WebView *)webView dashboardRegionsChanged:(NSDictionary *)regions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view;
</span><ins>+#endif
</ins><span class="cx"> - (void)webView:(WebView *)sender didDrawRect:(NSRect)rect;
</span><span class="cx"> - (void)webView:(WebView *)sender didScrollDocumentInFrameView:(WebFrameView *)frameView;
</span><span class="cx"> // FIXME: If we ever make this method public, it should include a WebFrame parameter.
</span><span class="cx"> - (BOOL)webViewShouldInterruptJavaScript:(WebView *)sender;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)webView:(WebView *)sender willPopupMenu:(NSMenu *)menu;
</span><span class="cx"> - (void)webView:(WebView *)sender contextMenuItemSelected:(NSMenuItem *)item forElement:(NSDictionary *)element;
</span><span class="cx"> - (void)webView:(WebView *)sender saveFrameView:(WebFrameView *)frameView showingPanel:(BOOL)showingPanel;
</span><ins>+#endif
</ins><span class="cx"> - (BOOL)webView:(WebView *)sender didPressMissingPluginButton:(DOMElement *)element;
</span><span class="cx"> /*!
</span><span class="cx"> @method webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:
</span><span class="lines">@@ -244,4 +254,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didDrawFrame:(WebFrame *)frame;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+/*!
+ @method webViewSupportedOrientationsUpdated:
+ @param sender The WebView sending the delegate method
+ @abstract Notify the client that the content has updated the orientations it claims to support.
+ */
+- (void)webViewSupportedOrientationsUpdated:(WebView *)sender;
+
+- (BOOL)webViewCanCheckGeolocationAuthorizationStatus:(WebView *)sender;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -26,7 +26,14 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+#else
+#import <WebKit/WAKAppKitStubs.h>
+#if !defined(IBAction)
+#define IBAction void
+#endif
+#endif
</ins><span class="cx">
</span><span class="cx"> @class DOMCSSStyleDeclaration;
</span><span class="cx"> @class DOMDocument;
</span><span class="lines">@@ -69,7 +76,9 @@
</span><span class="cx"> */
</span><span class="cx"> extern NSString *WebViewProgressStartedNotification;
</span><span class="cx"> extern NSString *WebViewProgressEstimateChangedNotification;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> extern NSString *WebViewProgressFinishedNotification;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @class WebView
</span><span class="lines">@@ -144,6 +153,7 @@
</span><span class="cx"> */
</span><span class="cx"> + (void)setMIMETypesShownAsHTML:(NSArray *)MIMETypes;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method URLFromPasteboard:
</span><span class="cx"> @abstract Returns a URL from a pasteboard
</span><span class="lines">@@ -163,6 +173,7 @@
</span><span class="cx"> which is the text inside the anchor tag.
</span><span class="cx"> */
</span><span class="cx"> + (NSString *)URLTitleFromPasteboard:(NSPasteboard *)pasteboard;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method registerURLSchemeAsLocal:
</span><span class="lines">@@ -442,6 +453,7 @@
</span><span class="cx"> */
</span><span class="cx"> - (NSDictionary *)elementAtPoint:(NSPoint)point;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property pasteboardTypesForSelection
</span><span class="cx"> @abstract The pasteboard types that the WebView can use for the current selection
</span><span class="lines">@@ -485,6 +497,7 @@
</span><span class="cx"> @abstract Removes the drag caret from the WebView
</span><span class="cx"> */
</span><span class="cx"> - (void)removeDragCaret;
</span><ins>+#endif /* !TARGET_OS_IPHONE */
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property drawsBackground
</span><span class="lines">@@ -519,16 +532,21 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *mainFrameTitle;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @property mainFrameIcon
</span><span class="cx"> @abstract The site icon for the current page loaded in the mainFrame, or nil.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, strong) NSImage *mainFrameIcon;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-
</del><ins>+#if TARGET_OS_IPHONE
+@interface WebView (WebIBActions)
+#else
</ins><span class="cx"> @interface WebView (WebIBActions) <NSUserInterfaceValidations>
</span><ins>+#endif
</ins><span class="cx"> - (IBAction)takeStringURLFrom:(id)sender;
</span><span class="cx"> - (IBAction)stopLoading:(id)sender;
</span><span class="cx"> - (IBAction)reload:(id)sender;
</span><span class="lines">@@ -543,8 +561,13 @@
</span><span class="cx"> - (IBAction)makeTextSmaller:(id)sender;
</span><span class="cx"> @property (nonatomic, readonly) BOOL canMakeTextStandardSize;
</span><span class="cx"> - (IBAction)makeTextStandardSize:(id)sender;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (IBAction)toggleContinuousSpellChecking:(id)sender;
</span><span class="cx"> - (IBAction)toggleSmartInsertDelete:(id)sender;
</span><ins>+#endif
+#if TARGET_OS_IPHONE
+- (void)stopLoadingAndClear;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -570,7 +593,9 @@
</span><span class="cx"> @property (nonatomic, strong) DOMCSSStyleDeclaration *typingStyle;
</span><span class="cx"> @property (nonatomic) BOOL smartInsertDeleteEnabled;
</span><span class="cx"> @property (nonatomic, getter=isContinuousSpellCheckingEnabled) BOOL continuousSpellCheckingEnabled;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> @property (nonatomic, readonly) NSInteger spellCheckerDocumentTag;
</span><ins>+#endif
</ins><span class="cx"> @property (nonatomic, readonly, strong) NSUndoManager *undoManager;
</span><span class="cx"> @property (nonatomic, strong) id editingDelegate;
</span><span class="cx"> - (DOMCSSStyleDeclaration *)styleDeclarationWithText:(NSString *)text;
</span><span class="lines">@@ -621,6 +646,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)overWrite:(id)sender;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)clearText:(id)sender;
+- (void)insertDictationPhrases:(NSArray *)dictationPhrases metadata:(id)metadata;
+- (void)toggleBold:(id)sender;
+- (void)toggleItalic:(id)sender;
+- (void)toggleUnderline:(id)sender;
+#endif
+
</ins><span class="cx"> /*
</span><span class="cx"> The following methods are declared in NSResponder.h.
</span><span class="cx"> WebView overrides each method in this list, providing
</span><span class="lines">@@ -691,3 +724,40 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#if TARGET_OS_IPHONE
+
+@interface WebView (WebViewIOS)
++ (void)enableWebThread;
++ (void)garbageCollectNow;
++ (void)purgeInactiveFontData;
++ (void)drainLayerPool;
++ (void)discardAllCompiledCode;
++ (void)registerForMemoryNotifications;
++ (void)releaseFastMallocMemoryOnCurrentThread;
++ (BOOL)isCharacterSmartReplaceExempt:(unichar)character isPreviousCharacter:(BOOL)b;
+
+/*!
+ * @method willEnterBackgroundWithCompletionHandler:
+ * @discussion This is invoked when the app gets a did enter background
+ * notification. It frees up caches on the web thread and invokes the handler
+ * block on the main thread when done.
+ *
+ * @param handler The block to invoke on the main thread once the cleanup is
+ * done.
+ */
++ (void)willEnterBackgroundWithCompletionHandler:(void(^)(void))handler;
+
+/*!
+ * @method updateLayoutIgnorePendingStyleSheets:
+ * @discussion This method forces the page to layout even if there are external
+ * pending style sheets.
+ */
+- (void)updateLayoutIgnorePendingStyleSheets;
+@end
+
+@interface NSObject (WebViewClassDelegate)
+- (BOOL)viewClass:(Class *)vClass andRepresentationClass:(Class *)rClass forMIMEType:(NSString *)MIMEType;
+@end
+
+#endif /* TARGET_OS_IPHONE */
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (160621 => 160622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2013-12-15 21:08:51 UTC (rev 160621)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2013-12-15 21:13:54 UTC (rev 160622)
</span><span class="lines">@@ -30,9 +30,15 @@
</span><span class="cx"> #import <WebKit/WebFramePrivate.h>
</span><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+#import <CoreGraphics/CGColor.h>
+#endif
+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="cx"> #define ENABLE_DASHBOARD_SUPPORT 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_REMOTE_INSPECTOR)
</span><span class="cx"> // FIXME: Should we just remove this ENABLE flag everywhere?
</span><span class="lines">@@ -49,11 +55,17 @@
</span><span class="cx"> @class WebScriptWorld;
</span><span class="cx"> @class WebSecurityOrigin;
</span><span class="cx"> @class WebTextIterator;
</span><ins>+#if TARGET_OS_IPHONE
+@class CALayer;
+@class WebFixedPositionContent;
</ins><span class="cx">
</span><ins>+@protocol WebCaretChangeListener;
+#endif
</ins><span class="cx"> @protocol WebDeviceOrientationProvider;
</span><span class="cx"> @protocol WebFormDelegate;
</span><span class="cx"> @protocol WebUserMediaClient;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> extern NSString *_WebCanGoBackKey;
</span><span class="cx"> extern NSString *_WebCanGoForwardKey;
</span><span class="cx"> extern NSString *_WebEstimatedProgressKey;
</span><span class="lines">@@ -62,7 +74,13 @@
</span><span class="cx"> extern NSString *_WebMainFrameTitleKey;
</span><span class="cx"> extern NSString *_WebMainFrameURLKey;
</span><span class="cx"> extern NSString *_WebMainFrameDocumentKey;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+extern NSString * const WebViewProgressEstimatedProgressKey;
+extern NSString * const WebViewProgressBackgroundColorKey;
+#endif
+
</ins><span class="cx"> // pending public WebElementDictionary keys
</span><span class="cx"> extern NSString *WebElementTitleKey; // NSString of the title of the element (used by Safari)
</span><span class="cx"> extern NSString *WebElementSpellingToolTipKey; // NSString of a tooltip representing misspelling or bad grammar (used internally)
</span><span class="lines">@@ -121,6 +139,11 @@
</span><span class="cx"> WebPaginationModeRightToLeft,
</span><span class="cx"> WebPaginationModeTopToBottom,
</span><span class="cx"> WebPaginationModeBottomToTop,
</span><ins>+#if TARGET_OS_IPHONE
+ // FIXME: Remove these once UIKit has switched to the above.
+ WebPaginationModeHorizontal = WebPaginationModeLeftToRight,
+ WebPaginationModeVertical = WebPaginationModeTopToBottom,
+#endif
</ins><span class="cx"> } WebPaginationMode;
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="lines">@@ -143,12 +166,14 @@
</span><span class="cx"> WebNotificationPermissionDenied
</span><span class="cx"> } WebNotificationPermission;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> @interface WebController : NSTreeController {
</span><span class="cx"> IBOutlet WebView *webView;
</span><span class="cx"> }
</span><span class="cx"> - (WebView *)webView;
</span><span class="cx"> - (void)setWebView:(WebView *)newWebView;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @interface WebView (WebViewEditingActionsPendingPublic)
</span><span class="cx">
</span><span class="lines">@@ -158,8 +183,10 @@
</span><span class="cx">
</span><span class="cx"> @interface WebView (WebPendingPublic)
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
</span><span class="cx"> - (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)findString:(NSString *)string options:(WebFindOptions)options;
</span><span class="cx"> - (DOMRange *)DOMRangeOfString:(NSString *)string relativeTo:(DOMRange *)previousRange options:(WebFindOptions)options;
</span><span class="lines">@@ -170,6 +197,9 @@
</span><span class="cx"> - (BOOL)tabKeyCyclesThroughElements;
</span><span class="cx">
</span><span class="cx"> - (void)scrollDOMRangeToVisible:(DOMRange *)range;
</span><ins>+#if TARGET_OS_IPHONE
+- (void)scrollDOMRangeToVisible:(DOMRange *)range withInset:(CGFloat)inset;
+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method setScriptDebugDelegate:
</span><span class="lines">@@ -201,12 +231,14 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)shouldClose;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method aeDescByEvaluatingJavaScriptFromString:
</span><span class="cx"> @param script The text of the JavaScript.
</span><span class="cx"> @result The result of the script, converted to an NSAppleEventDescriptor, or nil for failure.
</span><span class="cx"> */
</span><span class="cx"> - (NSAppleEventDescriptor *)aeDescByEvaluatingJavaScriptFromString:(NSString *)script;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Support for displaying multiple text matches.
</span><span class="cx"> // These methods might end up moving into a protocol, so different document types can specify
</span><span class="lines">@@ -284,9 +316,33 @@
</span><span class="cx"> @abstract indicate this WebView on screen for a remote inspector.
</span><span class="cx"> */
</span><span class="cx"> - (void)setIndicatingForRemoteInspector:(BOOL)enabled;
</span><ins>+#if TARGET_OS_IPHONE
+/*!
+ @method setHostApplicationBundleId:name
+ @param bundleId The application that this WebView was created for.
+ @param name That application's localized display name.
+ @abstract When a WebView is created out of process for an application,
+ you can clarify to a Remote Debugger which application this WebView
+ is intended to belong to; the application which hosts the WebView.
+*/
+- (void)setHostApplicationBundleId:(NSString *)bundleId name:(NSString *)name;
+
+/*!
+ @method hostApplicationBundleId
+ @result Returns the host application bundle id.
+*/
+- (NSString *)hostApplicationBundleId;
+
+/*!
+ @method hostApplicationName
+ @result Returns the host application name.
+*/
+- (NSString *)hostApplicationName;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif // ENABLE_REMOTE_INSPECTOR
</ins><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method setBackgroundColor:
</span><span class="cx"> @param backgroundColor Color to use as the default background.
</span><span class="lines">@@ -303,6 +359,10 @@
</span><span class="cx"> in a non-opaque window, since the color is drawn using NSCompositeCopy.
</span><span class="cx"> */
</span><span class="cx"> - (NSColor *)backgroundColor;
</span><ins>+#else
+- (void)setBackgroundColor:(CGColorRef)backgroundColor;
+- (CGColorRef)backgroundColor;
+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> Could be worth adding to the API.
</span><span class="lines">@@ -329,7 +389,9 @@
</span><span class="cx"> */
</span><span class="cx"> - (void)_dispatchPendingLoadRequests;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> + (NSArray *)_supportedFileExtensions;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method canShowFile:
</span><span class="lines">@@ -339,14 +401,21 @@
</span><span class="cx"> */
</span><span class="cx"> + (BOOL)canShowFile:(NSString *)path;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method suggestedFileExtensionForMIMEType:
</span><span class="cx"> @param MIMEType The MIME type to check.
</span><span class="cx"> @result The extension based on the MIME type
</span><span class="cx"> */
</span><span class="cx"> + (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> + (NSString *)_standardUserAgentWithApplicationName:(NSString *)applicationName;
</span><ins>+#if TARGET_OS_IPHONE
++ (NSString *)_standardUserAgentWithApplicationName:(NSString *)applicationName osMarketingVersion:(NSString *)osMarketingVersion;
+- (void)_setBrowserUserAgentProductVersion:(NSString *)productVersion buildVersion:(NSString *)buildVersion bundleVersion:(NSString *)bundleVersion;
+- (void)_setUIWebViewUserAgentWithBuildVersion:(NSString *)buildVersion;
+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method canCloseAllWebViews
</span><span class="lines">@@ -355,6 +424,51 @@
</span><span class="cx"> */
</span><span class="cx"> + (BOOL)canCloseAllWebViews;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (id)initSimpleHTMLDocumentWithStyle:(NSString *)style frame:(CGRect)frame preferences:(WebPreferences *)preferences groupName:(NSString *)groupName;
+- (id)_formDelegateForwarder;
+- (id)_formDelegateForSelector:(SEL)selector;
+- (id)_webMailDelegate;
+- (void)setWebMailDelegate:(id)delegate;
+- (id <WebCaretChangeListener>)caretChangeListener;
+- (void)setCaretChangeListener:(id <WebCaretChangeListener>)listener;
+
+- (NSSet *)caretChangeListeners;
+- (void)addCaretChangeListener:(id <WebCaretChangeListener>)listener;
+- (void)removeCaretChangeListener:(id <WebCaretChangeListener>)listener;
+- (void)removeAllCaretChangeListeners;
+
+- (void)caretChanged;
+
+- (void)_dispatchUnloadEvent;
+
+- (DOMCSSStyleDeclaration *)styleAtSelectionStart;
+
+- (NSUInteger)_renderTreeSize;
+
+/*!
+ * @method _handleMemoryWarning
+ * @discussion Try to release memory since we got a memory warning from the system. This method is
+ * also used by other internal clients. See <rdar://9582500>.
+ */
++ (void)_handleMemoryWarning;
+
+- (void)_setResourceLoadSchedulerSuspended:(BOOL)suspend;
++ (void)_setTileCacheLayerPoolCapacity:(unsigned)capacity;
+
++ (void)_setAcceleratedImageDecoding:(BOOL)enabled;
++ (BOOL)_acceleratedImageDecoding;
++ (void)_setAllowCookies:(BOOL)allow;
++ (BOOL)_allowCookies;
++ (BOOL)_isUnderMemoryPressure;
++ (void)_clearMemoryPressure;
++ (BOOL)_shouldWaitForMemoryClearMessage;
++ (void)_releaseMemoryNow;
++ (void)_clearPrivateBrowsingSessionCookieStorage;
+
+- (void)_replaceCurrentHistoryItem:(WebHistoryItem *)item;
+#endif
+
</ins><span class="cx"> // May well become public
</span><span class="cx"> - (void)_setFormDelegate:(id<WebFormDelegate>)delegate;
</span><span class="cx"> - (id<WebFormDelegate>)_formDelegate;
</span><span class="lines">@@ -405,13 +519,17 @@
</span><span class="cx"> + (NSString *)_decodeData:(NSData *)data;
</span><span class="cx">
</span><span class="cx"> + (void)_setAlwaysUsesComplexTextCodePath:(BOOL)f;
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // This is the old name of the above method. Needed for Safari versions that call it.
</span><span class="cx"> + (void)_setAlwaysUseATSU:(BOOL)f;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> + (void)_setAllowsRoundingHacks:(BOOL)allowsRoundingHacks;
</span><span class="cx"> + (BOOL)_allowsRoundingHacks;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE_DASHBOARD_SUPPORT
</span><span class="cx"> - (void)_addScrollerDashboardRegions:(NSMutableDictionary *)regions;
</span><span class="lines">@@ -424,11 +542,37 @@
</span><span class="cx"> + (void)_setShouldUseFontSmoothing:(BOOL)f;
</span><span class="cx"> + (BOOL)_shouldUseFontSmoothing;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // These two methods are useful for a test harness that needs a consistent appearance for the focus rings
</span><span class="cx"> // regardless of OS X version.
</span><span class="cx"> + (void)_setUsesTestModeFocusRingColor:(BOOL)f;
</span><span class="cx"> + (BOOL)_usesTestModeFocusRingColor;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_setUIKitDelegate:(id)delegate;
+- (id)_UIKitDelegate;
+- (void)_clearDelegates;
+
+- (NSURL *)_displayURL;
+
++ (NSArray *)_productivityDocumentMIMETypes;
+
+- (void)_setAllowsMessaging:(BOOL)aFlag;
+- (BOOL)_allowsMessaging;
+
+- (void)_setNetworkStateIsOnline:(BOOL)isOnLine;
+
+- (void)_setCustomFixedPositionLayoutRectInWebThread:(CGRect)rect synchronize:(BOOL)synchronize;
+- (void)_setCustomFixedPositionLayoutRect:(CGRect)rect;
+
+- (WebFixedPositionContent*)_fixedPositionContent;
+
+- (void)_viewGeometryDidChange;
+- (void)_overflowScrollPositionChangedTo:(CGPoint)offset forNode:(DOMNode *)node isUserScroll:(BOOL)userScroll;
+#endif
+
+#if !TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><span class="cx"> @method setAlwaysShowVerticalScroller:
</span><span class="cx"> @result Forces the vertical scroller to be visible if flag is YES, otherwise
</span><span class="lines">@@ -467,8 +611,79 @@
</span><span class="cx"> @abstract Sets additional plugin search paths for a specific WebView.
</span><span class="cx"> */
</span><span class="cx"> - (void)_setAdditionalWebPlugInPaths:(NSArray *)newPaths;
</span><ins>+#endif /* !TARGET_OS_IPHONE */
</ins><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> /*!
</span><ins>+ @method _pluginsAreRunning
+ @result Returns YES if any plug-ins in the WebView are running.
+ */
+- (BOOL)_pluginsAreRunning;
+/*!
+ @method _destroyAllPlugIns
+ @abstract Destroys all plug-ins in all of the WebView's frames.
+ */
+- (void)_destroyAllPlugIns;
+/*!
+ @method _startAllPlugIns
+ @abstract Starts all plug-ins in all of the WebView's frames.
+ */
+- (void)_startAllPlugIns;
+/*!
+ @method _stopAllPlugIns
+ @abstract Stops all plug-ins in all of the WebView's frames.
+ */
+- (void)_stopAllPlugIns;
+/*!
+ @method _stopAllPlugInsForPageCache
+ @abstract Stops all plug-ins in all of the WebView's frames.
+ Called when the page is entering the PageCache and lets the
+ plug-in know this by sending -webPlugInStopForPageCache.
+*/
+- (void)_stopAllPlugInsForPageCache;
+/*!
+ @method _restorePlugInsFromCache
+ @abstract Reconnects plug-ins from all of the WebView's frames to the
+ WebView and performs any other necessary reinitialization.
+ */
+- (void)_restorePlugInsFromCache;
+
+/*!
+ @method _setMediaLayer:forPluginView:
+ @abstract Set the layer that renders plug-in content for the given pluginView.
+ If layer is NULL, removes any existing layer. Returns YES if the set or
+ remove was successful.
+ */
+- (BOOL)_setMediaLayer:(CALayer*)layer forPluginView:(NSView*)pluginView;
+
+/*!
+ @method _clearBackForwardCache
+ @abstract Clear's this WebView's back/forward cache on the WebThread.
+ */
+- (void)_clearBackForwardCache;
+
+/*!
+ @method _wantsTelephoneNumberParsing
+ @abstract Does this WebView want phone number parsing? (This could ultimately be disallowed by the document itself).
+ */
+
+- (BOOL)_wantsTelephoneNumberParsing;
+
+/*!
+ @method _setWantsTelephoneNumberParsing
+ @abstract Explicitly disable WebKit phone number parsing on this WebView, or say that you want it enabled if possible.
+ */
+
+- (void)_setWantsTelephoneNumberParsing:(BOOL)flag;
+
+/*!
+ @method _setNeedsUnrestrictedGetMatchedCSSRules
+ @abstract Explicitly enables/disables cross origin CSS rules matching.
+ */
+- (void)_setNeedsUnrestrictedGetMatchedCSSRules:(BOOL)flag;
+#endif /* TARGET_OS_IPHONE */
+
+/*!
</ins><span class="cx"> @method _setInViewSourceMode:
</span><span class="cx"> @abstract Used to place a WebView into a special source-viewing mode.
</span><span class="cx"> */
</span><span class="lines">@@ -520,7 +735,9 @@
</span><span class="cx"> - (void)handleAuthenticationForResource:(id)identifier challenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_clearUndoRedoOperations;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /* Used to do fast (lower quality) scaling of images so that window resize can be quick. */
</span><span class="cx"> - (BOOL)_inFastImageScalingMode;
</span><span class="lines">@@ -542,7 +759,9 @@
</span><span class="cx"> - (void)setMemoryCacheDelegateCallsEnabled:(BOOL)suspend;
</span><span class="cx"> - (BOOL)areMemoryCacheDelegateCallsEnabled;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> + (NSCursor *)_pointingHandCursor;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // SPI for DumpRenderTree
</span><span class="cx"> - (BOOL)_postsAcceleratedCompositingNotifications;
</span><span class="lines">@@ -568,8 +787,10 @@
</span><span class="cx"> - (void)resetTrackedRepaints;
</span><span class="cx"> - (NSArray*)trackedRepaintRects; // Returned array contains rectValue NSValues.
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> // Which pasteboard text is coming from in editing delegate methods such as shouldInsertNode.
</span><span class="cx"> - (NSPasteboard *)_insertionPasteboard;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Whitelists access from an origin (sourceOrigin) to a set of one or more origins described by the parameters:
</span><span class="cx"> // - destinationProtocol: The protocol to grant access to.
</span><span class="lines">@@ -653,8 +874,10 @@
</span><span class="cx"> - (CGFloat)_gapBetweenPages;
</span><span class="cx"> - (NSUInteger)_pageCount;
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (void)_setCustomBackingScaleFactor:(CGFloat)overrideScaleFactor;
</span><span class="cx"> - (CGFloat)_backingScaleFactor;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // Deprecated. Use the methods in pending public above instead.
</span><span class="cx"> - (NSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(NSUInteger)limit;
</span><span class="lines">@@ -696,6 +919,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> @interface WebView (WebViewPrintingPrivate)
</span><span class="cx"> /*!
</span><span class="cx"> @method _adjustPrintingMarginsForHeaderAndFooter:
</span><span class="lines">@@ -747,6 +971,7 @@
</span><span class="cx"> - (void)setAutomaticSpellingCorrectionEnabled:(BOOL)flag;
</span><span class="cx"> - (void)toggleAutomaticSpellingCorrection:(id)sender;
</span><span class="cx"> @end
</span><ins>+#endif /* !TARGET_OS_IPHONE */
</ins><span class="cx">
</span><span class="cx"> @interface WebView (WebViewEditingInMail)
</span><span class="cx"> - (void)_insertNewlineInQuotedContent;
</span><span class="lines">@@ -762,6 +987,15 @@
</span><span class="cx"> - (id<WebDeviceOrientationProvider>)_deviceOrientationProvider;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+@protocol WebGeolocationProvider;
+
+@protocol WebGeolocationProviderInitializationListener <NSObject>
+- (void)initializationAllowedWebView:(WebView *)webView provider:(id<WebGeolocationProvider>)provider;
+- (void)initializationDeniedWebView:(WebView *)webView provider:(id<WebGeolocationProvider>)provider;
+@end
+#endif
+
</ins><span class="cx"> @interface WebView (WebViewUserMedia)
</span><span class="cx"> - (void)_setUserMediaClient:(id<WebUserMediaClient>)userMediaClient;
</span><span class="cx"> - (id<WebUserMediaClient>)_userMediaClient;
</span><span class="lines">@@ -771,6 +1005,12 @@
</span><span class="cx"> - (void)registerWebView:(WebView *)webView;
</span><span class="cx"> - (void)unregisterWebView:(WebView *)webView;
</span><span class="cx"> - (WebGeolocationPosition *)lastPosition;
</span><ins>+#if TARGET_OS_IPHONE
+- (void)setEnableHighAccuracy:(BOOL)enableHighAccuracy;
+- (void)initializeGeolocationForWebView:(WebView *)webView listener:(id<WebGeolocationProviderInitializationListener>)listener;
+- (void)cancelWarmUpForWebView:(WebView *)webView;
+- (void)stopTrackingWebView:(WebView *)webView;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol WebNotificationProvider
</span><span class="lines">@@ -794,6 +1034,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_geolocationDidChangePosition:(WebGeolocationPosition *)position;
</span><span class="cx"> - (void)_geolocationDidFailWithMessage:(NSString *)errorMessage;
</span><ins>+#if TARGET_OS_IPHONE
+- (void)_resetAllGeolocationPermission;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WebView (WebViewNotification)
</span><span class="lines">@@ -807,6 +1050,16 @@
</span><span class="cx"> - (uint64_t)_notificationIDForTesting:(JSValueRef)jsNotification;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+@interface WebView (WebViewIOSPDF)
++ (Class)_getPDFRepresentationClass;
++ (void)_setPDFRepresentationClass:(Class)pdfRepresentationClass;
+
++ (Class)_getPDFViewClass;
++ (void)_setPDFViewClass:(Class)pdfViewClass;
+@end
+#endif
+
</ins><span class="cx"> @interface NSObject (WebViewFrameLoadDelegatePrivate)
</span><span class="cx"> - (void)webView:(WebView *)sender didFirstLayoutInFrame:(WebFrame *)frame;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>