[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:44:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b687dcbea447756aaecae918bf6b3e5f5a7d915c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 14:23:51 2010 +0000
2010-08-05 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
Re-enabling inspector/extension* tests following a fix in InspectorController.
https://bugs.webkit.org/show_bug.cgi?id=43344
* platform/gtk/Skipped:
* platform/qt/Skipped:
2010-08-05 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Separated WebInspector extension API injection logic from other scripts that inspector injects.
Enabled injection of the API scripts even if inspector is disabled for inspector front-end page.
https://bugs.webkit.org/show_bug.cgi?id=43344
* inspector/InspectorController.cpp:
(WebCore::InspectorController::inspectedWindowScriptObjectCleared):
(WebCore::InspectorController::setInspectorExtensionAPI):
* inspector/InspectorController.h:
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::setExtensionAPI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a100e15..669f2ba 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-05 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Re-enabling inspector/extension* tests following a fix in InspectorController.
+ https://bugs.webkit.org/show_bug.cgi?id=43344
+
+ * platform/gtk/Skipped:
+ * platform/qt/Skipped:
+
2010-08-05 Charles Wei <charles.wei at torchmobile.com.cn>
Reviewed by George Staikos.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 34dd69b..536b161 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5706,12 +5706,6 @@ printing/page-format-data.html
# https://bugs.webkit.org/show_bug.cgi?id=40664
inspector/timeline-script-tag-1.html
-# [GTK] New tests are failing at Qt/GTK(r64458):
-# Bug against caseq: https://bugs.webkit.org/show_bug.cgi?id=43344
-inspector/extensions.html
-inspector/extensions-api.html
-
-
# Tests failing because the context menu is grabbing mouse events.
# https://bugs.webkit.org/show_bug.cgi?id=40601
fast/events/mouse-click-events.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 0b24587..718d1d6 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5411,11 +5411,6 @@ inspector/debugger-pause-in-eval-script.html
inspector/debugger-proto-property.html
inspector/debugger-eval-while-paused.html
-# [Qt] New tests are failing at Qt/GTK(r64458):
-# Bug against caseq: https://bugs.webkit.org/show_bug.cgi?id=43344
-inspector/extensions.html
-inspector/extensions-api.html
-
# [Qt] fast/text/bidi-explicit-embedding-past-end.html fails
# https://bugs.webkit.org/show_bug.cgi?id=41241
fast/text/bidi-explicit-embedding-past-end.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e11f1b1..fbc45fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-05 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Separated WebInspector extension API injection logic from other scripts that inspector injects.
+ Enabled injection of the API scripts even if inspector is disabled for inspector front-end page.
+ https://bugs.webkit.org/show_bug.cgi?id=43344
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::inspectedWindowScriptObjectCleared):
+ (WebCore::InspectorController::setInspectorExtensionAPI):
+ * inspector/InspectorController.h:
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::setExtensionAPI):
+
2010-08-05 Charles Wei <charles.wei at torchmobile.com.cn>
Reviewed by George Staikos.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 2052adb..566fe10 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -450,18 +450,19 @@ void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame)
if (m_inspectorFrontendClient && frame == m_inspectedPage->mainFrame())
m_inspectorFrontendClient->windowObjectCleared();
- if (!enabled())
- return;
-
- if (m_frontend && frame != m_inspectedPage->mainFrame())
- m_injectedScriptHost->discardInjectedScripts();
- if (m_scriptsToEvaluateOnLoad.size()) {
- ScriptState* scriptState = mainWorldScriptState(frame);
- for (Vector<String>::iterator it = m_scriptsToEvaluateOnLoad.begin();
- it != m_scriptsToEvaluateOnLoad.end(); ++it) {
- m_injectedScriptHost->injectScript(*it, scriptState);
+ if (enabled()) {
+ if (m_frontend && frame == m_inspectedPage->mainFrame())
+ m_injectedScriptHost->discardInjectedScripts();
+ if (m_scriptsToEvaluateOnLoad.size()) {
+ ScriptState* scriptState = mainWorldScriptState(frame);
+ for (Vector<String>::iterator it = m_scriptsToEvaluateOnLoad.begin();
+ it != m_scriptsToEvaluateOnLoad.end(); ++it) {
+ m_injectedScriptHost->injectScript(*it, scriptState);
+ }
}
}
+ if (!m_inspectorExtensionAPI.isEmpty())
+ m_injectedScriptHost->injectScript(m_inspectorExtensionAPI, mainWorldScriptState(frame));
}
void InspectorController::setSearchingForNode(bool enabled)
@@ -2161,6 +2162,11 @@ void InspectorController::removeAllScriptsToEvaluateOnLoad()
m_scriptsToEvaluateOnLoad.clear();
}
+void InspectorController::setInspectorExtensionAPI(const String& source)
+{
+ m_inspectorExtensionAPI = source;
+}
+
void InspectorController::getResourceContent(long callId, unsigned long identifier)
{
if (!m_remoteFrontend)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 07a40eb..e2b611a 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -279,6 +279,7 @@ public:
InjectedScript injectedScriptForNodeId(long id);
void addScriptToEvaluateOnLoad(const String& source);
void removeAllScriptsToEvaluateOnLoad();
+ void setInspectorExtensionAPI(const String& source);
static const String& inspectorStartsAttachedSettingName();
@@ -403,6 +404,7 @@ private:
Vector<pair<long, String> > m_pendingEvaluateTestCommands;
Vector<String> m_scriptsToEvaluateOnLoad;
+ String m_inspectorExtensionAPI;
#if ENABLE(JAVASCRIPT_DEBUGGER)
bool m_debuggerEnabled;
bool m_attachDebuggerWhenShown;
diff --git a/WebCore/inspector/InspectorFrontendHost.cpp b/WebCore/inspector/InspectorFrontendHost.cpp
index 0dacde6..f9bf176 100644
--- a/WebCore/inspector/InspectorFrontendHost.cpp
+++ b/WebCore/inspector/InspectorFrontendHost.cpp
@@ -195,9 +195,7 @@ void InspectorFrontendHost::moveWindowBy(float x, float y) const
void InspectorFrontendHost::setExtensionAPI(const String& script)
{
InspectorController* inspector = m_frontendPage->inspectorController();
-
- inspector->removeAllScriptsToEvaluateOnLoad();
- inspector->addScriptToEvaluateOnLoad(script);
+ inspector->setInspectorExtensionAPI(script);
}
String InspectorFrontendHost::localizedStringsURL()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list