Changeset 99408 in webkit

Timestamp:

Nov 7, 2011, 5:22:09 AM (15 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: introduce UserAgent override setting.
​https://bugs.webkit.org/show_bug.cgi?id=71627

Patch by Pavel Feldman <​pfeldman@chromium.org> on 2011-11-07
Reviewed by Yury Semikhatsky.

• English.lproj/localizedStrings.js:
• inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::clearFrontend):
(WebCore::InspectorResourceAgent::applyUserAgentOverride):
(WebCore::InspectorResourceAgent::setUserAgentOverride):

• inspector/front-end/HelpScreen.js:

(WebInspector.HelpScreen):
(WebInspector.HelpScreen.prototype.show):
(WebInspector.HelpScreen.prototype._onBlur):

• inspector/front-end/NetworkManager.js:

(WebInspector.NetworkManager.prototype._cacheDisabledSettingChanged):
(WebInspector.NetworkManager.prototype._userAgentSettingChanged):

• inspector/front-end/Settings.js:

(WebInspector.Settings):

• inspector/front-end/SettingsScreen.js:

(WebInspector.SettingsScreen):
(WebInspector.SettingsScreen.prototype._createSelectSetting.get for):
(WebInspector.SettingsScreen.prototype._createCustomSetting):
(WebInspector.SettingsScreen.prototype._createUserActionControl.checkboxClicked):
(WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.get const):
(WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.textDoubleClicked):
(WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.textChanged):

• inspector/front-end/helpScreen.css:

(.help-table td):
(.help-content fieldset label):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) ( previous)
• inspector/InspectorResourceAgent.cpp (modified) (4 diffs)
• inspector/front-end/HelpScreen.js (modified) (4 diffs)
• inspector/front-end/NetworkManager.js (modified) (2 diffs)
• inspector/front-end/Settings.js (modified) (1 diff)
• inspector/front-end/SettingsScreen.js (modified) (4 diffs)
• inspector/front-end/helpScreen.css (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-07  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: introduce UserAgent override setting.
+        https://bugs.webkit.org/show_bug.cgi?id=71627
+
+        Reviewed by Yury Semikhatsky.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::clearFrontend):
+        (WebCore::InspectorResourceAgent::applyUserAgentOverride):
+        (WebCore::InspectorResourceAgent::setUserAgentOverride):
+        * inspector/front-end/HelpScreen.js:
+        (WebInspector.HelpScreen):
+        (WebInspector.HelpScreen.prototype.show):
+        (WebInspector.HelpScreen.prototype._onBlur):
+        * inspector/front-end/NetworkManager.js:
+        (WebInspector.NetworkManager.prototype._cacheDisabledSettingChanged):
+        (WebInspector.NetworkManager.prototype._userAgentSettingChanged):
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        * inspector/front-end/SettingsScreen.js:
+        (WebInspector.SettingsScreen):
+        (WebInspector.SettingsScreen.prototype._createSelectSetting.get for):
+        (WebInspector.SettingsScreen.prototype._createCustomSetting):
+        (WebInspector.SettingsScreen.prototype._createUserActionControl.checkboxClicked):
+        (WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.get const):
+        (WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.textDoubleClicked):
+        (WebInspector.SettingsScreen.prototype._createUserAgentSelectRowElement.textChanged):
+        * inspector/front-end/helpScreen.css:
+        (.help-table td):
+        (.help-content fieldset label):
+
 2011-11-07  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -74 +74 @@
 static const char extraRequestHeaders[] = "extraRequestHeaders";
 static const char cacheDisabled[] = "cacheDisabled";
+static const char userAgentOverride[] = "userAgentOverride";
 }
 
@@ -86 +87 @@
     ErrorString error;
     disable(&error);
-    m_userAgentOverride = "";
 }
 
@@ -349 +349 @@
 void InspectorResourceAgent::applyUserAgentOverride(String* userAgent)
 {
-    if (!m_userAgentOverride.isEmpty())
-        *userAgent = m_userAgentOverride;
+    String userAgentOverride = m_state->getString(ResourceAgentState::userAgentOverride);
+    if (!userAgentOverride.isEmpty())
+        *userAgent = userAgentOverride;
 }
 
@@ -470 +471 @@
 void InspectorResourceAgent::setUserAgentOverride(ErrorString*, const String& userAgent)
 {
-    m_userAgentOverride = userAgent;
+    m_state->setString(ResourceAgentState::userAgentOverride, userAgent);
 }
 

trunk/Source/WebCore/inspector/front-end/HelpScreen.js

@@ -37 +37 @@
     this._element.className = "help-window-outer";
     this._element.addEventListener("keydown", this._onKeyDown.bind(this), false);
+    this._element.tabIndex = 0;
+    this._element.addEventListener("focus", this._onBlur.bind(this), false);
 
     var mainWindow = this._element.createChild("div", "help-window-main");
