<!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>[162112] 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/162112">162112</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2014-01-15 21:05:55 -0800 (Wed, 15 Jan 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>[iOS] Clean up REMOTE_INSPECTOR code in OpenSource after the iOS merge

https://bugs.webkit.org/show_bug.cgi?id=127069

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2014-01-15

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

* JavaScriptCore.xcodeproj/project.pbxproj:

Export XPCConnection because it is needed by RemoteInspector.h.

* inspector/remote/RemoteInspectorXPCConnection.h:

* inspector/remote/RemoteInspector.h:

* inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::startDisabled):

(Inspector::RemoteInspector::shared):

Allow RemoteInspector singleton to start disabled.

Source/WebCore:

* WebCore.exp.in:

Source/WebKit/mac:

* WebView/WebView.mm:

(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

(+[WebView _enableRemoteInspector]):

(+[WebView _disableRemoteInspector]):

(+[WebView _disableAutoStartRemoteInspector]):

(+[WebView _isRemoteInspectorEnabled]):

(+[WebView _hasRemoteInspectorSession]):

(-[WebView allowsRemoteInspection]):

Implement with RemoteInspector.h SPIs.

(-[WebView setAllowsRemoteInspection:]):

(-[WebView setHostApplicationBundleId:name:]):

Still unimplemented, update comment.

(-[WebView _didCommitLoadForFrame:]):

Remove dead path, WebCore now pushes updates on navigations.

* WebView/WebViewData.h:

* WebView/WebViewData.mm:

(-[WebViewPrivate init]):

Remove now unused ivar.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>

<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -1,3 +1,20 @@

</span><ins>+2014-01-15  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        [iOS] Clean up REMOTE_INSPECTOR code in OpenSource after the iOS merge

+        https://bugs.webkit.org/show_bug.cgi?id=127069

+

+        Reviewed by Timothy Hatcher.

+

+        * JavaScriptCore.xcodeproj/project.pbxproj:

+        Export XPCConnection because it is needed by RemoteInspector.h.

+

+        * inspector/remote/RemoteInspectorXPCConnection.h:

+        * inspector/remote/RemoteInspector.h:

+        * inspector/remote/RemoteInspector.mm:

+        (Inspector::RemoteInspector::startDisabled):

+        (Inspector::RemoteInspector::shared):

+        Allow RemoteInspector singleton to start disabled.

+

</ins><span class="cx"> 2014-01-15  Brian Burg  &lt;bburg@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Web Inspector: capture probe samples on the backend

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -954,7 +954,7 @@

</span><span class="cx">                 A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5BA15EB182340B400A82E69 /* RemoteInspectorDebuggableConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E4182340B300A82E69 /* RemoteInspectorDebuggableConnection.h */; };

</span><span class="cx">                 A5BA15EC182340B400A82E69 /* RemoteInspectorDebuggableConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15E5182340B300A82E69 /* RemoteInspectorDebuggableConnection.mm */; };

</span><del>-                A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */; };

</del><ins>+                A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */; settings = {ATTRIBUTES = (Private, ); }; };

</ins><span class="cx">                 A5BA15EE182340B400A82E69 /* RemoteInspectorXPCConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */; };

</span><span class="cx">                 A5BA15F0182345AF00A82E69 /* RemoteInspectorDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15EF182345AF00A82E69 /* RemoteInspectorDebuggable.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 A5CEEE14187F3BAD00E55C99 /* InspectorAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5CEEE12187F3BAD00E55C99 /* InspectorAgent.cpp */; };

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -28,23 +28,24 @@

</span><span class="cx"> #ifndef RemoteInspector_h

</span><span class="cx"> #define RemoteInspector_h

</span><span class="cx"> 

</span><del>-#import &quot;RemoteInspectorDebuggableConnection.h&quot;

</del><span class="cx"> #import &quot;RemoteInspectorXPCConnection.h&quot;

</span><span class="cx"> #import &lt;wtf/Forward.h&gt;

</span><span class="cx"> #import &lt;wtf/HashMap.h&gt;

</span><span class="cx"> #import &lt;wtf/NeverDestroyed.h&gt;

</span><span class="cx"> #import &lt;wtf/Threading.h&gt;

</span><span class="cx"> 

</span><ins>+OBJC_CLASS NSDictionary;

</ins><span class="cx"> OBJC_CLASS NSString;

</span><del>-OBJC_CLASS NSDictionary;

</del><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><span class="cx"> class RemoteInspectorDebuggable;

</span><ins>+class RemoteInspectorDebuggableConnection;

</ins><span class="cx"> struct RemoteInspectorDebuggableInfo;

