Title: [168826] branches/safari-538.34-branch/Source/WebCore
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168825 => 168826)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:34:15 UTC (rev 168825)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 09:38:17 UTC (rev 168826)
@@ -1,3 +1,22 @@
+2014-05-14 Lucas Forschler <[email protected]>
+
+ Merge r168764
+
+ 2014-05-13 Timothy Hatcher <[email protected]>
+
+ Force developerExtrasEnabled when a remote Inspector client connects.
+
+ https://bugs.webkit.org/show_bug.cgi?id=132891
+
+ Reviewed by Joseph Pecoraro.
+
+ * page/PageDebuggable.cpp:
+ (WebCore::PageDebuggable::PageDebuggable): Initialize m_forcedDeveloperExtrasEnabled to false.
+ (WebCore::PageDebuggable::connect): Set m_forcedDeveloperExtrasEnabled if the setting is changed.
+ (WebCore::PageDebuggable::disconnect): Switch developerExtrasEnabled back to false
+ if m_forcedDeveloperExtrasEnabled is true.
+ * page/PageDebuggable.h: Added m_forcedDeveloperExtrasEnabled.
+
2014-05-14 Dean Jackson <[email protected]>
Disable some features on the safari-538.34 branch.
Modified: branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp (168825 => 168826)
--- branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp 2014-05-14 09:34:15 UTC (rev 168825)
+++ branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.cpp 2014-05-14 09:38:17 UTC (rev 168826)
@@ -45,6 +45,7 @@
PageDebuggable::PageDebuggable(Page& page)
: m_page(page)
+ , m_forcedDeveloperExtrasEnabled(false)
{
}
@@ -72,11 +73,11 @@
void PageDebuggable::connect(Inspector::InspectorFrontendChannel* channel)
{
-#if PLATFORM(IOS)
- // On iOS there is no way to enable / disable developer extras.
- // So toggle it on when we have a remote inspector connection.
- m_page.settings().setDeveloperExtrasEnabled(true);
-#endif
+ if (!m_page.settings().developerExtrasEnabled()) {
+ m_forcedDeveloperExtrasEnabled = true;
+ m_page.settings().setDeveloperExtrasEnabled(true);
+ } else
+ m_forcedDeveloperExtrasEnabled = false;
InspectorController& inspectorController = m_page.inspectorController();
inspectorController.setHasRemoteFrontend(true);
@@ -89,9 +90,10 @@
inspectorController.disconnectFrontend(InspectorDisconnectReason::InspectorDestroyed);
inspectorController.setHasRemoteFrontend(false);
-#if PLATFORM(IOS)
- m_page.settings().setDeveloperExtrasEnabled(false);
-#endif
+ if (m_forcedDeveloperExtrasEnabled) {
+ m_forcedDeveloperExtrasEnabled = false;
+ m_page.settings().setDeveloperExtrasEnabled(false);
+ }
}
void PageDebuggable::dispatchMessageFromRemoteFrontend(const String& message)
Modified: branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.h (168825 => 168826)
--- branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.h 2014-05-14 09:34:15 UTC (rev 168825)
+++ branches/safari-538.34-branch/Source/WebCore/page/PageDebuggable.h 2014-05-14 09:38:17 UTC (rev 168826)
@@ -54,6 +54,7 @@
private:
Page& m_page;
+ bool m_forcedDeveloperExtrasEnabled;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