@@ -42 +44 @@
     var closeButton = captionWindow.createChild("button", "help-close-button");
     this.contentElement = mainWindow.createChild("div", "help-content");
-    this.contentElement.tabIndex = 0;
-    this.contentElement.addEventListener("blur", this._onBlur.bind(this), false);
     captionWindow.createChild("h1", "help-window-title").textContent = title;
 
@@ -65 +65 @@
         this._onHide = onHide;
         this._previousFocusElement = WebInspector.currentFocusElement();
-        WebInspector.setCurrentFocusElement(this.contentElement);
+        WebInspector.setCurrentFocusElement(this._element);
     },
 
@@ -90 +90 @@
     },
 
-    _onBlur: function()
+    _onBlur: function(event)
     {
-         // Pretend we're modal, grab focus back if we're still shown.
-        if (this._isShown)
-            WebInspector.setCurrentFocusElement(this.contentElement);
+        // Pretend we're modal, grab focus back if we're still shown.
+        if (this._isShown && event.target !== this._element && !this._element.isAncestor(event.target))
+            WebInspector.setCurrentFocusElement(this._element);
     }
 }

trunk/Source/WebCore/inspector/front-end/NetworkManager.js

@@ -41 +41 @@
     NetworkAgent.enable();
 
-    WebInspector.settings.cacheDisabled.addChangeListener(this._cacheDisabledSettingChanged.bind(this));
+    WebInspector.settings.cacheDisabled.addChangeListener(this._cacheDisabledSettingChanged, this);
+
+    if (WebInspector.settings.userAgent.get())
+        this._userAgentSettingChanged();
+    WebInspector.settings.userAgent.addChangeListener(this._userAgentSettingChanged, this);
 }
 
@@ -76 +80 @@
     {
         NetworkAgent.setCacheDisabled(event.data);
+    },
+
+    _userAgentSettingChanged: function()
+    {
+        NetworkAgent.setUserAgentOverride(WebInspector.settings.userAgent.get());
     }
 }

trunk/Source/WebCore/inspector/front-end/Settings.js

@@ -91 +91 @@
     this.workerInspectionEnabled = this.createSetting("workerInspectionEnabled", []);
     this.cacheDisabled = this.createSetting("cacheDisabled", false);
+    this.overrideUserAgent = this.createSetting("overrideUserAgent", "");
+    this.userAgent = this.createSetting("userAgent", "");
     this.showScriptFolders = this.createSetting("showScriptFolders", true);
 

trunk/Source/WebCore/inspector/front-end/SettingsScreen.js

@@ -53 +53 @@
     p = this._appendSection(WebInspector.UIString("Text editor"));
     p.appendChild(this._createSelectSetting(WebInspector.UIString("Indent"), [
-        [ WebInspector.TextEditorModel.Indent.TwoSpaces, WebInspector.UIString("2 spaces") ],
-        [ WebInspector.TextEditorModel.Indent.FourSpaces, WebInspector.UIString("4 spaces") ],
-        [ WebInspector.TextEditorModel.Indent.EightSpaces, WebInspector.UIString("8 spaces") ],
-        [ WebInspector.TextEditorModel.Indent.TabCharacter, WebInspector.UIString("Tab character") ] ], WebInspector.settings.textEditorIndent));
-
-    if (Preferences.canDisableCache) {
-        p = this._appendSection(WebInspector.UIString("Network"), true);
+            [ WebInspector.UIString("2 spaces"), WebInspector.TextEditorModel.Indent.TwoSpaces ],
+            [ WebInspector.UIString("4 spaces"), WebInspector.TextEditorModel.Indent.FourSpaces ],
+            [ WebInspector.UIString("8 spaces"), WebInspector.TextEditorModel.Indent.EightSpaces ],
+            [ WebInspector.UIString("Tab character"), WebInspector.TextEditorModel.Indent.TabCharacter ]
+        ], WebInspector.settings.textEditorIndent));
+
+    p = this._appendSection(WebInspector.UIString("Network"), true);
+    if (Preferences.canDisableCache)
         p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Disable cache"), WebInspector.settings.cacheDisabled));
-    }
+    p.appendChild(this._createUserActionControl());
 
     p = this._appendSection(WebInspector.UIString("Scripts"), true);
