Diff
Modified: trunk/Source/WebCore/ChangeLog (192436 => 192437)
--- 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)
@@ -1,3 +1,19 @@
+2015-11-13 Joseph Pecoraro <pecor...@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:
+
2015-11-13 Jiewen Tan <jiewen_...@apple.com>
Element::focus() should acquire the ownership of Frame.
Modified: trunk/Source/WebCore/page/Page.cpp (192436 => 192437)
--- 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)
@@ -1394,6 +1394,16 @@
m_inspectorDebuggable->setRemoteDebuggingAllowed(allowed);
}
+String Page::remoteInspectionNameOverride() const
+{
+ return m_inspectorDebuggable->nameOverride();
+}
+
+void Page::setRemoteInspectionNameOverride(const String& name)
+{
+ m_inspectorDebuggable->setNameOverride(name);
+}
+
void Page::remoteInspectorInformationDidChange() const
{
m_inspectorDebuggable->update();
Modified: trunk/Source/WebCore/page/Page.h (192436 => 192437)
--- 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)
@@ -182,6 +182,8 @@
#if ENABLE(REMOTE_INSPECTOR)
WEBCORE_EXPORT bool remoteInspectionAllowed() const;
WEBCORE_EXPORT void setRemoteInspectionAllowed(bool);
+ WEBCORE_EXPORT String remoteInspectionNameOverride() const;
+ WEBCORE_EXPORT void setRemoteInspectionNameOverride(const String&);
void remoteInspectorInformationDidChange() const;
#endif
Modified: trunk/Source/WebCore/page/PageDebuggable.cpp (192436 => 192437)
--- 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)
@@ -47,6 +47,9 @@
String PageDebuggable::name() const
{
+ if (!m_nameOverride.isNull())
+ return m_nameOverride;
+
if (!m_page.mainFrame().document())
return String();
@@ -100,6 +103,12 @@
m_page.inspectorController().setIndicating(indicating);
}
+void PageDebuggable::setNameOverride(const String& name)
+{
+ m_nameOverride = name;
+ update();
+}
+
} // namespace WebCore
#endif // ENABLE(REMOTE_INSPECTOR)
Modified: trunk/Source/WebCore/page/PageDebuggable.h (192436 => 192437)
--- 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)
@@ -53,8 +53,12 @@
virtual void dispatchMessageFromRemoteFrontend(const String& message) override;
virtual void setIndicating(bool) override;
+ String nameOverride() const { return m_nameOverride; }
+ void setNameOverride(const String&);
+
private:
Page& m_page;
+ String m_nameOverride;
bool m_forcedDeveloperExtrasEnabled;
};
Modified: trunk/Source/WebKit2/ChangeLog (192436 => 192437)
--- 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)
@@ -1,3 +1,29 @@
+2015-11-13 Joseph Pecoraro <pecor...@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:
+
2015-11-13 Tim Horton <timothy_hor...@apple.com>
Hardware keyboard spacebar scrolls too far on iOS
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (192436 => 192437)
--- 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)
@@ -72,6 +72,7 @@
#if ENABLE(REMOTE_INSPECTOR)
encoder << allowsRemoteInspection;
+ encoder << remoteInspectionNameOverride;
#endif
#if PLATFORM(MAC)
encoder << colorSpace;
@@ -163,6 +164,8 @@
#if ENABLE(REMOTE_INSPECTOR)
if (!decoder.decode(parameters.allowsRemoteInspection))
return false;
+ if (!decoder.decode(parameters.remoteInspectionNameOverride))
+ return false;
#endif
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (192436 => 192437)
--- 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)
@@ -117,6 +117,7 @@
#if ENABLE(REMOTE_INSPECTOR)
bool allowsRemoteInspection;
+ String remoteInspectionNameOverride;
#endif
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (192436 => 192437)
--- 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)
@@ -3066,6 +3066,22 @@
#endif
}
+- (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
+}
+
- (BOOL)_addsVisitedLinks
{
return _page->addsVisitedLinks();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (192436 => 192437)
--- 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)
@@ -97,6 +97,7 @@
- (WKNavigation *)_restoreSessionState:(_WKSessionState *)sessionState andNavigate:(BOOL)navigate;
@property (nonatomic, setter=_setAllowsRemoteInspection:) BOOL _allowsRemoteInspection;
+@property (nonatomic, copy, setter=_setRemoteInspectionNameOverride:) NSString *_remoteInspectionNameOverride;
@property (nonatomic, setter=_setAddsVisitedLinks:) BOOL _addsVisitedLinks;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (192436 => 192437)
--- 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)
@@ -1231,6 +1231,18 @@
if (isValid())
m_process->send(Messages::WebPage::SetAllowsRemoteInspection(allow), m_pageID);
}
+
+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);
+}
+
#endif
void WebPageProxy::setDrawsBackground(bool drawsBackground)
@@ -5116,6 +5128,7 @@
parameters.layerHostingMode = m_layerHostingMode;
#if ENABLE(REMOTE_INSPECTOR)
parameters.allowsRemoteInspection = m_allowsRemoteInspection;
+ parameters.remoteInspectionNameOverride = m_remoteInspectionNameOverride;
#endif
#if PLATFORM(MAC)
parameters.colorSpace = m_pageClient.colorSpace();
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (192436 => 192437)
--- 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)
@@ -310,6 +310,8 @@
#if ENABLE(REMOTE_INSPECTOR)
bool allowsRemoteInspection() const { return m_allowsRemoteInspection; }
void setAllowsRemoteInspection(bool);
+ String remoteInspectionNameOverride() const { return m_remoteInspectionNameOverride; }
+ void setRemoteInspectionNameOverride(const String&);
#endif
#if ENABLE(VIBRATION)
@@ -1666,6 +1668,7 @@
#if ENABLE(REMOTE_INSPECTOR)
bool m_allowsRemoteInspection;
+ String m_remoteInspectionNameOverride;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (192436 => 192437)
--- 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)
@@ -417,7 +417,8 @@
#endif
#if ENABLE(REMOTE_INSPECTOR)
- m_page->setRemoteInspectionAllowed(true);
+ m_page->setRemoteInspectionAllowed(parameters.allowsRemoteInspection);
+ m_page->setRemoteInspectionNameOverride(parameters.remoteInspectionNameOverride);
#endif
m_page->setCanStartMedia(false);
@@ -2244,6 +2245,11 @@
{
m_page->setRemoteInspectionAllowed(allow);
}
+
+void WebPage::setRemoteInspectionNameOverride(const String& name)
+{
+ m_page->setRemoteInspectionNameOverride(name);
+}
#endif
void WebPage::setDrawsBackground(bool drawsBackground)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (192436 => 192437)
--- 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)
@@ -1025,6 +1025,7 @@
#if ENABLE(REMOTE_INSPECTOR)
void setAllowsRemoteInspection(bool);
+ void setRemoteInspectionNameOverride(const String&);
#endif
void setDrawsBackground(bool);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (192436 => 192437)
--- 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)
@@ -96,6 +96,7 @@
#if ENABLE(REMOTE_INSPECTOR)
SetAllowsRemoteInspection(bool allow)
+ SetRemoteInspectionNameOverride(String name)
#endif
#if ENABLE(IOS_TOUCH_EVENTS)
