[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:24:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 71235ac7ba6a3666ad255fa98d6163027cf5d24d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 16:39:38 2010 +0000
2010-07-22 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: Stop granting universal access to inspector front-end page.
https://bugs.webkit.org/show_bug.cgi?id=42817
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::windowObjectCleared):
2010-07-22 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: Stop granting universal access to inspector front-end page.
https://bugs.webkit.org/show_bug.cgi?id=42817
* src/WebDevToolsFrontendImpl.cpp:
(WebKit::WebDevToolsFrontendImpl::frontendLoaded):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63896 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6074a0e..7ee19a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-22 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Stop granting universal access to inspector front-end page.
+ https://bugs.webkit.org/show_bug.cgi?id=42817
+
+ * inspector/InspectorFrontendClientLocal.cpp:
+ (WebCore::InspectorFrontendClientLocal::windowObjectCleared):
+
2010-07-22 Yury Semikhatsky <yurys at chromium.org>
Unreviewed. Fix inspector console tests crashes.
diff --git a/WebCore/inspector/InspectorFrontendClientLocal.cpp b/WebCore/inspector/InspectorFrontendClientLocal.cpp
index 16a6a8b..b982459 100644
--- a/WebCore/inspector/InspectorFrontendClientLocal.cpp
+++ b/WebCore/inspector/InspectorFrontendClientLocal.cpp
@@ -70,8 +70,6 @@ InspectorFrontendClientLocal::~InspectorFrontendClientLocal()
void InspectorFrontendClientLocal::windowObjectCleared()
{
- // Grant the inspector the ability to script the inspected page.
- m_frontendPage->mainFrame()->document()->securityOrigin()->grantUniversalAccess();
// FIXME: don't keep reference to the script state
m_frontendScriptState = scriptStateFromPage(debuggerWorld(), m_frontendPage);
ScriptGlobalObject::set(m_frontendScriptState, "InspectorBackend", m_inspectorController->inspectorBackend());
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 55d1e70..73bb238 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-22 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Stop granting universal access to inspector front-end page.
+ https://bugs.webkit.org/show_bug.cgi?id=42817
+
+ * src/WebDevToolsFrontendImpl.cpp:
+ (WebKit::WebDevToolsFrontendImpl::frontendLoaded):
+
2010-07-22 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
index 3e83f18..592a532 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
@@ -150,10 +150,6 @@ void WebDevToolsFrontendImpl::frontendLoaded()
{
m_loaded = true;
- // Grant the devtools page the ability to have source view iframes.
- SecurityOrigin* origin = m_webViewImpl->page()->mainFrame()->domWindow()->securityOrigin();
- origin->grantUniversalAccess();
-
for (Vector<Vector<String> >::iterator it = m_pendingIncomingMessages.begin();
it != m_pendingIncomingMessages.end();
++it) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list