@@ -130 +131 @@
     {
         var fieldsetElement = document.createElement("fieldset");
-        fieldsetElement.textContent = name;
+        fieldsetElement.createChild("label").textContent = name;
 
         var select = document.createElement("select");
@@ -137 +138 @@
         for (var i = 0; i < options.length; ++i) {
             var option = options[i];
-            select.add(new Option(option[1], option[0]));
-            if (settingValue === option[0])
+            select.add(new Option(option[0], option[1]));
+            if (settingValue === option[1])
                 select.selectedIndex = i;
-
         }
 
@@ -197 +197 @@
         var p = document.createElement("p");
         var fieldsetElement = document.createElement("fieldset");
-        fieldsetElement.textContent = name;
+        fieldsetElement.createChild("label").textContent = name;
         fieldsetElement.appendChild(element);
         p.appendChild(fieldsetElement);
         return p;
+    },
+
+    _createUserActionControl: function()
+    {
+        var userAgent = WebInspector.settings.userAgent.get();
+
+        var p = document.createElement("p");
+        var labelElement = p.createChild("label");
+        var checkboxElement = labelElement.createChild("input");
+        checkboxElement.type = "checkbox";
+        checkboxElement.checked = !!userAgent;
+        checkboxElement.addEventListener("click", checkboxClicked.bind(this), false);
+        labelElement.appendChild(document.createTextNode("Override User Agent"));
+
+        var selectSectionElement;
+        function checkboxClicked()
+        {
+            if (checkboxElement.checked) {
+                selectSectionElement = this._createUserAgentSelectRowElement();
+                p.appendChild(selectSectionElement);
+            } else {
+                if (selectSectionElement) {
+                    p.removeChild(selectSectionElement);
+                    selectSectionElement = null;
+                }
+                WebInspector.settings.userAgent.set("");
+            }
+        }
+
+        checkboxClicked.call(this);
+        return p;
+    },
+
+    _createUserAgentSelectRowElement: function()
+    {
+        var userAgent = WebInspector.settings.userAgent.get();
+        const userAgents = [
+            ["Internet Explorer 9", "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0"],
+            ["Internet Explorer 8", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0"],
+            ["Internet Explorer 7", "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0"],
+
+            ["Firefox 7 \u2014 Windows", "Mozilla/5.0 (Windows NT 6.1; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1"],
+            ["Firefox 7 \u2014 Mac", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:7.0.1) Gecko/20100101 Firefox/7.0.1"],
+            ["Firefox 4 \u2014 Windows", "Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"],
+            ["Firefox 4 \u2014 Mac", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"],
+
+            ["iPhone \u2014 iOS 5", "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"],
+            ["iPhone \u2014 iOS 4", "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5"],
+            ["iPad \u2014 iOS 5", "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"],
+            ["iPad \u2014 iOS 4", "Mozilla/5.0 (iPad; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5"],
+
+            ["Android 2.3 \u2014 Nexus S", "Mozilla/5.0 (Linux; U; Android 2.3.6; en-us; Nexus S Build/GRK39F) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"],
+            [WebInspector.UIString("Other..."), "Other"]
+        ];
+
+        var fieldsetElement = document.createElement("fieldset");
+        var selectElement = fieldsetElement.createChild("select");
+        var otherUserAgentElement = fieldsetElement.createChild("input");
+        otherUserAgentElement.value = userAgent;
+        otherUserAgentElement.title = userAgent;
+
+        var selectionRestored = false;
+        for (var i = 0; i < userAgents.length; ++i) {
+            var agent = userAgents[i];
+            selectElement.add(new Option(agent[0], agent[1]));
+            if (userAgent === agent[1]) {
+                selectElement.selectedIndex = i;
+                selectionRestored = true;
+            }
+        }
+
+        if (!selectionRestored) {
+            if (!userAgent)
+                selectElement.selectedIndex = 0;
+            else
+                selectElement.selectedIndex = userAgents.length - 1;
+        }
+
+        selectElement.addEventListener("change", selectionChanged.bind(this), false);
+
+        function selectionChanged()
+        {
+            var value = selectElement.options[selectElement.selectedIndex].value;
+            if (value !== "Other") {
+                WebInspector.settings.userAgent.set(value);
+                otherUserAgentElement.value = value;
+                otherUserAgentElement.title = value;
+                otherUserAgentElement.disabled = true;
+            } else {
+                otherUserAgentElement.disabled = false;
+                otherUserAgentElement.focus();
+            }
+        }
+
+        fieldsetElement.addEventListener("dblclick", textDoubleClicked.bind(this), false);
+        otherUserAgentElement.addEventListener("blur", textChanged.bind(this), false);
+
+        function textDoubleClicked()
+        {
+            selectElement.selectedIndex = userAgents.length - 1;
+            selectionChanged.call(this);
+        }
+
+        function textChanged()
+        {
+            WebInspector.settings.userAgent.set(otherUserAgentElement.value);
+        }
+
+        selectionChanged.call(this);
+        return fieldsetElement;
     }
-};
+}
 
 WebInspector.SettingsScreen.prototype.__proto__ = WebInspector.HelpScreen.prototype;

trunk/Source/WebCore/inspector/front-end/helpScreen.css

@@ -131 +131 @@
     white-space: nowrap;
     vertical-align: top;
+    width: 50%;
 }
 
@@ -173 +174 @@
     margin: 0 0 0 6px;
     padding-left: 3px;
+}
+
+
+.help-content fieldset label {
+    padding-right: 4px;
 }
 
@@ -191 +197 @@
 
 .help-content select {
-    margin-left: 1em;
     background-color: rgb(64, 64, 64);
     color: white;