[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
pfeldman at chromium.org
pfeldman at chromium.org
Thu Apr 8 02:03:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ed6a5a8b3ea7a1c00227962e9d6e361504e92b7c
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Feb 27 07:01:02 2010 +0000
2010-02-26 Pavel Feldman <pfeldman at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55347 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index afc1ff0..0b4114d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-02-26 Pavel Feldman <pfeldman at 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 at profusion.mobi>
Reviewed by NOBODY.
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 7e86443..9ed9741 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -47,6 +47,7 @@
#include "InspectorDOMAgent.h"
#include "InspectorFrontend.h"
#include "InspectorResource.h"
+#include "Page.h"
#include "Pasteboard.h"
#include "ScriptArray.h"
#include "ScriptBreakpoint.h"
@@ -135,6 +136,12 @@ void InspectorBackend::getResourceContent(long callId, unsigned long identifier)
frontend->didGetResourceContent(callId, "");
}
+void InspectorBackend::reloadPage()
+{
+ if (m_inspectorController)
+ m_inspectorController->m_inspectedPage->mainFrame()->loader()->reload();
+}
+
void InspectorBackend::startTimelineProfiler()
{
if (m_inspectorController)
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index a9fd8ca..2f0be74 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -68,6 +68,7 @@ public:
void disableResourceTracking(bool always);
bool resourceTrackingEnabled() const;
void getResourceContent(long callId, unsigned long identifier);
+ void reloadPage();
void startTimelineProfiler();
void stopTimelineProfiler();
diff --git a/WebCore/inspector/InspectorBackend.idl b/WebCore/inspector/InspectorBackend.idl
index 753fd86..240ff7f 100644
--- a/WebCore/inspector/InspectorBackend.idl
+++ b/WebCore/inspector/InspectorBackend.idl
@@ -43,6 +43,7 @@ module core {
void enableResourceTracking(in boolean always);
void disableResourceTracking(in boolean always);
void getResourceContent(in long callId, in unsigned long identifier);
+ void reloadPage();
void startTimelineProfiler();
void stopTimelineProfiler();
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index ea163da..440176e 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1025,7 +1025,8 @@ void InspectorController::didFinishLoading(unsigned long identifier)
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());
}
@@ -1041,7 +1042,8 @@ void InspectorController::didFailLoading(unsigned long identifier, const Resourc
resource->markFailed();
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());
}
diff --git a/WebCore/inspector/front-end/InspectorBackendStub.js b/WebCore/inspector/front-end/InspectorBackendStub.js
index 59e984b..d420cea 100644
--- a/WebCore/inspector/front-end/InspectorBackendStub.js
+++ b/WebCore/inspector/front-end/InspectorBackendStub.js
@@ -148,6 +148,10 @@ WebInspector.InspectorBackendStub.prototype = {
return this._resourceTrackingEnabled;
},
+ reloadPage: function()
+ {
+ },
+
enableDebugger: function()
{
this._debuggerEnabled = true;
diff --git a/WebCore/inspector/front-end/InspectorFrontendHostStub.js b/WebCore/inspector/front-end/InspectorFrontendHostStub.js
index f1decb6..eff2518 100644
--- a/WebCore/inspector/front-end/InspectorFrontendHostStub.js
+++ b/WebCore/inspector/front-end/InspectorFrontendHostStub.js
@@ -93,6 +93,11 @@ WebInspector.InspectorFrontendHostStub.prototype = {
copyText: function()
{
+ },
+
+ canAttachWindow: function()
+ {
+ return false;
}
}
diff --git a/WebCore/inspector/front-end/TextViewer.js b/WebCore/inspector/front-end/TextViewer.js
index 4c1558f..b5b9a34 100644
--- a/WebCore/inspector/front-end/TextViewer.js
+++ b/WebCore/inspector/front-end/TextViewer.js
@@ -377,7 +377,8 @@ WebInspector.TextViewer.prototype = {
for (var j = 0; j < line.length;) {
if (j > 1000) {
// This line is too long - do not waste cycles on minified js highlighting.
- plainTextStart = j;
+ if (plainTextStart === -1)
+ plainTextStart = j;
break;
}
var attribute = highlight[j];
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 6c903e8..fd6d270 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -689,7 +689,13 @@ WebInspector.documentKeyDown = function(event)
WebInspector.focusSearchField();
event.preventDefault();
}
+ break;
+ case "F3":
+ if (!isMac) {
+ WebInspector.focusSearchField();
+ event.preventDefault();
+ }
break;
case "U+0047": // G key
@@ -759,6 +765,14 @@ WebInspector.documentKeyDown = function(event)
}
break;
+ case "U+0052": // R key
+ if ((event.metaKey && isMac) || (event.ctrlKey && !isMac))
+ InspectorBackend.reloadPage();
+ break;
+ case "F5":
+ if (!isMac)
+ InspectorBackend.reloadPage();
+ break;
}
}
@@ -885,8 +899,8 @@ WebInspector.focusSearchField = function()
WebInspector.toggleAttach = function()
{
- if (!this.attached && InspectorFrontendHost.canAttachWindow && !InspectorFrontendHost.canAttachWindow())
- return;
+ if (!this.attached && !InspectorFrontendHost.canAttachWindow())
+ return;
this.attached = !this.attached;
this.drawer.resize();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index baaed29..b70a32a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-26 Pavel Feldman <pfeldman at 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 at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
index 89fa6e7..65667f4 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
@@ -161,6 +161,9 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl(
devToolsHost.addProtoFunction(
"showContextMenu",
WebDevToolsFrontendImpl::jsShowContextMenu);
+ devToolsHost.addProtoFunction(
+ "canAttachWindow",
+ WebDevToolsFrontendImpl::jsCanAttachWindow);
devToolsHost.build();
}
@@ -392,4 +395,9 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsShowContextMenu(const v8::Argum
return v8::Undefined();
}
+v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsCanAttachWindow(const v8::Arguments& args)
+{
+ return v8Boolean(true);
+}
+
} // namespace WebKit
diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.h b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
index 62b34da..ba0013b 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.h
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
@@ -144,6 +144,7 @@ private:
static v8::Handle<v8::Value> jsDebuggerPauseScript(const v8::Arguments& args);
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;
WebKit::WebDevToolsFrontendClient* m_client;
diff --git a/WebKit/chromium/src/js/InspectorControllerImpl.js b/WebKit/chromium/src/js/InspectorControllerImpl.js
index e91beac..7fbfb64 100644
--- a/WebKit/chromium/src/js/InspectorControllerImpl.js
+++ b/WebKit/chromium/src/js/InspectorControllerImpl.js
@@ -55,6 +55,7 @@ devtools.InspectorBackendImpl = function()
this.installInspectorControllerDelegate_("highlightDOMNode");
this.installInspectorControllerDelegate_("hideDOMNodeHighlight");
this.installInspectorControllerDelegate_("releaseWrapperObjectGroup");
+ this.installInspectorControllerDelegate_("reloadPage");
this.installInspectorControllerDelegate_("removeAttribute");
this.installInspectorControllerDelegate_("removeDOMStorageItem");
this.installInspectorControllerDelegate_("removeNode");
@@ -79,7 +80,7 @@ devtools.InspectorBackendImpl.prototype.toggleNodeSearch = function()
this.callInspectorController_.call(this, "toggleNodeSearch");
if (!this.searchingForNode()) {
// This is called from ElementsPanel treeOutline's focusNodeChanged().
- DevToolsHost.activateWindow();
+ InspectorFrontendHost.activateWindow();
}
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list