[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
pfeldman at chromium.org
pfeldman at chromium.org
Wed Mar 17 18:21:19 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 11ac9edfbf1aa6935e6d05badcf19bdbeb571537
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 5 16:13:04 2010 +0000
2010-03-05 Pavel Feldman <pfeldman at chromium.org>
Not reviewed. Roll back r55522 since it regreses performance
according to chromium's page cycler.
https://bugs.webkit.org/show_bug.cgi?id=35568
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55584 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f3ac4d..c0e4f58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-05 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed. Roll back r55522 since it regreses performance
+ according to chromium's page cycler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35568
+
2010-03-05 Dean Jackson <dino at apple.com>
Reviewed by Simon Fraser and Chris Marrin.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 4283e20..871cf2a 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 13131a8..316565f 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1614,7 +1614,6 @@
'inspector/InspectorResource.h',
'inspector/InspectorTimelineAgent.cpp',
'inspector/InspectorTimelineAgent.h',
- 'inspector/InspectorWorkerResource.h',
'inspector/JavaScriptCallFrame.cpp',
'inspector/JavaScriptCallFrame.h',
'inspector/ScriptBreakpoint.h',
@@ -3734,7 +3733,6 @@
'inspector/front-end/Callback.js',
'inspector/front-end/CallStackSidebarPane.js',
'inspector/front-end/ChangesView.js',
- 'inspector/front-end/Checkbox.js',
'inspector/front-end/Color.js',
'inspector/front-end/ConsolePanel.js',
'inspector/front-end/ConsoleView.js',
@@ -3811,7 +3809,6 @@
'inspector/front-end/View.js',
'inspector/front-end/WatchExpressionsSidebarPane.js',
'inspector/front-end/WelcomeView.js',
- 'inspector/front-end/WorkersSidebarPane.js',
'inspector/front-end/audits.css',
'inspector/front-end/inspector.css',
'inspector/front-end/inspectorSyntaxHighlight.css',
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index bc16663..e819aaf 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -42729,10 +42729,6 @@
>
</File>
<File
- RelativePath="..\inspector\InspectorWorkerResource.h"
- >
- </File>
- <File
RelativePath="..\inspector\JavaScriptCallFrame.cpp"
>
</File>
@@ -42812,10 +42808,6 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\Checkbox.js"
- >
- </File>
- <File
RelativePath="..\inspector\front-end\Color.js"
>
</File>
@@ -43123,10 +43115,6 @@
RelativePath="..\inspector\front-end\WelcomeView.js"
>
</File>
- <File
- RelativePath="..\inspector\front-end\WorkersSidebarPane.js"
- >
- </File>
</Filter>
</Filter>
<Filter
diff --git a/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp b/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
index 75597fb..947674a 100644
--- a/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
+++ b/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2008 Matt Lilek <webkit at mattlilek.com>
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -75,7 +75,7 @@ using namespace JSC;
namespace WebCore {
-ScriptObject InjectedScriptHost::createInjectedScript(const String& source, ScriptState* scriptState, long id)
+static ScriptObject createInjectedScript(const String& source, InjectedScriptHost* injectedScriptHost, ScriptState* scriptState, long id)
{
SourceCode sourceCode = makeSource(source);
JSLock lock(SilenceAssertionsOnly);
@@ -91,7 +91,7 @@ ScriptObject InjectedScriptHost::createInjectedScript(const String& source, Scri
return ScriptObject();
MarkedArgumentBuffer args;
- args.append(toJS(scriptState, globalObject, this));
+ args.append(toJS(scriptState, globalObject, injectedScriptHost));
args.append(globalThisValue);
args.append(jsNumber(scriptState, id));
JSValue result = JSC::call(scriptState, functionValue, callType, callData, globalThisValue, args);
@@ -221,11 +221,12 @@ InjectedScript InjectedScriptHost::injectedScriptFor(ScriptState* scriptState)
if (injectedScript)
return InjectedScript(ScriptObject(scriptState, injectedScript));
- ASSERT(!m_injectedScriptSource.isEmpty());
- pair<long, ScriptObject> injectedScriptObject = injectScript(m_injectedScriptSource, scriptState);
- globalObject->setInjectedScript(injectedScriptObject.second.jsObject());
- InjectedScript result(injectedScriptObject.second);
- m_idToInjectedScript.set(injectedScriptObject.first, result);
+ ASSERT(!m_injectedScriptSource.isEmpty());
+ ScriptObject injectedScriptObject = createInjectedScript(m_injectedScriptSource, this, scriptState, m_nextInjectedScriptId);
+ globalObject->setInjectedScript(injectedScriptObject.jsObject());
+ InjectedScript result(injectedScriptObject);
+ m_idToInjectedScript.set(m_nextInjectedScriptId, result);
+ m_nextInjectedScriptId++;
return result;
}
diff --git a/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp b/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
index 8bf0bfa..f588169 100644
--- a/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
@@ -79,7 +79,7 @@ static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(InjectedScriptHos
return instance;
}
-ScriptObject InjectedScriptHost::createInjectedScript(const String& scriptSource, ScriptState* inspectedScriptState, long id)
+static ScriptObject createInjectedScript(const String& scriptSource, InjectedScriptHost* injectedScriptHost, ScriptState* inspectedScriptState, long id)
{
v8::HandleScope scope;
@@ -90,7 +90,7 @@ ScriptObject InjectedScriptHost::createInjectedScript(const String& scriptSource
// instead of calling toV8() that would create the
// wrapper in the current context.
// FIXME: make it possible to use generic bindings factory for InjectedScriptHost.
- v8::Local<v8::Object> scriptHostWrapper = createInjectedScriptHostV8Wrapper(this);
+ v8::Local<v8::Object> scriptHostWrapper = createInjectedScriptHostV8Wrapper(injectedScriptHost);
if (scriptHostWrapper.IsEmpty())
return ScriptObject();
@@ -240,10 +240,11 @@ InjectedScript InjectedScriptHost::injectedScriptFor(ScriptState* inspectedScrip
return InjectedScript(ScriptObject(inspectedScriptState, v8::Local<v8::Object>::Cast(val)));
ASSERT(!m_injectedScriptSource.isEmpty());
- pair<long, ScriptObject> injectedScript = injectScript(m_injectedScriptSource, inspectedScriptState);
- InjectedScript result(injectedScript.second);
- m_idToInjectedScript.set(injectedScript.first, result);
- global->SetHiddenValue(key, injectedScript.second.v8Object());
+ ScriptObject injectedScriptObject = createInjectedScript(m_injectedScriptSource, this, inspectedScriptState, m_nextInjectedScriptId);
+ InjectedScript result(injectedScriptObject);
+ m_idToInjectedScript.set(m_nextInjectedScriptId, result);
+ ++m_nextInjectedScriptId;
+ global->SetHiddenValue(key, injectedScriptObject.v8Object());
return result;
}
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 4263157..d0fe75f 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -4798,11 +4798,6 @@ InspectorTimelineAgent* Document::inspectorTimelineAgent() const
{
return page() ? page()->inspectorTimelineAgent() : 0;
}
-
-InspectorController* Document::inspectorController() const
-{
- return page() ? page()->inspectorController() : 0;
-}
#endif
} // namespace WebCore
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index df87ebd..20df138 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -450,7 +450,6 @@ public:
Settings* settings() const; // can be NULL
#if ENABLE(INSPECTOR)
InspectorTimelineAgent* inspectorTimelineAgent() const; // can be NULL
- virtual InspectorController* inspectorController() const; // can be NULL
#endif
PassRefPtr<Range> createRange();
diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index f1c79cf..709bc69 100644
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -49,9 +49,6 @@ namespace WebCore {
class SecurityOrigin;
class ScriptString;
class String;
-#if ENABLE(INSPECTOR)
- class InspectorController;
-#endif
enum MessageDestination {
#if ENABLE(INSPECTOR)
@@ -87,9 +84,6 @@ namespace WebCore {
virtual String userAgent(const KURL&) const = 0;
SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
-#if ENABLE(INSPECTOR)
- virtual InspectorController* inspectorController() const { return 0; }
-#endif
virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL) = 0;
virtual void addMessage(MessageDestination, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL) = 0;
diff --git a/WebCore/inspector/InjectedScriptHost.cpp b/WebCore/inspector/InjectedScriptHost.cpp
index 5ba7085..6dbbdfd 100644
--- a/WebCore/inspector/InjectedScriptHost.cpp
+++ b/WebCore/inspector/InjectedScriptHost.cpp
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2008 Matt Lilek <webkit at mattlilek.com>
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,7 +70,6 @@ namespace WebCore {
InjectedScriptHost::InjectedScriptHost(InspectorController* inspectorController)
: m_inspectorController(inspectorController)
, m_nextInjectedScriptId(1)
- , m_lastWorkerId(1 << 31) // Distinguish ids of fake workers from real ones, to minimize the chances they overlap.
{
}
@@ -195,31 +194,6 @@ InspectorFrontend* InjectedScriptHost::inspectorFrontend()
return m_inspectorController->m_frontend.get();
}
-pair<long, ScriptObject> InjectedScriptHost::injectScript(const String& source, ScriptState* scriptState)
-{
- long id = m_nextInjectedScriptId++;
- return std::make_pair(id, createInjectedScript(source, scriptState, id));
-}
-
-#if ENABLE(WORKERS)
-long InjectedScriptHost::nextWorkerId()
-{
- return ++m_lastWorkerId;
-}
-
-void InjectedScriptHost::didCreateWorker(long id, const String& url, bool isSharedWorker)
-{
- if (m_inspectorController)
- m_inspectorController->didCreateWorker(id, url, isSharedWorker);
-}
-
-void InjectedScriptHost::willDestroyWorker(long id)
-{
- if (m_inspectorController)
- m_inspectorController->willDestroyWorker(id);
-}
-#endif // ENABLE(WORKERS)
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
diff --git a/WebCore/inspector/InjectedScriptHost.h b/WebCore/inspector/InjectedScriptHost.h
index 40e1af2..112d556 100644
--- a/WebCore/inspector/InjectedScriptHost.h
+++ b/WebCore/inspector/InjectedScriptHost.h
@@ -80,14 +80,8 @@ public:
#if ENABLE(DOM_STORAGE)
void selectDOMStorage(Storage* storage);
#endif
-#if ENABLE(WORKERS)
- long nextWorkerId();
- void didCreateWorker(long id, const String& url, bool isSharedWorker);
- void willDestroyWorker(long id);
-#endif
void reportDidDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException);
- pair<long, ScriptObject> injectScript(const String& source, ScriptState*);
InjectedScript injectedScriptFor(ScriptState*);
InjectedScript injectedScriptForId(long);
void discardInjectedScripts();
@@ -97,12 +91,10 @@ private:
InjectedScriptHost(InspectorController* inspectorController);
InspectorDOMAgent* inspectorDOMAgent();
InspectorFrontend* inspectorFrontend();
- ScriptObject createInjectedScript(const String& source, ScriptState* scriptState, long id);
InspectorController* m_inspectorController;
String m_injectedScriptSource;
long m_nextInjectedScriptId;
- long m_lastWorkerId;
typedef HashMap<long, InjectedScript> IdToInjectedScriptMap;
IdToInjectedScriptMap m_idToInjectedScript;
};
diff --git a/WebCore/inspector/InjectedScriptHost.idl b/WebCore/inspector/InjectedScriptHost.idl
index 2a1c129..73a36fd 100644
--- a/WebCore/inspector/InjectedScriptHost.idl
+++ b/WebCore/inspector/InjectedScriptHost.idl
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
* Copyright (C) 2008 Matt Lilek <webkit at mattlilek.com>
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -55,11 +55,6 @@ module core {
[Custom] void selectDOMStorage(in DOMObject storage);
#endif
-#if defined(ENABLE_WORKERS) && ENABLE_WORKERS
- void didCreateWorker(in long id, in DOMString url, in boolean isFakeWorker);
- void willDestroyWorker(in long id);
- long nextWorkerId();
-#endif
[Custom] void reportDidDispatchOnInjectedScript(in long callId, in DOMObject result, in boolean isException);
};
}
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 0eb71c8..b5b07b8 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -63,7 +63,6 @@
#include "InspectorFrontend.h"
#include "InspectorFrontendHost.h"
#include "InspectorResource.h"
-#include "InspectorWorkerResource.h"
#include "InspectorTimelineAgent.h"
#include "Page.h"
#include "ProgressTracker.h"
@@ -711,11 +710,6 @@ void InspectorController::populateScriptObjects()
for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
it->second->bind(m_frontend.get());
#endif
-#if ENABLE(WORKERS)
- WorkersMap::iterator workersEnd = m_workers.end();
- for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it)
- m_frontend->didCreateWorker(*it->second);
-#endif
m_frontend->populateInterface();
@@ -744,9 +738,7 @@ void InspectorController::resetScriptObjects()
for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
it->second->unbind();
#endif
-#if ENABLE(WORKERS)
- m_workers.clear();
-#endif
+
if (m_timelineAgent)
m_timelineAgent->reset();
@@ -833,10 +825,10 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
if (ResourcesMap* resourceMap = m_frameResources.get(frame))
pruneResources(resourceMap, loader);
- ScriptState* scriptState = mainWorldScriptState(loader->frame());
for (Vector<String>::iterator it = m_scriptsToEvaluateOnLoad.begin();
it != m_scriptsToEvaluateOnLoad.end(); ++it) {
- m_injectedScriptHost->injectScript(*it, scriptState);
+ ScriptSourceCode scriptSourceCode(*it);
+ loader->frame()->script()->evaluate(scriptSourceCode);
}
}
@@ -1179,32 +1171,6 @@ void InspectorController::stopTimelineProfiler()
m_frontend->timelineProfilerWasStopped();
}
-#if ENABLE(WORKERS)
-void InspectorController::didCreateWorker(long id, const String& url, bool isSharedWorker)
-{
- if (!enabled())
- return;
-
- RefPtr<InspectorWorkerResource> workerResource(InspectorWorkerResource::create(id, url, isSharedWorker));
- m_workers.set(id, workerResource);
- if (m_frontend)
- m_frontend->didCreateWorker(*workerResource);
-}
-
-void InspectorController::willDestroyWorker(long id)
-{
- if (!enabled())
- return;
-
- WorkersMap::iterator workerResource = m_workers.find(id);
- if (workerResource == m_workers.end())
- return;
- if (m_frontend)
- m_frontend->willDestroyWorker(*workerResource->second);
- m_workers.remove(workerResource);
-}
-#endif // ENABLE(WORKERS)
-
#if ENABLE(DATABASE)
void InspectorController::selectDatabase(Database* database)
{
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 4558f7f..6ab5e89 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -85,7 +85,6 @@ class ConsoleMessage;
class InspectorDatabaseResource;
class InspectorDOMStorageResource;
class InspectorResource;
-class InspectorWorkerResource;
class InspectorController
#if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -186,14 +185,11 @@ public:
void mainResourceFiredLoadEvent(DocumentLoader*, const KURL&);
void mainResourceFiredDOMContentEvent(DocumentLoader*, const KURL&);
-
+
void didInsertDOMNode(Node*);
void didRemoveDOMNode(Node*);
void didModifyDOMAttr(Element*);
-#if ENABLE(WORKERS)
- void didCreateWorker(long id, const String& url, bool isSharedWorker);
- void willDestroyWorker(long id);
-#endif
+
void getCookies(long callId);
#if ENABLE(DATABASE)
@@ -372,11 +368,6 @@ private:
Timer<InspectorController> m_startProfiling;
ProfilesMap m_profiles;
#endif
-#if ENABLE(WORKERS)
- typedef HashMap<long, RefPtr<InspectorWorkerResource> > WorkersMap;
-
- WorkersMap m_workers;
-#endif
};
inline void InspectorController::didInsertDOMNode(Node* node)
diff --git a/WebCore/inspector/InspectorFrontend.cpp b/WebCore/inspector/InspectorFrontend.cpp
index 781a095..f3b485f 100755
--- a/WebCore/inspector/InspectorFrontend.cpp
+++ b/WebCore/inspector/InspectorFrontend.cpp
@@ -37,7 +37,6 @@
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
#include "InspectorController.h"
-#include "InspectorWorkerResource.h"
#include "Node.h"
#include "ScriptFunctionCall.h"
#include "ScriptObject.h"
@@ -472,26 +471,6 @@ void InspectorFrontend::didGetEventListenersForNode(int callId, int nodeId, Scri
function.call();
}
-#if ENABLE(WORKERS)
-void InspectorFrontend::didCreateWorker(const InspectorWorkerResource& worker)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("didCreateWorker");
- function.appendArgument(worker.id());
- function.appendArgument(worker.url());
- function.appendArgument(worker.isSharedWorker());
- function.call();
-}
-
-void InspectorFrontend::willDestroyWorker(const InspectorWorkerResource& worker)
-{
- ScriptFunctionCall function(m_webInspector, "dispatch");
- function.appendArgument("willDestroyWorker");
- function.appendArgument(worker.id());
- function.call();
-}
-#endif // ENABLE(WORKERS)
-
void InspectorFrontend::didGetCookies(int callId, const ScriptArray& cookies, const String& cookiesString)
{
ScriptFunctionCall function(m_webInspector, "dispatch");
diff --git a/WebCore/inspector/InspectorFrontend.h b/WebCore/inspector/InspectorFrontend.h
index 861a6f7..121cd90 100644
--- a/WebCore/inspector/InspectorFrontend.h
+++ b/WebCore/inspector/InspectorFrontend.h
@@ -45,7 +45,6 @@ namespace WebCore {
class ScriptString;
class SerializedScriptValue;
class Storage;
- class InspectorWorkerResource;
class InspectorFrontend : public Noncopyable {
public:
@@ -132,11 +131,6 @@ namespace WebCore {
void timelineProfilerWasStopped();
void addRecordToTimeline(const ScriptObject&);
-#if ENABLE(WORKERS)
- void didCreateWorker(const InspectorWorkerResource&);
- void willDestroyWorker(const InspectorWorkerResource&);
-#endif // ENABLE(WORKER)
-
void didGetCookies(int callId, const ScriptArray& cookies, const String& cookiesString);
void didDispatchOnInjectedScript(int callId, SerializedScriptValue* result, bool isException);
diff --git a/WebCore/inspector/InspectorWorkerResource.h b/WebCore/inspector/InspectorWorkerResource.h
deleted file mode 100644
index 11d787e..0000000
--- a/WebCore/inspector/InspectorWorkerResource.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorWorkerResource_h
-#define InspectorWorkerResource_h
-
-#if ENABLE(WORKERS) && ENABLE(INSPECTOR)
-
-#include "PlatformString.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class InspectorWorkerResource : public RefCounted<InspectorWorkerResource> {
-public:
- static PassRefPtr<InspectorWorkerResource> create(long id, const String& url, bool isSharedWorker)
- {
- return adoptRef(new InspectorWorkerResource(id, url, isSharedWorker));
- }
-
- long id() const { return m_id; }
- const String& url() const { return m_url; }
- bool isSharedWorker() const { return m_isSharedWorker; }
-private:
- InspectorWorkerResource(long id, const String& url, bool isSharedWorker)
- : m_id(id)
- , m_url(url)
- , m_isSharedWorker(isSharedWorker)
- {
- }
-
- int m_id;
- String m_url;
- bool m_isSharedWorker;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WORKERS) && ENABLE(INSPECTOR)
-
-#endif // InspectorWorkerResource_h
diff --git a/WebCore/inspector/front-end/Checkbox.js b/WebCore/inspector/front-end/Checkbox.js
deleted file mode 100644
index 3f86824..0000000
--- a/WebCore/inspector/front-end/Checkbox.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.Checkbox = function(label, callback, checked, className, tooltip)
-{
- this.element = document.createElement('label');
- this._inputElement = document.createElement('input');
-
- function callbackWrapper(event)
- {
- if (callback)
- callback(event);
- event.stopPropagation();
- return true;
- }
- this._inputElement.type = "checkbox";
- this._inputElement.checked = checked;
- this._inputElement.addEventListener("click", callbackWrapper, false);
-
- this.element.className = className;
- this.element.appendChild(this._inputElement);
- this.element.appendChild(document.createTextNode(label));
- this.element.title = tooltip;
- this.element.addEventListener("click", callbackWrapper, false);
-}
-
-WebInspector.Checkbox.prototype = {
- checked: function()
- {
- return this._inputElement.checked;
- }
-}
diff --git a/WebCore/inspector/front-end/InjectedFakeWorker.js b/WebCore/inspector/front-end/InjectedFakeWorker.js
index 658fd77..ecaa64a 100644
--- a/WebCore/inspector/front-end/InjectedFakeWorker.js
+++ b/WebCore/inspector/front-end/InjectedFakeWorker.js
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-var InjectedFakeWorker = function(InjectedScriptHost, inspectedWindow, injectedScriptId)
+var InjectedFakeWorker = function()
{
Worker = function(url)
@@ -45,13 +45,13 @@ Worker = function(url)
function FakeWorker(worker, url)
{
- var scriptURL = this._expandURLAndCheckOrigin(document.baseURI, location.href, url);
+ var scriptURL = new URL(document.baseURI).completeWith(url);
+
+ if (!scriptURL.sameOrigin(location.href))
+ throw new DOMCoreException("SECURITY_ERR",18);
this._worker = worker;
this._buildWorker(scriptURL);
- this._id = InjectedScriptHost.nextWorkerId();
-
- InjectedScriptHost.didCreateWorker(this._id, scriptURL.url, false);
}
FakeWorker.prototype = {
@@ -63,8 +63,6 @@ FakeWorker.prototype = {
terminate: function()
{
- InjectedScriptHost.willDestroyWorker(this._id);
-
if (this._frame != null) {
this._frame.onmessage = this._worker.onmessage = noop;
this._frame.frameElement.parentNode.removeChild(this._frame.frameElement);
@@ -98,7 +96,7 @@ FakeWorker.prototype = {
_handleException: function(e)
{
// NB: it should be an ErrorEvent, but creating it from script is not
- // currently supported, so emulate it on top of plain vanilla Event.
+ // currently supported, to emulate it on top of plain vanilla Event.
var errorEvent = this._document.createEvent("Event");
errorEvent.initEvent("Event", false, false);
errorEvent.message = "Uncaught exception";
@@ -149,13 +147,10 @@ FakeWorker.prototype = {
workerFrame.close = bind(this.terminate, this);
},
- _importScripts: function(targetFrame)
+ _importScripts: function(evalTarget)
{
- for (var i = 1; i < arguments.length; ++i) {
- var workerOrigin = targetFrame.__devtools.location.href;
- var url = this._expandURLAndCheckOrigin(workerOrigin, workerOrigin, arguments[i]);
- targetFrame.eval(this._loadScript(url.url) + "\n//@ sourceURL= " + url.url);
- }
+ for (var i = 1; i < arguments.length; ++i)
+ evalTarget.eval(this._loadScript(arguments[i]));
},
_loadScript: function(url)
@@ -170,15 +165,6 @@ FakeWorker.prototype = {
text = ""; // We've got error message, not worker code.
}
return text;
- },
-
- _expandURLAndCheckOrigin: function(baseURL, origin, url)
- {
- var scriptURL = new URL(baseURL).completeWith(url);
-
- if (!scriptURL.sameOrigin(origin))
- throw new DOMCoreException("SECURITY_ERR",18);
- return scriptURL;
}
};
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 45e5678..e7f0e35 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -135,7 +135,6 @@ WebInspector.ScriptsPanel = function()
this.sidebarPanes.callstack = new WebInspector.CallStackSidebarPane();
this.sidebarPanes.scopechain = new WebInspector.ScopeChainSidebarPane();
this.sidebarPanes.breakpoints = new WebInspector.BreakpointsSidebarPane();
- this.sidebarPanes.workers = new WebInspector.WorkersSidebarPane();
for (var pane in this.sidebarPanes)
this.sidebarElement.appendChild(this.sidebarPanes[pane].element);
@@ -262,7 +261,7 @@ WebInspector.ScriptsPanel.prototype = {
var script = new WebInspector.Script(sourceID, sourceURL, source, startingLine, errorLine, errorMessage);
this._sourceIDMap[sourceID] = script;
- var resource = WebInspector.resourceURLMap[script.sourceURL];
+ var resource = WebInspector.resourceURLMap[sourceURL];
if (resource) {
if (resource.finished) {
// Resource is finished, bind the script right away.
@@ -425,7 +424,7 @@ WebInspector.ScriptsPanel.prototype = {
return;
this._debuggerEnabled = true;
- this.reset(true);
+ this.reset();
},
debuggerWasDisabled: function()
@@ -434,10 +433,10 @@ WebInspector.ScriptsPanel.prototype = {
return;
this._debuggerEnabled = false;
- this.reset(true);
+ this.reset();
},
- reset: function(preserveWorkers)
+ reset: function()
{
this.visibleView = null;
@@ -473,8 +472,6 @@ WebInspector.ScriptsPanel.prototype = {
this.sidebarPanes.watchExpressions.refreshExpressions();
this.sidebarPanes.breakpoints.reset();
- if (!preserveWorkers)
- this.sidebarPanes.workers.reset();
},
get visibleView()
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index ac4c306..ff21c15 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -13,7 +13,6 @@
<file>Callback.js</file>
<file>CallStackSidebarPane.js</file>
<file>ChangesView.js</file>
- <file>Checkbox.js</file>
<file>Color.js</file>
<file>ConsolePanel.js</file>
<file>ConsoleView.js</file>
@@ -90,7 +89,6 @@
<file>View.js</file>
<file>WatchExpressionsSidebarPane.js</file>
<file>WelcomeView.js</file>
- <file>WorkersSidebarPane.js</file>
<file>audits.css</file>
<file>inspector.css</file>
<file>inspectorSyntaxHighlight.css</file>
diff --git a/WebCore/inspector/front-end/WorkersSidebarPane.js b/WebCore/inspector/front-end/WorkersSidebarPane.js
deleted file mode 100644
index cfb70b7..0000000
--- a/WebCore/inspector/front-end/WorkersSidebarPane.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.WorkersSidebarPane = function()
-{
- WebInspector.SidebarPane.call(this, WebInspector.UIString("Workers"));
-
- this._workers = {};
-
- this._enableWorkersCheckbox = new WebInspector.Checkbox(
- WebInspector.UIString("Debug"),
- this._onTriggerInstrument.bind(this),
- false,
- "sidebar-pane-subtitle",
- WebInspector.UIString("Allow debugging workers. Enabling this option will replace native workers with the iframe-based JavaScript implementation"));
-
- this.titleElement.insertBefore(this._enableWorkersCheckbox.element, this.titleElement.firstChild);
-
- this._listElement = document.createElement("ol");
- this._listElement.className = "workers-list";
-
- this.bodyElement.appendChild(this._listElement);
- this._treeOutline = new TreeOutline(this._listElement);
-}
-
-WebInspector.WorkersSidebarPane.prototype = {
- addWorker: function(id, url, isShared)
- {
- if (id in this._workers)
- return;
- var worker = new WebInspector.Worker(id, url, isShared);
- this._workers[id] = worker;
-
- var title = WebInspector.linkifyURL(url, WebInspector.displayNameForURL(url), "worker-item", true, url);
- var treeElement = new TreeElement(title, worker, false);
- this._treeOutline.appendChild(treeElement);
- },
-
- removeWorker: function(id)
- {
- if (id in this._workers) {
- this._treeOutline.removeChild(this._treeOutline.findTreeElement(this._workers[id]));
- delete this._workers[id];
- }
- },
-
- setInstrumentation: function(enabled)
- {
- InspectorBackend.removeAllScriptsToEvaluateOnLoad();
- if (enabled)
- InspectorBackend.addScriptToEvaluateOnLoad("(" + InjectedFakeWorker + ")");
- },
-
- reset: function()
- {
- InspectorBackend.removeAllScriptsToEvaluateOnLoad();
- this.setInstrumentation(this._enableWorkersCheckbox.checked());
- this._treeOutline.removeChildren();
- this._workers = {};
- },
-
- _onTriggerInstrument: function(event)
- {
- this.setInstrumentation(this._enableWorkersCheckbox.checked());
- }
-};
-
-WebInspector.WorkersSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
-
-WebInspector.Worker = function(id, url, shared)
-{
- this.id = id;
- this.url = url;
- this.shared = shared;
-}
-
-WebInspector.didCreateWorker = function()
-{
- var workersPane = WebInspector.panels.scripts.sidebarPanes.workers;
- workersPane.addWorker.apply(workersPane, arguments);
-}
-
-WebInspector.willDestroyWorker = function()
-{
- var workersPane = WebInspector.panels.scripts.sidebarPanes.workers;
- workersPane.removeWorker.apply(workersPane, arguments);
-}
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 077c132..a6a993c 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -1721,18 +1721,6 @@ li.editing .swatch, li.editing .enabled-button, li.editing-sub-part .delete-but
height: 5px;
}
-.sidebar-pane-subtitle {
- float: right;
- overflow: hidden;
-}
-
-.sidebar-pane-subtitle input {
- width: 10px;
- margin-left: 0;
- margin-top: 0;
- margin-bottom: 0;
-}
-
.metrics {
padding: 8px;
font-size: 10px;
@@ -3887,34 +3875,5 @@ ol.breakpoint-list {
.timeline-details-title {
font-weight: bold;
white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- font-size: 11px;
- padding-left: 10px;
- padding-bottom: 5px;
- border-bottom: 1px solid rgb(194,194,147);
-}
-
-.workers-list {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-.workers-list > li {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- margin-left: 1em;
- font-size: 12px;
-}
-
-a.worker-item {
- color: rgb(33%, 33%, 33%);
- cursor: pointer;
- text-decoration: none;
}
-a.worker-item:hover {
- color: rgb(15%, 15%, 15%);
-}
diff --git a/WebCore/inspector/front-end/inspector.html b/WebCore/inspector/front-end/inspector.html
index 4fa8ddc..e5295f2 100644
--- a/WebCore/inspector/front-end/inspector.html
+++ b/WebCore/inspector/front-end/inspector.html
@@ -41,7 +41,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="InspectorFrontendHostStub.js"></script>
<script type="text/javascript" src="Object.js"></script>
<script type="text/javascript" src="Settings.js"></script>
- <script type="text/javascript" src="Checkbox.js"></script>
<script type="text/javascript" src="ContextMenu.js"></script>
<script type="text/javascript" src="KeyboardShortcut.js"></script>
<script type="text/javascript" src="TextPrompt.js"></script>
@@ -75,7 +74,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script type="text/javascript" src="CallStackSidebarPane.js"></script>
<script type="text/javascript" src="ScopeChainSidebarPane.js"></script>
<script type="text/javascript" src="WatchExpressionsSidebarPane.js"></script>
- <script type="text/javascript" src="WorkersSidebarPane.js"></script>
<script type="text/javascript" src="MetricsSidebarPane.js"></script>
<script type="text/javascript" src="PropertiesSidebarPane.js"></script>
<script type="text/javascript" src="EventListenersSidebarPane.js"></script>
diff --git a/WebCore/workers/AbstractWorker.cpp b/WebCore/workers/AbstractWorker.cpp
index b9d1b78..6ba8922 100644
--- a/WebCore/workers/AbstractWorker.cpp
+++ b/WebCore/workers/AbstractWorker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -38,37 +38,18 @@
#include "Event.h"
#include "EventException.h"
#include "EventNames.h"
-#include "InspectorController.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
namespace WebCore {
-long AbstractWorker::s_lastId;
-
AbstractWorker::AbstractWorker(ScriptExecutionContext* context)
: ActiveDOMObject(context, this)
- , m_id(++s_lastId)
{
}
AbstractWorker::~AbstractWorker()
{
- onDestroyWorker();
-}
-
-void AbstractWorker::onDestroyWorker()
-{
-#if ENABLE(INSPECTOR)
- if (InspectorController* inspector = scriptExecutionContext() ? scriptExecutionContext()->inspectorController() : 0)
- inspector->willDestroyWorker(id());
-#endif
-}
-
-void AbstractWorker::contextDestroyed()
-{
- onDestroyWorker();
- ActiveDOMObject::contextDestroyed();
}
KURL AbstractWorker::resolveURL(const String& url, ExceptionCode& ec)
diff --git a/WebCore/workers/AbstractWorker.h b/WebCore/workers/AbstractWorker.h
index 66b9c15..2209856 100644
--- a/WebCore/workers/AbstractWorker.h
+++ b/WebCore/workers/AbstractWorker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -57,8 +57,6 @@ namespace WebCore {
using RefCounted<AbstractWorker>::ref;
using RefCounted<AbstractWorker>::deref;
- long id() const { return m_id; }
- virtual void contextDestroyed();
AbstractWorker(ScriptExecutionContext*);
virtual ~AbstractWorker();
@@ -71,12 +69,8 @@ namespace WebCore {
virtual void derefEventTarget() { deref(); }
virtual EventTargetData* eventTargetData();
virtual EventTargetData* ensureEventTargetData();
- void onDestroyWorker();
EventTargetData m_eventTargetData;
- long m_id;
-
- static long s_lastId;
};
} // namespace WebCore
diff --git a/WebCore/workers/SharedWorker.cpp b/WebCore/workers/SharedWorker.cpp
index d9b7d11..71fcc68 100644
--- a/WebCore/workers/SharedWorker.cpp
+++ b/WebCore/workers/SharedWorker.cpp
@@ -34,7 +34,6 @@
#include "SharedWorker.h"
-#include "InspectorController.h"
#include "KURL.h"
#include "MessageChannel.h"
#include "MessagePort.h"
@@ -54,10 +53,6 @@ SharedWorker::SharedWorker(const String& url, const String& name, ScriptExecutio
if (ec)
return;
SharedWorkerRepository::connect(this, remotePort.release(), scriptUrl, name, ec);
-#if ENABLE(INSPECTOR)
- if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
- inspector->didCreateWorker(id(), scriptUrl.string(), true);
-#endif
}
SharedWorker::~SharedWorker()
diff --git a/WebCore/workers/Worker.cpp b/WebCore/workers/Worker.cpp
index 4ef94ba..864b7c6 100644
--- a/WebCore/workers/Worker.cpp
+++ b/WebCore/workers/Worker.cpp
@@ -40,7 +40,6 @@
#include "ExceptionCode.h"
#include "Frame.h"
#include "FrameLoader.h"
-#include "InspectorController.h"
#include "MessageEvent.h"
#include "TextEncoding.h"
#include "WorkerContextProxy.h"
@@ -61,10 +60,6 @@ Worker::Worker(const String& url, ScriptExecutionContext* context, ExceptionCode
m_scriptLoader = new WorkerScriptLoader();
m_scriptLoader->loadAsynchronously(scriptExecutionContext(), scriptURL, DenyCrossOriginRequests, this);
setPendingActivity(this); // The worker context does not exist while loading, so we must ensure that the worker object is not collected, as well as its event listeners.
-#if ENABLE(INSPECTOR)
- if (InspectorController* inspector = scriptExecutionContext()->inspectorController())
- inspector->didCreateWorker(id(), scriptURL.string(), false);
-#endif
}
Worker::~Worker()
diff --git a/WebKit/chromium/src/js/InspectorControllerImpl.js b/WebKit/chromium/src/js/InspectorControllerImpl.js
index 38325b6..d8de556 100644
--- a/WebKit/chromium/src/js/InspectorControllerImpl.js
+++ b/WebKit/chromium/src/js/InspectorControllerImpl.js
@@ -38,7 +38,6 @@ if (!this.devtools)
devtools.InspectorBackendImpl = function()
{
WebInspector.InspectorBackendStub.call(this);
- this.installInspectorControllerDelegate_("addScriptToEvaluateOnLoad");
this.installInspectorControllerDelegate_("clearMessages");
this.installInspectorControllerDelegate_("copyNode");
this.installInspectorControllerDelegate_("deleteCookie");
@@ -58,7 +57,6 @@ devtools.InspectorBackendImpl = function()
this.installInspectorControllerDelegate_("highlightDOMNode");
this.installInspectorControllerDelegate_("hideDOMNodeHighlight");
this.installInspectorControllerDelegate_("releaseWrapperObjectGroup");
- this.installInspectorControllerDelegate_("removeAllScriptsToEvaluateOnLoad");
this.installInspectorControllerDelegate_("reloadPage");
this.installInspectorControllerDelegate_("removeAttribute");
this.installInspectorControllerDelegate_("removeDOMStorageItem");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list