Changeset 55347 in webkit

Timestamp:

Feb 26, 2010 11:01:02 PM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-02-26 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: reload inspected page on Cmd+R / Ctrl+R / F5 key event in inspector.
Drive-by fix for couple of minor front-end problems.

​https://bugs.webkit.org/show_bug.cgi?id=35434

• inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::reloadPage):
• inspector/InspectorBackend.h:
• inspector/InspectorBackend.idl:
• inspector/InspectorController.cpp: (WebCore::InspectorController::didFinishLoading): (WebCore::InspectorController::didFailLoading):
• inspector/front-end/InspectorBackendStub.js: (.WebInspector.InspectorBackendStub.prototype.reloadPage):
• inspector/front-end/InspectorFrontendHostStub.js: (.WebInspector.InspectorFrontendHostStub.prototype.copyText): (.WebInspector.InspectorFrontendHostStub.prototype.canAttachWindow):
• inspector/front-end/TextViewer.js: (WebInspector.TextViewer.prototype._paintLine):
• inspector/front-end/inspector.js: (WebInspector.documentKeyDown): (WebInspector.toggleAttach):

WebKit/chromium

• src/WebDevToolsFrontendImpl.cpp: (WebKit::WebDevToolsFrontendImpl::WebDevToolsFrontendImpl): (WebKit::WebDevToolsFrontendImpl::jsCanAttachWindow):
• src/WebDevToolsFrontendImpl.h:
• src/js/InspectorControllerImpl.js: (devtools.InspectorBackendImpl): (devtools.InspectorBackendImpl.prototype.toggleNodeSearch):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorBackend.cpp (modified) (2 diffs)
• WebCore/inspector/InspectorBackend.h (modified) (1 diff)
• WebCore/inspector/InspectorBackend.idl (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (2 diffs)
• WebCore/inspector/front-end/InspectorBackendStub.js (modified) (1 diff)
• WebCore/inspector/front-end/InspectorFrontendHostStub.js (modified) (1 diff)
• WebCore/inspector/front-end/TextViewer.js (modified) (1 diff)
• WebCore/inspector/front-end/inspector.js (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebDevToolsFrontendImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebDevToolsFrontendImpl.h (modified) (1 diff)
• WebKit/chromium/src/js/InspectorControllerImpl.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-26  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: reload inspected page on Cmd+R / Ctrl+R / F5 key event in inspector.
+        Drive-by fix for couple of minor front-end problems.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35434
+
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::reloadPage):
+        * inspector/InspectorBackend.h:
+        * inspector/InspectorBackend.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::didFinishLoading):
+        (WebCore::InspectorController::didFailLoading):
+        * inspector/front-end/InspectorBackendStub.js:
+        (.WebInspector.InspectorBackendStub.prototype.reloadPage):
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.copyText):
+        (.WebInspector.InspectorFrontendHostStub.prototype.canAttachWindow):
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextViewer.prototype._paintLine):
+        * inspector/front-end/inspector.js:
+        (WebInspector.documentKeyDown):
+        (WebInspector.toggleAttach):
+
 2010-02-26  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebCore/inspector/InspectorBackend.cpp

@@ -48 +48 @@
 #include "InspectorFrontend.h"
 #include "InspectorResource.h"
+#include "Page.h"
 #include "Pasteboard.h"
 #include "ScriptArray.h"
@@ -134 +135 @@
     else
         frontend->didGetResourceContent(callId, "");
+}
+
+void InspectorBackend::reloadPage()
+{
+    if (m_inspectorController)
+        m_inspectorController->m_inspectedPage->mainFrame()->loader()->reload();
 }
 

trunk/WebCore/inspector/InspectorBackend.h

@@ -69 +69 @@
     bool resourceTrackingEnabled() const;
     void getResourceContent(long callId, unsigned long identifier);
+    void reloadPage();
 
     void startTimelineProfiler();

trunk/WebCore/inspector/InspectorBackend.idl

@@ -44 +44 @@
         void disableResourceTracking(in boolean always);
         void getResourceContent(in long callId, in unsigned long identifier);
+        void reloadPage();
 
         void startTimelineProfiler();

trunk/WebCore/inspector/InspectorController.cpp

@@ -1026 +1026 @@
     resource->endTiming();
 
-    if (resource != m_mainResource && windowVisible())
+    // No need to mute this event for main resource since it happens after did commit load.
+    if (windowVisible())
         resource->updateScriptObject(m_frontend.get());
 }
