Title: [132623] trunk/Source/WebCore
- Revision
- 132623
- Author
- [email protected]
- Date
- 2012-10-26 04:55:53 -0700 (Fri, 26 Oct 2012)
Log Message
Web Inspector: [Overrides] Do not persist the User Agent "master switch"
https://bugs.webkit.org/show_bug.cgi?id=100484
Reviewed by Yury Semikhatsky.
The User Agent override state is managed in the front-end, just like for other override-able parameters.
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::disable):
* inspector/front-end/NetworkManager.js:
(WebInspector.NetworkManager.get NetworkAgent):
(WebInspector.NetworkManager):
* inspector/front-end/SettingsScreen.js:
(WebInspector.UserAgentSettingsTab.prototype._createUserAgentSelectRowElement.set checkboxClicked):
(WebInspector.UserAgentSettingsTab.prototype._createUserAgentSelectRowElement):
* inspector/front-end/UserAgentSupport.js:
(WebInspector.UserAgentSupport):
(WebInspector.UserAgentSupport.prototype.toggleUserAgentOverride):
(WebInspector.UserAgentSupport.prototype._userAgentChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132622 => 132623)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 11:53:11 UTC (rev 132622)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 11:55:53 UTC (rev 132623)
@@ -1,3 +1,25 @@
+2012-10-26 Alexander Pavlov <[email protected]>
+
+ Web Inspector: [Overrides] Do not persist the User Agent "master switch"
+ https://bugs.webkit.org/show_bug.cgi?id=100484
+
+ Reviewed by Yury Semikhatsky.
+
+ The User Agent override state is managed in the front-end, just like for other override-able parameters.
+
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::disable):
+ * inspector/front-end/NetworkManager.js:
+ (WebInspector.NetworkManager.get NetworkAgent):
+ (WebInspector.NetworkManager):
+ * inspector/front-end/SettingsScreen.js:
+ (WebInspector.UserAgentSettingsTab.prototype._createUserAgentSelectRowElement.set checkboxClicked):
+ (WebInspector.UserAgentSettingsTab.prototype._createUserAgentSelectRowElement):
+ * inspector/front-end/UserAgentSupport.js:
+ (WebInspector.UserAgentSupport):
+ (WebInspector.UserAgentSupport.prototype.toggleUserAgentOverride):
+ (WebInspector.UserAgentSupport.prototype._userAgentChanged):
+
2012-10-26 Takashi Sakamoto <[email protected]>
[Shadow]: removing styles in shadow dom subtree causes crash.
Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (132622 => 132623)
--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-10-26 11:53:11 UTC (rev 132622)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2012-10-26 11:55:53 UTC (rev 132623)
@@ -570,6 +570,7 @@
void InspectorResourceAgent::disable(ErrorString*)
{
m_state->setBoolean(ResourceAgentState::resourceAgentEnabled, false);
+ m_state->setString(ResourceAgentState::userAgentOverride, "");
m_instrumentingAgents->setInspectorResourceAgent(0);
m_resourcesData->clear();
}
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (132622 => 132623)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2012-10-26 11:53:11 UTC (rev 132622)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2012-10-26 11:55:53 UTC (rev 132623)
@@ -42,10 +42,6 @@
NetworkAgent.enable();
WebInspector.settings.cacheDisabled.addChangeListener(this._cacheDisabledSettingChanged, this);
-
- if (WebInspector.settings.userAgent.get())
- this._userAgentSettingChanged();
- WebInspector.settings.userAgent.addChangeListener(this._userAgentSettingChanged, this);
}
WebInspector.NetworkManager.EventTypes = {
@@ -112,11 +108,6 @@
NetworkAgent.setCacheDisabled(enabled);
},
- _userAgentSettingChanged: function()
- {
- NetworkAgent.setUserAgentOverride(WebInspector.settings.userAgent.get());
- },
-
__proto__: WebInspector.Object.prototype
}
Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (132622 => 132623)
--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2012-10-26 11:53:11 UTC (rev 132622)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2012-10-26 11:55:53 UTC (rev 132623)
@@ -406,7 +406,7 @@
var labelElement = p.createChild("label");
var checkboxElement = labelElement.createChild("input");
checkboxElement.type = "checkbox";
- checkboxElement.checked = !!userAgent;
+ checkboxElement.checked = false;
labelElement.appendChild(document.createTextNode(WebInspector.UIString("User Agent")));
p.appendChild(this._createUserAgentSelectRowElement(checkboxElement));
return p;
@@ -496,8 +496,8 @@
} else {
this._selectElement.disabled = true;
this._otherUserAgentElement.disabled = true;
- WebInspector.settings.userAgent.set("");
}
+ WebInspector.userAgentSupport.toggleUserAgentOverride(checkboxElement.checked);
}
checkboxElement.addEventListener("click", checkboxClicked.bind(this), false);
Modified: trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js (132622 => 132623)
--- trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js 2012-10-26 11:53:11 UTC (rev 132622)
+++ trunk/Source/WebCore/inspector/front-end/UserAgentSupport.js 2012-10-26 11:55:53 UTC (rev 132623)
@@ -33,10 +33,12 @@
*/
WebInspector.UserAgentSupport = function()
{
+ this._userAgentOverrideEnabled = false;
this._deviceMetricsOverrideEnabled = false;
this._geolocationPositionOverrideEnabled = false;
this._deviceOrientationOverrideEnabled = false;
+ WebInspector.settings.userAgent.addChangeListener(this._userAgentChanged, this);
WebInspector.settings.deviceMetrics.addChangeListener(this._deviceMetricsChanged, this);
WebInspector.settings.deviceFitWindow.addChangeListener(this._deviceMetricsChanged, this);
WebInspector.settings.geolocationOverride.addChangeListener(this._geolocationPositionChanged, this);
@@ -307,6 +309,14 @@
}
WebInspector.UserAgentSupport.prototype = {
+ toggleUserAgentOverride: function(enabled)
+ {
+ if (enabled === this._userAgentOverrideEnabled)
+ return;
+ this._userAgentOverrideEnabled = enabled;
+ this._userAgentChanged();
+ },
+
toggleDeviceMetricsOverride: function(enabled)
{
if (enabled === this._deviceMetricsOverrideEnabled)
@@ -331,6 +341,11 @@
this._deviceOrientationChanged();
},
+ _userAgentChanged: function()
+ {
+ NetworkAgent.setUserAgentOverride(this._userAgentOverrideEnabled ? WebInspector.settings.userAgent.get() : "");
+ },
+
_deviceMetricsChanged: function()
{
var metrics = WebInspector.UserAgentSupport.DeviceMetrics.parseSetting(this._deviceMetricsOverrideEnabled ? WebInspector.settings.deviceMetrics.get() : "");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