</span><span class="cx"> 

</span><span class="cx"> class JS_EXPORT_PRIVATE RemoteInspector FINAL : public RemoteInspectorXPCConnection::Client {

</span><span class="cx"> public:

</span><ins>+    static void startDisabled();

</ins><span class="cx">     static RemoteInspector&amp; shared();

</span><span class="cx">     friend class NeverDestroyed&lt;RemoteInspector&gt;;

</span><span class="cx"> 

</span><span class="lines">@@ -83,6 +84,8 @@

</span><span class="cx">     void receivedIndicateMessage(NSDictionary *userInfo);

</span><span class="cx">     void receivedConnectionDiedMessage(NSDictionary *userInfo);

</span><span class="cx"> 

</span><ins>+    static bool startEnabled;

+

</ins><span class="cx">     // Debuggables can be registered from any thread at any time.

<span class="cx">     // Any debuggable can send messages over the XPC connection.

</span><span class="cx">     // So lock access to all maps and state as they can change

</span><span class="lines">@@ -101,6 +104,6 @@

</span><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span><span class="cx"> 

</span><ins>+#endif // RemoteInspector_h

+

</ins><span class="cx"> #endif // ENABLE(REMOTE_INSPECTOR)

</span><del>-

-#endif // WebInspectorServer_h

</del></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -31,12 +31,13 @@

</span><span class="cx"> #import &quot;InitializeThreading.h&quot;

</span><span class="cx"> #import &quot;RemoteInspectorConstants.h&quot;

</span><span class="cx"> #import &quot;RemoteInspectorDebuggable.h&quot;

</span><ins>+#import &quot;RemoteInspectorDebuggableConnection.h&quot;

+#import &lt;Foundation/Foundation.h&gt;

</ins><span class="cx"> #import &lt;notify.h&gt;

</span><del>-#import &lt;xpc/xpc.h&gt;

-#import &lt;Foundation/Foundation.h&gt;

</del><span class="cx"> #import &lt;wtf/Assertions.h&gt;

</span><span class="cx"> #import &lt;wtf/MainThread.h&gt;

</span><span class="cx"> #import &lt;wtf/text/WTFString.h&gt;

</span><ins>+#import &lt;xpc/xpc.h&gt;

</ins><span class="cx"> 

</span><span class="cx"> #if PLATFORM(IOS)

</span><span class="cx"> #import &lt;wtf/ios/WebCoreThread.h&gt;

</span><span class="lines">@@ -56,6 +57,13 @@

</span><span class="cx">     dispatch_async(dispatch_get_main_queue(), block);

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+bool RemoteInspector::startEnabled = true;

+

+void RemoteInspector::startDisabled()

+{

+    RemoteInspector::startEnabled = false;

+}

+

</ins><span class="cx"> RemoteInspector&amp; RemoteInspector::shared()

</span><span class="cx"> {

</span><span class="cx">     static NeverDestroyed&lt;RemoteInspector&gt; shared;

</span><span class="lines">@@ -64,7 +72,8 @@

</span><span class="cx">     dispatch_once(&amp;once, ^{

</span><span class="cx">         JSC::initializeThreading();

</span><span class="cx">         WTF::initializeMainThread();

</span><del>-        shared.get().start();

</del><ins>+        if (RemoteInspector::startEnabled)

+            shared.get().start();

</ins><span class="cx">     });

</span><span class="cx"> 

</span><span class="cx">     return shared;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -32,8 +32,8 @@

</span><span class="cx"> #import &lt;wtf/Noncopyable.h&gt;

</span><span class="cx"> #import &lt;xpc/xpc.h&gt;

</span><span class="cx"> 

</span><ins>+OBJC_CLASS NSDictionary;

</ins><span class="cx"> OBJC_CLASS NSString;

</span><del>-OBJC_CLASS NSDictionary;

</del><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/WebCore/ChangeLog        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -1,3 +1,12 @@

</span><ins>+2014-01-15  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        [iOS] Clean up REMOTE_INSPECTOR code in OpenSource after the iOS merge

+        https://bugs.webkit.org/show_bug.cgi?id=127069

+

+        Reviewed by Timothy Hatcher.

+

+        * WebCore.exp.in:

+

</ins><span class="cx"> 2014-01-15  Sam Weinig  &lt;sam@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         TextBreakIterator's should support Latin-1 for all iterator types (Part 2)

</span></span></pre></div>

<a id="trunkSourceWebCoreWebCoreexpin"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/WebCore/WebCore.exp.in        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -2932,8 +2932,9 @@

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)

</span><ins>+__ZN7WebCore19InspectorController27dispatchMessageFromFrontendERKN3WTF6StringE

</ins><span class="cx"> __ZN7WebCore4Page26setRemoteInspectionAllowedEb

</span><del>-__ZN7WebCore19InspectorController27dispatchMessageFromFrontendERKN3WTF6StringE

</del><ins>+__ZNK7WebCore4Page23remoteInspectionAllowedEv

</ins><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)