@@ -1042 +1043 @@
     resource->endTiming();
 
-    if (resource != m_mainResource && windowVisible())
+    // No need to mute this event for main resource since it happens after did commit load.
+    if (windowVisible())
         resource->updateScriptObject(m_frontend.get());
 }

trunk/WebCore/inspector/front-end/InspectorBackendStub.js

@@ -149 +149 @@
     },
 
+    reloadPage: function()
+    {
+    },
+
     enableDebugger: function()
     {

trunk/WebCore/inspector/front-end/InspectorFrontendHostStub.js

@@ -94 +94 @@
     copyText: function()
     {
+    },
+
+    canAttachWindow: function()
+    {
+        return false;
     }
 }

trunk/WebCore/inspector/front-end/TextViewer.js

@@ -378 +378 @@
             if (j > 1000) {
                 // This line is too long - do not waste cycles on minified js highlighting.
-                plainTextStart = j;
+                if (plainTextStart === -1)
+                    plainTextStart = j;
                 break;
             }

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

@@ -690 +690 @@
                 event.preventDefault();
             }
-
+            break;
+
+        case "F3":
+            if (!isMac) {
+                WebInspector.focusSearchField();
+                event.preventDefault();
+            }
             break;
 
@@ -759 +765 @@
             }
 
+            break;
+        case "U+0052": // R key
+            if ((event.metaKey && isMac) || (event.ctrlKey && !isMac))
+                InspectorBackend.reloadPage();
+            break;
+        case "F5":
+            if (!isMac)
+                InspectorBackend.reloadPage();
             break;
     }
@@ -886 +900 @@
 WebInspector.toggleAttach = function()
 {
-    if (!this.attached && InspectorFrontendHost.canAttachWindow && !InspectorFrontendHost.canAttachWindow())
-            return;
+    if (!this.attached && !InspectorFrontendHost.canAttachWindow())
+        return;
 
     this.attached = !this.attached;

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-26  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: reload inspected page on Cmd+R / Ctrl+R / F5 key event in inspector.
+
+        * src/WebDevToolsFrontendImpl.cpp:
+        (WebKit::WebDevToolsFrontendImpl::WebDevToolsFrontendImpl):
+        (WebKit::WebDevToolsFrontendImpl::jsCanAttachWindow):
+        * src/WebDevToolsFrontendImpl.h:
+        * src/js/InspectorControllerImpl.js:
+        (devtools.InspectorBackendImpl):
+        (devtools.InspectorBackendImpl.prototype.toggleNodeSearch):
+
 2010-02-26  James Hawkins  <jhawkins@chromium.org>
 

trunk/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp

@@ -162 +162 @@
         "showContextMenu",
         WebDevToolsFrontendImpl::jsShowContextMenu);
+    devToolsHost.addProtoFunction(
+        "canAttachWindow",
+        WebDevToolsFrontendImpl::jsCanAttachWindow);
     devToolsHost.build();
 }
@@ -393 +396 @@
 }
 
+v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsCanAttachWindow(const v8::Arguments& args)
+{
+    return v8Boolean(true);
+}
+
 } // namespace WebKit

trunk/WebKit/chromium/src/WebDevToolsFrontendImpl.h

@@ -145 +145 @@
     static v8::Handle<v8::Value> jsWindowUnloading(const v8::Arguments& args);
     static v8::Handle<v8::Value> jsShowContextMenu(const v8::Arguments& args);
+    static v8::Handle<v8::Value> jsCanAttachWindow(const v8::Arguments& args);
 
     WebKit::WebViewImpl* m_webViewImpl;

trunk/WebKit/chromium/src/js/InspectorControllerImpl.js

@@ -56 +56 @@
     this.installInspectorControllerDelegate_("hideDOMNodeHighlight");
     this.installInspectorControllerDelegate_("releaseWrapperObjectGroup");
+    this.installInspectorControllerDelegate_("reloadPage");
     this.installInspectorControllerDelegate_("removeAttribute");
     this.installInspectorControllerDelegate_("removeDOMStorageItem");
@@ -80 +81 @@
     if (!this.searchingForNode()) {
         // This is called from ElementsPanel treeOutline's focusNodeChanged().
-        DevToolsHost.activateWindow();
+        InspectorFrontendHost.activateWindow();
     }
 };