<!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>[161936] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161936">161936</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 18:10:09 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Make NetworkStateNotifier.h a private header, needed by iOS.
* WebCore.xcodeproj/project.pbxproj:
Source/WebKit/mac: Fix the remaining compiler errors in iOS WK1.
* WebView/WebFrame.mm:
(vectorForDictationPhrasesArray): Need this function on iOS.
(-[WebFrame setSelectedDOMRange:affinity:closeTyping:]): We're already inside
a huge if PLATFORM(IOS) block.
(-[WebFrame resetTextAutosizingBeforeLayout]): Document now exposes RenderView.
* WebView/WebFrameInternal.h: Declare vectorForDictationPhrasesArray() (not a good place for it!)
* WebView/WebView.mm: #import cleanup for iOS.
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): Declare autoStartRemoteInspector
here but this needs cleaning up (<rdar://problem/15810991>).
(-[WebView setHostApplicationBundleId:name:]): No [WebView sharedWebInspectorServer] any more.
(-[WebView _didCommitLoadForFrame:]): Ditto.
* WebView/WebViewData.h: Add allowsRemoteInspection.
* WebView/WebViewData.mm: Initialize allowsRemoteInspection
(-[WebViewPrivate init]):
* WebView/WebViewPrivate.h: Fumbled #ifdef.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameInternalh">trunk/Source/WebKit/mac/WebView/WebFrameInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatamm">trunk/Source/WebKit/mac/WebView/WebViewData.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> 2014-01-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Make NetworkStateNotifier.h a private header, needed by iOS.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+2014-01-13 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> More work towards getting iOS WK1 building.
</span><span class="cx">
</span><span class="cx"> Some more Private headers for iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> 1A762C790A074F2600989F5B /* JSXPathResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A762C710A074F2600989F5B /* JSXPathResult.cpp */; };
</span><span class="cx"> 1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C720A074F2600989F5B /* JSXPathResult.h */; };
</span><span class="cx"> 1A7E3C291710997300367935 /* ThreadableLoaderClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */; };
</span><del>- 1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */; };
</del><ins>+ 1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */; };
</span><span class="cx"> 1A7FA6490DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA6470DDA3CBA0028F8A5 /* NetworkStateNotifierMac.cpp */; };
</span><span class="cx"> 1A7FA7CC0DDA4B770028F8A5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7FA7CB0DDA4B770028F8A5 /* SystemConfiguration.framework */; };
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-01-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix the remaining compiler errors in iOS WK1.
+
+ * WebView/WebFrame.mm:
+ (vectorForDictationPhrasesArray): Need this function on iOS.
+ (-[WebFrame setSelectedDOMRange:affinity:closeTyping:]): We're already inside
+ a huge if PLATFORM(IOS) block.
+ (-[WebFrame resetTextAutosizingBeforeLayout]): Document now exposes RenderView.
+ * WebView/WebFrameInternal.h: Declare vectorForDictationPhrasesArray() (not a good place for it!)
+ * WebView/WebView.mm: #import cleanup for iOS.
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): Declare autoStartRemoteInspector
+ here but this needs cleaning up (<rdar://problem/15810991>).
+ (-[WebView setHostApplicationBundleId:name:]): No [WebView sharedWebInspectorServer] any more.
+ (-[WebView _didCommitLoadForFrame:]): Ditto.
+ * WebView/WebViewData.h: Add allowsRemoteInspection.
+ * WebView/WebViewData.mm: Initialize allowsRemoteInspection
+ (-[WebViewPrivate init]):
+ * WebView/WebViewPrivate.h: Fumbled #ifdef.
+
+2014-01-13 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> More work towards getting iOS WK1 building.
</span><span class="cx">
</span><span class="cx"> * DOM/WebDOMOperations.mm: Need RenderObject.h.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -239,6 +239,40 @@
</span><span class="cx"> return TextDirectionSubmenuNeverIncluded;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+PassOwnPtr<Vector<Vector<String>>> vectorForDictationPhrasesArray(NSArray *dictationPhrases)
+{
+ NSUInteger dictationPhrasesCount = [dictationPhrases count];
+ if (!dictationPhrasesCount)
+ return PassOwnPtr<Vector<Vector<String> > >();
+
+ OwnPtr<Vector<Vector<String> > > dictationPhrasesVector = adoptPtr(new Vector<Vector<String> >(dictationPhrasesCount));
+
+ for (NSUInteger i = 0; i < dictationPhrasesCount; i++) {
+
+ id dictationPhrase = [dictationPhrases objectAtIndex:i];
+ if (![dictationPhrase isKindOfClass:[NSArray class]])
+ continue;
+
+ NSArray *interpretationsArray = (NSArray *)dictationPhrase;
+ Vector<String>& interpretationsVector = dictationPhrasesVector->at(i);
+
+ NSUInteger interpretationsCount = [interpretationsArray count];
+
+ for (NSUInteger j = 0; j < interpretationsCount; j++) {
+
+ id interpretation = [interpretationsArray objectAtIndex:j];
+ if (![interpretation isKindOfClass:[NSString class]])
+ continue;
+
+ interpretationsVector.append(String((NSString *)interpretation));
+ }
+ }
+
+ return dictationPhrasesVector.release();
+}
+#endif
+
</ins><span class="cx"> @implementation WebFrame (WebInternal)
</span><span class="cx">
</span><span class="cx"> Frame* core(WebFrame *frame)
</span><span class="lines">@@ -1418,7 +1452,7 @@
</span><span class="cx"> - (void)setSelectedDOMRange:(DOMRange *)range affinity:(NSSelectionAffinity)affinity closeTyping:(BOOL)closeTyping
</span><span class="cx"> {
</span><span class="cx"> WebCore::Frame *frame = core(self);
</span><del>-#if PLATFORM(IOS)
</del><ins>+
</ins><span class="cx"> // Ensure the view becomes first responder.
</span><span class="cx"> // This does not happen automatically on iOS because we don't forward
</span><span class="cx"> // all the click events to WebKit.
</span><span class="lines">@@ -1430,7 +1464,7 @@
</span><span class="cx"> page->chrome().focusNSView(documentView);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> frame->selection().setSelectedRange(core(range), (EAffinity)affinity, closeTyping);
</span><span class="cx"> if (!closeTyping)
</span><span class="cx"> frame->editor().ensureLastEditCommandHasCurrentSelectionIfOpenForMoreTyping();
</span><span class="lines">@@ -1868,11 +1902,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Frame* coreFrame = core(self);
</span><del>- for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame)) {
</del><ins>+ for (Frame* frame = coreFrame; frame; frame = frame->tree().traverseNext(coreFrame)) {
</ins><span class="cx"> Document *doc = frame->document();
</span><del>- if (!doc || !doc->renderer())
</del><ins>+ if (!doc || !doc->renderView())
</ins><span class="cx"> continue;
</span><del>- doc->renderer()->resetTextAutosizing();
</del><ins>+ doc->renderView()->resetTextAutosizing();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> WebCore::EditableLinkBehavior core(WebKitEditableLinkBehavior);
</span><span class="cx"> WebCore::TextDirectionSubmenuInclusionBehavior core(WebTextDirectionSubmenuInclusionBehavior);
</span><span class="cx">
</span><ins>+#if defined(__cplusplus) && PLATFORM(IOS)
+PassOwnPtr<Vector<Vector<String>>> vectorForDictationPhrasesArray(NSArray *);
+#endif
+
</ins><span class="cx"> WebView *getWebView(WebFrame *webFrame);
</span><span class="cx">
</span><span class="cx"> @interface WebFramePrivate : NSObject {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #import "WebBaseNetscapePluginView.h"
</span><span class="cx"> #import "WebCache.h"
</span><span class="cx"> #import "WebChromeClient.h"
</span><del>-#import "WebContextMenuClient.h"
</del><span class="cx"> #import "WebDOMOperationsPrivate.h"
</span><span class="cx"> #import "WebDataSourceInternal.h"
</span><span class="cx"> #import "WebDatabaseManagerPrivate.h"
</span><span class="lines">@@ -64,7 +63,6 @@
</span><span class="cx"> #import "WebFrameLoaderClient.h"
</span><span class="cx"> #import "WebFrameNetworkingContext.h"
</span><span class="cx"> #import "WebFrameViewInternal.h"
</span><del>-#import "WebFullScreenController.h"
</del><span class="cx"> #import "WebGeolocationClient.h"
</span><span class="cx"> #import "WebGeolocationPositionInternal.h"
</span><span class="cx"> #import "WebHTMLRepresentation.h"
</span><span class="lines">@@ -84,10 +82,6 @@
</span><span class="cx"> #import "WebNSDataExtras.h"
</span><span class="cx"> #import "WebNSDataExtrasPrivate.h"
</span><span class="cx"> #import "WebNSDictionaryExtras.h"
</span><del>-#import "WebNSEventExtras.h"
-#import "WebNSObjectExtras.h"
-#import "WebNSPasteboardExtras.h"
-#import "WebNSPrintOperationExtras.h"
</del><span class="cx"> #import "WebNSURLExtras.h"
</span><span class="cx"> #import "WebNSURLRequestExtras.h"
</span><span class="cx"> #import "WebNSViewExtras.h"
</span><span class="lines">@@ -178,7 +172,6 @@
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreView.h>
</span><del>-#import <WebCore/WebVideoFullscreenController.h>
</del><span class="cx"> #import <WebCore/Widget.h>
</span><span class="cx"> #import <WebKit/DOM.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="lines">@@ -202,7 +195,16 @@
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if !PLATFORM(IOS)
+#import "WebContextMenuClient.h"
+#import "WebFullScreenController.h"
+#import "WebNSEventExtras.h"
+#import "WebNSObjectExtras.h"
+#import "WebNSPasteboardExtras.h"
+#import "WebNSPrintOperationExtras.h"
+#import "WebPDFView.h"
+#import <WebCore/WebVideoFullscreenController.h>
+#else
</ins><span class="cx"> #import "MemoryMeasure.h"
</span><span class="cx"> #import "WebCaretChangeListener.h"
</span><span class="cx"> #import "WebChromeClientIOS.h"
</span><span class="lines">@@ -231,19 +233,20 @@
</span><span class="cx"> #import <WebCore/SQLiteDatabaseTracker.h>
</span><span class="cx"> #import <WebCore/SmartReplace.h>
</span><span class="cx"> #import <WebCore/TextRun.h>
</span><ins>+#import <WebCore/TileCache.h>
</ins><span class="cx"> #import <WebCore/TileControllerMemoryHandlerIOS.h>
</span><span class="cx"> #import <WebCore/WAKWindow.h>
</span><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadMessage.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><del>-#import <dispatch/private.h
</del><ins>+#import <dispatch/private.h>
</ins><span class="cx"> #import <wtf/FastMalloc.h>
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> #import <WebCore/GraphicsLayer.h>
</span><span class="cx"> #endif
</span><del>-#endif
</del><ins>+#endif // !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> #import <WebKit/WebDashboardRegion.h>
</span><span class="lines">@@ -457,7 +460,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> @interface WebView(WebViewPrivate)
</span><del>-- (void)_preferencesChanged:(WebPreferences *)preferoid)_updateScreenScaleFromWindow;
</del><ins>+- (void)_preferencesChanged:(WebPreferences *)preferences;
+- (void)_updateScreenScaleFromWindow;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface NSURLCache (WebPrivate)
</span><span class="lines">@@ -1206,6 +1210,7 @@
</span><span class="cx"> else {
</span><span class="cx"> static BOOL textFieldInspectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTextFieldRemoteInspectionEnabledPreferenceKey];
</span><span class="cx"> _private->allowsRemoteInspection = textFieldInspectionEnabled;
</span><ins>+ BOOL autoStartRemoteInspector = YES; // FIXME: <rdar://problem/15810991>
</ins><span class="cx"> if (_private->allowsRemoteInspection && autoStartRemoteInspector)
</span><span class="cx"> [WebView _enableRemoteInspector];
</span><span class="cx"> }
</span><span class="lines">@@ -1988,7 +1993,8 @@
</span><span class="cx"> _private->hostApplicationName = [name copy];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [[WebView sharedWebInspectorServer] pushListing];
</del><ins>+ // FIXME: <rdar://problem/15810991>
+ // [[WebView sharedWebInspectorServer] pushListing];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)hostApplicationBundleId
</span><span class="lines">@@ -3036,7 +3042,8 @@
</span><span class="cx"> if (frame == [self mainFrame]) {
</span><span class="cx"> _private->didDrawTiles = 0;
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><del>- [[WebView sharedWebInspectorServer] pushListing];
</del><ins>+ // FIXME: <rdar://problem/15810991>
+ // [[WebView sharedWebInspectorServer] pushListing];
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><ins>+ BOOL allowsRemoteInspection;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebIndicateLayer *indicateLayer;
</span><span class="cx"> NSString *hostApplicationBundleId;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.mm (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.mm 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.mm 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -105,6 +105,10 @@
</span><span class="cx"> dashboardBehaviorAllowWheelScrolling = YES;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(REMOTE_INSPECTOR)
+ allowsRemoteInspection = YES;
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> isStopping = NO;
</span><span class="cx"> _geolocationProvider = [WebGeolocationProviderIOS sharedGeolocationProvider];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (161935 => 161936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-01-14 02:02:34 UTC (rev 161935)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-01-14 02:10:09 UTC (rev 161936)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> - (void)_replaceCurrentHistoryItem:(WebHistoryItem *)item;
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
</del><ins>+#if !TARGET_OS_IPHONE
</ins><span class="cx"> - (NSDictionary *)quickLookContentForURL:(NSURL *)url;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>