<!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>[192437] 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/192437">192437</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-13 11:46:28 -0800 (Fri, 13 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Provide a way to override the WKWebView remote inspector name
https://bugs.webkit.org/show_bug.cgi?id=151075
Reviewed by Tim Horton.
Source/WebCore:
* page/Page.cpp:
(WebCore::Page::remoteInspectionNameOverride):
(WebCore::Page::setRemoteInspectionNameOverride):
* page/Page.h:
* page/PageDebuggable.cpp:
(WebCore::PageDebuggable::name):
(WebCore::PageDebuggable::setNameOverride):
* page/PageDebuggable.h:
Source/WebKit2:
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _remoteInspectionNameOverride]):
(-[WKWebView _setRemoteInspectionNameOverride:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setRemoteInspectionNameOverride):
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::remoteInspectionNameOverride):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_shouldDispatchFakeMouseMoveEvents):
(WebKit::WebPage::setRemoteInspectionNameOverride):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagePageDebuggablecpp">trunk/Source/WebCore/page/PageDebuggable.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageDebuggableh">trunk/Source/WebCore/page/PageDebuggable.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebCore/ChangeLog 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Provide a way to override the WKWebView remote inspector name
+ https://bugs.webkit.org/show_bug.cgi?id=151075
+
+ Reviewed by Tim Horton.
+
+ * page/Page.cpp:
+ (WebCore::Page::remoteInspectionNameOverride):
+ (WebCore::Page::setRemoteInspectionNameOverride):
+ * page/Page.h:
+ * page/PageDebuggable.cpp:
+ (WebCore::PageDebuggable::name):
+ (WebCore::PageDebuggable::setNameOverride):
+ * page/PageDebuggable.h:
+
</ins><span class="cx"> 2015-11-13 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Element::focus() should acquire the ownership of Frame.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebCore/page/Page.cpp 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -1394,6 +1394,16 @@
</span><span class="cx"> m_inspectorDebuggable->setRemoteDebuggingAllowed(allowed);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String Page::remoteInspectionNameOverride() const
+{
+ return m_inspectorDebuggable->nameOverride();
+}
+
+void Page::setRemoteInspectionNameOverride(const String& name)
+{
+ m_inspectorDebuggable->setNameOverride(name);
+}
+
</ins><span class="cx"> void Page::remoteInspectorInformationDidChange() const
</span><span class="cx"> {
</span><span class="cx"> m_inspectorDebuggable->update();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebCore/page/Page.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -182,6 +182,8 @@
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> WEBCORE_EXPORT bool remoteInspectionAllowed() const;
</span><span class="cx"> WEBCORE_EXPORT void setRemoteInspectionAllowed(bool);
</span><ins>+ WEBCORE_EXPORT String remoteInspectionNameOverride() const;
+ WEBCORE_EXPORT void setRemoteInspectionNameOverride(const String&);
</ins><span class="cx"> void remoteInspectorInformationDidChange() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageDebuggable.cpp (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageDebuggable.cpp 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebCore/page/PageDebuggable.cpp 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx">
</span><span class="cx"> String PageDebuggable::name() const
</span><span class="cx"> {
</span><ins>+ if (!m_nameOverride.isNull())
+ return m_nameOverride;
+
</ins><span class="cx"> if (!m_page.mainFrame().document())
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="lines">@@ -100,6 +103,12 @@
</span><span class="cx"> m_page.inspectorController().setIndicating(indicating);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageDebuggable::setNameOverride(const String& name)
+{
+ m_nameOverride = name;
+ update();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageDebuggableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageDebuggable.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageDebuggable.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebCore/page/PageDebuggable.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -53,8 +53,12 @@
</span><span class="cx"> virtual void dispatchMessageFromRemoteFrontend(const String& message) override;
</span><span class="cx"> virtual void setIndicating(bool) override;
</span><span class="cx">
</span><ins>+ String nameOverride() const { return m_nameOverride; }
+ void setNameOverride(const String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> Page& m_page;
</span><ins>+ String m_nameOverride;
</ins><span class="cx"> bool m_forcedDeveloperExtrasEnabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-11-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Provide a way to override the WKWebView remote inspector name
+ https://bugs.webkit.org/show_bug.cgi?id=151075
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _remoteInspectionNameOverride]):
+ (-[WKWebView _setRemoteInspectionNameOverride:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setRemoteInspectionNameOverride):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::remoteInspectionNameOverride):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+ (WebKit::WebPage::setRemoteInspectionNameOverride):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-11-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Hardware keyboard spacebar scrolls too far on iOS
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> encoder << allowsRemoteInspection;
</span><ins>+ encoder << remoteInspectionNameOverride;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> encoder << colorSpace;
</span><span class="lines">@@ -163,6 +164,8 @@
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> if (!decoder.decode(parameters.allowsRemoteInspection))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.remoteInspectionNameOverride))
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> bool allowsRemoteInspection;
</span><ins>+ String remoteInspectionNameOverride;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -3066,6 +3066,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)_remoteInspectionNameOverride
+{
+#if ENABLE(REMOTE_INSPECTOR)
+ return _page->remoteInspectionNameOverride();
+#else
+ return nil;
+#endif
+}
+
+- (void)_setRemoteInspectionNameOverride:(NSString *)name
+{
+#if ENABLE(REMOTE_INSPECTOR)
+ _page->setRemoteInspectionNameOverride(name);
+#endif
+}
+
</ins><span class="cx"> - (BOOL)_addsVisitedLinks
</span><span class="cx"> {
</span><span class="cx"> return _page->addsVisitedLinks();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> - (WKNavigation *)_restoreSessionState:(_WKSessionState *)sessionState andNavigate:(BOOL)navigate;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setAllowsRemoteInspection:) BOOL _allowsRemoteInspection;
</span><ins>+@property (nonatomic, copy, setter=_setRemoteInspectionNameOverride:) NSString *_remoteInspectionNameOverride;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setAddsVisitedLinks:) BOOL _addsVisitedLinks;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -1231,6 +1231,18 @@
</span><span class="cx"> if (isValid())
</span><span class="cx"> m_process->send(Messages::WebPage::SetAllowsRemoteInspection(allow), m_pageID);
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::setRemoteInspectionNameOverride(const String& name)
+{
+ if (m_remoteInspectionNameOverride == name)
+ return;
+
+ m_remoteInspectionNameOverride = name;
+
+ if (isValid())
+ m_process->send(Messages::WebPage::SetRemoteInspectionNameOverride(m_remoteInspectionNameOverride), m_pageID);
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setDrawsBackground(bool drawsBackground)
</span><span class="lines">@@ -5116,6 +5128,7 @@
</span><span class="cx"> parameters.layerHostingMode = m_layerHostingMode;
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> parameters.allowsRemoteInspection = m_allowsRemoteInspection;
</span><ins>+ parameters.remoteInspectionNameOverride = m_remoteInspectionNameOverride;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> parameters.colorSpace = m_pageClient.colorSpace();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -310,6 +310,8 @@
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> bool allowsRemoteInspection() const { return m_allowsRemoteInspection; }
</span><span class="cx"> void setAllowsRemoteInspection(bool);
</span><ins>+ String remoteInspectionNameOverride() const { return m_remoteInspectionNameOverride; }
+ void setRemoteInspectionNameOverride(const String&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="lines">@@ -1666,6 +1668,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> bool m_allowsRemoteInspection;
</span><ins>+ String m_remoteInspectionNameOverride;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -417,7 +417,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><del>- m_page->setRemoteInspectionAllowed(true);
</del><ins>+ m_page->setRemoteInspectionAllowed(parameters.allowsRemoteInspection);
+ m_page->setRemoteInspectionNameOverride(parameters.remoteInspectionNameOverride);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_page->setCanStartMedia(false);
</span><span class="lines">@@ -2244,6 +2245,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->setRemoteInspectionAllowed(allow);
</span><span class="cx"> }
</span><ins>+
+void WebPage::setRemoteInspectionNameOverride(const String& name)
+{
+ m_page->setRemoteInspectionNameOverride(name);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPage::setDrawsBackground(bool drawsBackground)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -1025,6 +1025,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> void setAllowsRemoteInspection(bool);
</span><ins>+ void setRemoteInspectionNameOverride(const String&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setDrawsBackground(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (192436 => 192437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-11-13 19:13:39 UTC (rev 192436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-11-13 19:46:28 UTC (rev 192437)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> SetAllowsRemoteInspection(bool allow)
</span><ins>+ SetRemoteInspectionNameOverride(String name)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span></span></pre>
</div>
</div>
</body>
</html>