</span></span></pre></div>

<a id="trunkSourceWebKitmacChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/WebKit/mac/ChangeLog        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -1,3 +1,32 @@

</span><ins>+2014-01-15  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        [iOS] Clean up REMOTE_INSPECTOR code in OpenSource after the iOS merge

+        https://bugs.webkit.org/show_bug.cgi?id=127069

+

+        Reviewed by Timothy Hatcher.

+

+        * WebView/WebView.mm:

+        (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

+        (+[WebView _enableRemoteInspector]):

+        (+[WebView _disableRemoteInspector]):

+        (+[WebView _disableAutoStartRemoteInspector]):

+        (+[WebView _isRemoteInspectorEnabled]):

+        (+[WebView _hasRemoteInspectorSession]):

+        (-[WebView allowsRemoteInspection]):

+        Implement with RemoteInspector.h SPIs.

+

+        (-[WebView setAllowsRemoteInspection:]):

+        (-[WebView setHostApplicationBundleId:name:]):

+        Still unimplemented, update comment.

+

+        (-[WebView _didCommitLoadForFrame:]):

+        Remove dead path, WebCore now pushes updates on navigations.

+

+        * WebView/WebViewData.h:

+        * WebView/WebViewData.mm:

+        (-[WebViewPrivate init]):

+        Remove now unused ivar.

+

</ins><span class="cx"> 2014-01-15  Alexey Proskuryakov  &lt;ap@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         More iOS build fixing.

</span></span></pre></div>

<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (162111 => 162112)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2014-01-16 04:29:04 UTC (rev 162111)

+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2014-01-16 05:05:55 UTC (rev 162112)

</span><span class="lines">@@ -259,6 +259,7 @@

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)

</span><ins>+#import &lt;JavaScriptCore/RemoteInspector.h&gt;

</ins><span class="cx"> #if PLATFORM(IOS)

</span><span class="cx"> #import &quot;WebIndicateLayer.h&quot;

</span><span class="cx"> #endif

</span><span class="lines">@@ -300,8 +301,9 @@

</span><span class="cx"> @end

</span><span class="cx"> #endif

</span><span class="cx"> 

</span><del>-using namespace WebCore;

</del><span class="cx"> using namespace JSC;

</span><ins>+using namespace Inspector;

+using namespace WebCore;

</ins><span class="cx"> 

</span><span class="cx"> #if defined(__ppc__) || defined(__ppc64__)

</span><span class="cx"> #define PROCESSOR &quot;PPC&quot;

</span><span class="lines">@@ -1183,7 +1185,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> - (id)initSimpleHTMLDocumentWithStyle:(NSString *)style frame:(CGRect)frame preferences:(WebPreferences *)preferences groupName:(NSString *)groupName

</span><del>-{    

</del><ins>+{

</ins><span class="cx">     self = [super initWithFrame:frame];

</span><span class="cx">     if (!self)

</span><span class="cx">         return nil;

</span><span class="lines">@@ -1207,13 +1209,10 @@

<span class="cx">     // Production installs always disallow debugging simple HTML documents.

<span class="cx">     // Internal installs allow debugging simple HTML documents (TextFields) if the Internal Setting is enabled.

</span><span class="cx">     if (!isInternalInstall())

</span><del>-        _private-&gt;allowsRemoteInspection = NO;

</del><ins>+        _private-&gt;page-&gt;setRemoteInspectionAllowed(false);

</ins><span class="cx">     else {

</span><span class="cx">         static BOOL textFieldInspectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTextFieldRemoteInspectionEnabledPreferenceKey];

</span><del>-        _private-&gt;allowsRemoteInspection = textFieldInspectionEnabled;

-        BOOL autoStartRemoteInspector = YES; // FIXME: &lt;rdar://problem/15810991&gt;

-        if (_private-&gt;allowsRemoteInspection &amp;&amp; autoStartRemoteInspector)

-            [WebView _enableRemoteInspector];

</del><ins>+        _private-&gt;page-&gt;setRemoteInspectionAllowed(textFieldInspectionEnabled);

</ins><span class="cx">     }

</span><span class="cx"> #endif

</span><span class="cx">     

</span><span class="lines">@@ -1923,40 +1922,37 @@

</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)

</span><span class="cx"> + (void)_enableRemoteInspector

</span><span class="cx"> {