<!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>[161470] 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/161470">161470</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-01-07 16:42:20 -0800 (Tue, 07 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream WebKit support for various features
https://bugs.webkit.org/show_bug.cgi?id=126413
Reviewed by Sam Weinig.
Upstream iOS WebKit changes needed for these features:
- ENABLE(DELETION_UI)
- ENABLE(TOUCH_EVENTS)
- USE(QUICK_LOOK)
- USE(UIKIT_EDITING)
- ENABLE(DISK_IMAGE_CACHE)
- ENABLE(IOS_TEXT_AUTOSIZING)
- ENABLE(ICONDATABASE)
- ENABLE(DASHBOARD_SUPPORT)
* DefaultDelegates/WebDefaultEditingDelegate.m:
* Misc/WebCache.mm:
* WebCoreSupport/WebChromeClient.h:
* WebView/WebDataSource.mm:
(-[WebDataSource dealloc]):
* WebView/WebEditingDelegatePrivate.h:
* WebView/WebFrame.mm:
(-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
* WebView/WebHTMLView.mm:
(-[WebHTMLView maintainsInactiveSelection]):
(-[WebHTMLView touch:]):
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
(-[WebView _cacheFrameLoadDelegateImplementations]):
(-[WebView quickLookContentForURL:]):
(-[WebView _touchEventRegions]):
* WebView/WebViewPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDefaultDelegatesWebDefaultEditingDelegatem">trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebEditingDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</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 (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2014-01-02 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Upstream WebKit support for various features
+ https://bugs.webkit.org/show_bug.cgi?id=126413
+
+ Reviewed by Sam Weinig.
+
+ Upstream iOS WebKit changes needed for these features:
+
+ - ENABLE(DELETION_UI)
+ - ENABLE(TOUCH_EVENTS)
+ - USE(QUICK_LOOK)
+ - USE(UIKIT_EDITING)
+ - ENABLE(DISK_IMAGE_CACHE)
+ - ENABLE(IOS_TEXT_AUTOSIZING)
+ - ENABLE(ICONDATABASE)
+ - ENABLE(DASHBOARD_SUPPORT)
+
+ * DefaultDelegates/WebDefaultEditingDelegate.m:
+ * Misc/WebCache.mm:
+ * WebCoreSupport/WebChromeClient.h:
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource dealloc]):
+ * WebView/WebEditingDelegatePrivate.h:
+ * WebView/WebFrame.mm:
+ (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView maintainsInactiveSelection]):
+ (-[WebHTMLView touch:]):
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+ (-[WebView _cacheFrameLoadDelegateImplementations]):
+ (-[WebView quickLookContentForURL:]):
+ (-[WebView _touchEventRegions]):
+ * WebView/WebViewPrivate.h:
+
+2014-01-02 Andy Estes <aestes@apple.com>
+
</ins><span class="cx"> [iOS] Upstream a bug fix for plugin-backed media elements
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126412
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacDefaultDelegatesWebDefaultEditingDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -45,10 +45,12 @@
</span><span class="cx"> return sharedDelegate;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DELETION_UI)
</ins><span class="cx"> - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element
</span><span class="cx"> {
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -47,6 +47,10 @@
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CACHE_PARTITIONING)
+#import <WebCore/Document.h>
+#endif
+
</ins><span class="cx"> @implementation WebCache
</span><span class="cx">
</span><span class="cx"> + (void)initialize
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -152,6 +152,10 @@
</span><span class="cx"> virtual void enableSuddenTermination() OVERRIDE;
</span><span class="cx"> virtual void disableSuddenTermination() OVERRIDE;
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+ virtual void needTouchEvents(bool) OVERRIDE { }
+#endif
+
</ins><span class="cx"> virtual bool shouldReplaceWithGeneratedFileForUpload(const WTF::String& path, WTF::String &generatedFilename) OVERRIDE;
</span><span class="cx"> virtual WTF::String generateReplacementFile(const WTF::String& path) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -488,6 +488,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+#if USE(QUICK_LOOK)
+ // Added in -[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:].
+ if (NSURL *url = [[self response] URL])
+ removeQLPreviewConverterForURL(url);
+#endif
</ins><span class="cx">
</span><span class="cx"> delete toPrivate(_private);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebEditingDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> @class DOMHTMLElement;
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebViewEditingDelegatePrivate)
</span><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element;
</span><del>-#if !TARGET_OS_IPHONE
</del><span class="cx"> - (void)webView:(WebView *)webView didWriteSelectionToPasteboard:(NSPasteboard *)pasteboard;
</span><span class="cx"> #else
</span><span class="cx"> - (NSArray *)supportedPasteboardTypesForCurrentSelection;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -126,6 +126,11 @@
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+#import <WebCore/QuickLook.h>
+#import <WebCore/WebCoreURLResponseIOS.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="lines">@@ -2431,6 +2436,19 @@
</span><span class="cx"> responseURL = createUniqueWebDataURL();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+ if (shouldUseQuickLookForMIMEType(MIMEType)) {
+ URL qlURL = responseURL;
+ if (qlURL.isEmpty())
+ qlURL = [baseURL absoluteURL];
+ OwnPtr<ResourceRequest> qlRequest(registerQLPreviewConverterIfNeeded((NSURL *)qlURL, MIMEType, data));
+ if (qlRequest) {
+ _private->coreFrame->loader().load(FrameLoadRequest(_private->coreFrame, *qlRequest));
+ return;
+ }
+ }
+#endif // USE(QUICK_LOOK)
+
</ins><span class="cx"> ResourceRequest request([baseURL absoluteURL]);
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -3052,6 +3052,17 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)maintainsInactiveSelection
</span><span class="cx"> {
</span><ins>+#if USE(UIKIT_EDITING)
+ // We want to maintain an inactive selection, when in editable content.
+ if ([[self _webView] maintainsInactiveSelection])
+ return YES;
+
+ if ([[self window] _newFirstResponderAfterResigning] == self)
+ return YES;
+
+ Frame* coreFrame = core([self _frame]);
+ return coreFrame && coreFrame->selection().isContentEditable();
+#else
</ins><span class="cx"> // This method helps to determine whether the WebHTMLView should maintain
</span><span class="cx"> // an inactive selection when it's not first responder.
</span><span class="cx"> // Traditionally, these views have not maintained such selections,
</span><span class="lines">@@ -3086,6 +3097,7 @@
</span><span class="cx"> && [nextResponder isDescendantOf:[[[self _webView] mainFrame] frameView]];
</span><span class="cx">
</span><span class="cx"> return selectionIsEditable && nextResponderIsInWebView;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -3953,6 +3965,18 @@
</span><span class="cx"> _private->handlingMouseDownEvent = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+- (void)touch:(WebEvent *)event
+{
+ RetainPtr<WebHTMLView> protector = self;
+
+ // Let WebCore get a chance to deal with the event. This will call back to us
+ // to start the autoscroll timer if appropriate.
+ if (Frame* coreframe = core([self _frame]))
+ coreframe->eventHandler().touchEvent(event);
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> - (void)dragImage:(NSImage *)dragImage
</span><span class="cx"> at:(NSPoint)at
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -557,6 +557,11 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitNetworkDataUsageTrackingEnabledPreferenceKey,
</span><span class="cx"> @"", WebKitNetworkInterfaceNamePreferenceKey,
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(DISK_IMAGE_CACHE)
+ [NSNumber numberWithBool:YES], WebKitDiskImageCacheEnabledPreferenceKey,
+ [NSNumber numberWithUnsignedInt:(100 * 1024)], WebKitDiskImageCacheMinimumImageSizePreferenceKey,
+ [NSNumber numberWithUnsignedInt:(100 * 1024 * 1024)], WebKitDiskImageCacheMaximumCacheSizePreferenceKey,
+#endif
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> [NSNumber numberWithFloat:WKGetMinimumZoomFontSize()], WebKitMinimumZoomFontSizePreferenceKey,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -268,6 +268,21 @@
</span><span class="cx"> - (void)setNetworkInterfaceName:(NSString *)name;
</span><span class="cx"> - (NSString *)networkInterfaceName;
</span><span class="cx">
</span><ins>+- (void)_setMinimumZoomFontSize:(float)size;
+- (float)_minimumZoomFontSize;
+
+- (BOOL)diskImageCacheEnabled;
+- (void)setDiskImageCacheEnabled:(BOOL)enabled;
+
+- (unsigned)diskImageCacheMinimumImageSize;
+- (void)setDiskImageCacheMinimumImageSize:(unsigned)minimumSize;
+
+- (unsigned)diskImageCacheMaximumCacheSize;
+- (void)setDiskImageCacheMaximumCacheSize:(unsigned)maximumSize;
+
+- (NSString *)_diskImageCacheSavedCacheDirectory;
+- (void)_setDiskImageCacheSavedCacheDirectory:(NSString *)path;
+
</ins><span class="cx"> - (void)setMediaPlaybackAllowsAirPlay:(BOOL)flag;
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsAirPlay;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -263,6 +263,19 @@
</span><span class="cx"> #import <glib.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+#include <WebCore/QuickLook.h>
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+#import <WebCore/WebEventRegion.h>
+#endif
+
+#if ENABLE(DISK_IMAGE_CACHE)
+#import "WebDiskImageCacheClientIOS.h"
+#import <WebCore/DiskImageCacheIOS.h>
+#endif
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> @interface NSSpellChecker (WebNSSpellCheckerDetails)
</span><span class="cx"> - (void)_preflightChosenSpellServer;
</span><span class="lines">@@ -587,6 +600,11 @@
</span><span class="cx"> NSString *_WebMainFrameDocumentKey = @"mainFrameDocument";
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+NSString *WebQuickLookFileNameKey = @"WebQuickLookFileNameKey";
+NSString *WebQuickLookUTIKey = @"WebQuickLookUTIKey";
+#endif
+
</ins><span class="cx"> NSString *_WebViewDidStartAcceleratedCompositingNotification = @"_WebViewDidStartAcceleratedCompositing";
</span><span class="cx"> NSString * const WebViewWillCloseNotification = @"WebViewWillCloseNotification";
</span><span class="cx">
</span><span class="lines">@@ -2476,6 +2494,10 @@
</span><span class="cx"> if (_private->zoomsTextOnly != zoomsTextOnly)
</span><span class="cx"> [self _setZoomMultiplier:_private->zoomMultiplier isTextOnly:zoomsTextOnly];
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ settings.setMinimumZoomFontSize([preferences _minimumZoomFontSize]);
+#endif
+
</ins><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE) && PLATFORM(IOS)
</span><span class="cx"> DiskImageCache& diskImageCache = WebCore::diskImageCache();
</span><span class="cx"> diskImageCache.setEnabled([preferences diskImageCacheEnabled]);
</span><span class="lines">@@ -2588,7 +2610,9 @@
</span><span class="cx"> cache->didFirstVisuallyNonEmptyLayoutInFrameFunc = getMethod(delegate, @selector(webView:didFirstVisuallyNonEmptyLayoutInFrame:));
</span><span class="cx"> cache->didLayoutFunc = getMethod(delegate, @selector(webView:didLayout:));
</span><span class="cx"> cache->didHandleOnloadEventsForFrameFunc = getMethod(delegate, @selector(webView:didHandleOnloadEventsForFrame:));
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx"> cache->didReceiveIconForFrameFunc = getMethod(delegate, @selector(webView:didReceiveIcon:forFrame:));
</span><ins>+#endif
</ins><span class="cx"> cache->didReceiveServerRedirectForProvisionalLoadForFrameFunc = getMethod(delegate, @selector(webView:didReceiveServerRedirectForProvisionalLoadForFrame:));
</span><span class="cx"> cache->didReceiveTitleForFrameFunc = getMethod(delegate, @selector(webView:didReceiveTitle:forFrame:));
</span><span class="cx"> cache->didStartProvisionalLoadForFrameFunc = getMethod(delegate, @selector(webView:didStartProvisionalLoadForFrame:));
</span><span class="lines">@@ -3597,6 +3621,21 @@
</span><span class="cx"> return _private->page->setDefersLoading(defer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(QUICK_LOOK)
+- (NSDictionary *)quickLookContentForURL:(NSURL *)url
+{
+ NSString *uti = qlPreviewConverterUTIForURL(url);
+ if (!uti)
+ return nil;
+
+ NSString *fileName = qlPreviewConverterFileNameForURL(url);
+ if (!fileName)
+ return nil;
+
+ return [NSDictionary dictionaryWithObjectsAndKeys: fileName, WebQuickLookFileNameKey, uti, WebQuickLookUTIKey, nil];
+}
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (BOOL)_isStopping
</span><span class="cx"> {
</span><span class="lines">@@ -3722,6 +3761,50 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#if ENABLE(TOUCH_EVENTS)
+- (NSArray *)_touchEventRegions
+{
+ Frame* frame = [self _mainCoreFrame];
+ if (!frame)
+ return nil;
+
+ Document* document = frame->document();
+ if (!document)
+ return nil;
+
+ Vector<IntRect> rects;
+ document->getTouchRects(rects);
+
+ if (rects.size() == 0)
+ return nil;
+
+ NSMutableArray *eventRegionArray = [[[NSMutableArray alloc] initWithCapacity:rects.size()] autorelease];
+
+ Vector<IntRect>::const_iterator end = rects.end();
+ for (Vector<IntRect>::const_iterator it = rects.begin(); it != end; ++it) {
+ const IntRect& rect = *it;
+ if (rect.isEmpty())
+ continue;
+
+ // The event region wants this points in this order:
+ // p2------p3
+ // | |
+ // p1------p4
+ //
+ WebEventRegion *eventRegion = [[WebEventRegion alloc] initWithPoints:FloatPoint(rect.x(), rect.maxY())
+ :FloatPoint(rect.x(), rect.y())
+ :FloatPoint(rect.maxX(), rect.y())
+ :FloatPoint(rect.maxX(), rect.maxY())];
+ if (eventRegion) {
+ [eventRegionArray addObject:eventRegion];
+ [eventRegion release];
+ }
+ }
+
+ return eventRegionArray;
+}
+#endif // ENABLE(TOUCH_EVENTS)
+
</ins><span class="cx"> // For backwards compatibility with the WebBackForwardList API, we honor both
</span><span class="cx"> // a per-WebView and a per-preferences setting for whether to use the page cache.
</span><span class="cx">
</span><span class="lines">@@ -3766,11 +3849,13 @@
</span><span class="cx"> return [[[WebTextIterator alloc] initWithRange:kit(selectionInsideRect.toNormalizedRange().get())] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
</ins><span class="cx"> - (void)handleAuthenticationForResource:(id)identifier challenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
</span><span class="cx"> {
</span><span class="cx"> NSWindow *window = [self hostWindow] ? [self hostWindow] : [self window];
</span><span class="cx"> [[WebPanelAuthenticationHandler sharedHandler] startAuthentication:challenge window:window];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)_clearUndoRedoOperations
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (161469 => 161470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-01-08 00:42:18 UTC (rev 161469)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-01-08 00:42:20 UTC (rev 161470)
</span><span class="lines">@@ -101,6 +101,11 @@
</span><span class="cx"> extern NSString *_WebViewRemoteInspectorHasSessionChangedNotification;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+extern NSString *WebQuickLookFileNameKey;
+extern NSString *WebQuickLookUTIKey;
+#endif
+
</ins><span class="cx"> extern NSString * const WebViewWillCloseNotification;
</span><span class="cx">
</span><span class="cx"> #if ENABLE_DASHBOARD_SUPPORT
</span><span class="lines">@@ -466,6 +471,10 @@
</span><span class="cx"> + (void)_clearPrivateBrowsingSessionCookieStorage;
</span><span class="cx">
</span><span class="cx"> - (void)_replaceCurrentHistoryItem:(WebHistoryItem *)item;
</span><ins>+#endif // PLATFORM(IOS)
+
+#if TARGET_OS_IPHONE
+- (NSDictionary *)quickLookContentForURL:(NSURL *)url;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // May well become public
</span></span></pre>
</div>
</div>
</body>
</html>