[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
pfeldman at chromium.org
pfeldman at chromium.org
Fri Feb 26 22:26:58 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit f2c0f68b38d2dd6ed6135913310a57c4f47da549
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 22 09:13:58 2010 +0000
2010-02-22 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: windows build fix.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55073 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2b736dc..fe87ec6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-22 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed: windows build fix.
+
2010-02-21 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 4ef8343..3aecf9b 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1226,6 +1226,7 @@ webcore_sources += \
WebCore/inspector/JavaScriptCallFrame.cpp \
WebCore/inspector/JavaScriptCallFrame.h \
WebCore/inspector/ScriptBreakpoint.h \
+ WebCore/inspector/ScriptDebugListener.h \
WebCore/inspector/TimelineRecordFactory.cpp \
WebCore/inspector/TimelineRecordFactory.h \
WebCore/loader/Cache.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 75d854b..6fe815c 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1615,6 +1615,7 @@
'inspector/JavaScriptCallFrame.cpp',
'inspector/JavaScriptCallFrame.h',
'inspector/ScriptBreakpoint.h',
+ 'inspector/ScriptDebugListener.h',
'inspector/TimelineRecordFactory.cpp',
'inspector/TimelineRecordFactory.h',
'loader/appcache/ApplicationCache.cpp',
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 204ce55..44ea351 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -42693,6 +42693,10 @@
>
</File>
<File
+ RelativePath="..\inspector\ScriptDebugListener.h"
+ >
+ </File>
+ <File
RelativePath="..\inspector\TimelineRecordFactory.cpp"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 3027f8f..b89adc6 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1296,6 +1296,7 @@
7AED3E050FBB1EAA00D2B03C /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */; };
7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
84224183107E77F400766A87 /* JSSVGFEMorphologyElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84224181107E77F400766A87 /* JSSVGFEMorphologyElement.cpp */; };
84224184107E77F400766A87 /* JSSVGFEMorphologyElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 84224182107E77F400766A87 /* JSSVGFEMorphologyElement.h */; };
8422418C107E786F00766A87 /* DOMSVGFEMorphologyElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 84224189107E786F00766A87 /* DOMSVGFEMorphologyElement.h */; };
@@ -6716,6 +6717,7 @@
7AED3E030FBB1EAA00D2B03C /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptBreakpoint.h; sourceTree = "<group>"; };
+ 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptDebugListener.h; sourceTree = "<group>"; };
84224181107E77F400766A87 /* JSSVGFEMorphologyElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFEMorphologyElement.cpp; sourceTree = "<group>"; };
84224182107E77F400766A87 /* JSSVGFEMorphologyElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFEMorphologyElement.h; sourceTree = "<group>"; };
84224189107E786F00766A87 /* DOMSVGFEMorphologyElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGFEMorphologyElement.h; sourceTree = "<group>"; };
@@ -10642,6 +10644,7 @@
1C81BA040E97348300266E07 /* JavaScriptCallFrame.h */,
1C81BA050E97348300266E07 /* JavaScriptCallFrame.idl */,
7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */,
+ 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */,
BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */,
7553CFE7108F473F00EA281E /* TimelineRecordFactory.cpp */,
7553CFE6108F473F00EA281E /* TimelineRecordFactory.h */,
@@ -18533,6 +18536,7 @@
9F2A322C1125A0A2003C3056 /* JavaScriptProfile.h in Headers */,
9F2A322E1125A0A2003C3056 /* JavaScriptProfileNode.h in Headers */,
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */,
+ 7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/bindings/js/ScriptDebugServer.cpp b/WebCore/bindings/js/ScriptDebugServer.cpp
index b280d52..f1185ac 100644
--- a/WebCore/bindings/js/ScriptDebugServer.cpp
+++ b/WebCore/bindings/js/ScriptDebugServer.cpp
@@ -44,6 +44,7 @@
#include "PluginView.h"
#include "ScriptBreakpoint.h"
#include "ScriptController.h"
+#include "ScriptDebugListener.h"
#include "ScrollView.h"
#include "Widget.h"
#include <debugger/DebuggerCallFrame.h>
@@ -79,7 +80,7 @@ ScriptDebugServer::~ScriptDebugServer()
deleteAllValues(m_pageListenersMap);
}
-void ScriptDebugServer::addListener(Listener* listener, Page* page)
+void ScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
{
ASSERT_ARG(listener, listener);
ASSERT_ARG(page, page);
@@ -94,7 +95,7 @@ void ScriptDebugServer::addListener(Listener* listener, Page* page)
didAddListener(page);
}
-void ScriptDebugServer::removeListener(Listener* listener, Page* page)
+void ScriptDebugServer::removeListener(ScriptDebugListener* listener, Page* page)
{
ASSERT_ARG(listener, listener);
ASSERT_ARG(page, page);
@@ -245,7 +246,7 @@ void ScriptDebugServer::dispatchDidParseSource(const ListenerSet& listeners, con
String data = JSC::UString(source.data(), source.length());
int firstLine = source.firstLine();
- Vector<Listener*> copy;
+ Vector<ScriptDebugListener*> copy;
copyToVector(listeners, copy);
for (size_t i = 0; i < copy.size(); ++i)
copy[i]->didParseSource(sourceID, url, data, firstLine);
@@ -257,7 +258,7 @@ void ScriptDebugServer::dispatchFailedToParseSource(const ListenerSet& listeners
String data = JSC::UString(source.data(), source.length());
int firstLine = source.firstLine();
- Vector<Listener*> copy;
+ Vector<ScriptDebugListener*> copy;
copyToVector(listeners, copy);
for (size_t i = 0; i < copy.size(); ++i)
copy[i]->failedToParseSource(url, data, firstLine, errorLine, errorMessage);
@@ -318,7 +319,7 @@ void ScriptDebugServer::sourceParsed(ExecState* exec, const SourceCode& source,
void ScriptDebugServer::dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback callback)
{
- Vector<Listener*> copy;
+ Vector<ScriptDebugListener*> copy;
copyToVector(listeners, copy);
for (size_t i = 0; i < copy.size(); ++i)
(copy[i]->*callback)();
@@ -427,7 +428,7 @@ void ScriptDebugServer::pauseIfNeeded(Page* page)
m_pauseOnNextStatement = false;
m_paused = true;
- dispatchFunctionToListeners(&Listener::didPause, page);
+ dispatchFunctionToListeners(&ScriptDebugListener::didPause, page);
setJavaScriptPaused(page->group(), true);
@@ -442,7 +443,7 @@ void ScriptDebugServer::pauseIfNeeded(Page* page)
m_paused = false;
- dispatchFunctionToListeners(&Listener::didContinue, page);
+ dispatchFunctionToListeners(&ScriptDebugListener::didContinue, page);
}
void ScriptDebugServer::callEvent(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber)
diff --git a/WebCore/bindings/js/ScriptDebugServer.h b/WebCore/bindings/js/ScriptDebugServer.h
index 475c0c7..4bcdb50 100644
--- a/WebCore/bindings/js/ScriptDebugServer.h
+++ b/WebCore/bindings/js/ScriptDebugServer.h
@@ -53,28 +53,15 @@ class Frame;
class FrameView;
class Page;
class PageGroup;
+class ScriptDebugListener;
class JavaScriptCallFrame;
-class Frame;
-class Page;
-class String;
-
class ScriptDebugServer : JSC::Debugger, public Noncopyable {
public:
- class Listener {
- public:
- virtual ~Listener() { }
-
- virtual void didParseSource(const String& sourceID, const String& url, const String& data, int firstLine) = 0;
- virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
- virtual void didPause() = 0;
- virtual void didContinue() = 0;
- };
-
static ScriptDebugServer& shared();
- void addListener(Listener*, Page*);
- void removeListener(Listener*, Page*);
+ void addListener(ScriptDebugListener*, Page*);
+ void removeListener(ScriptDebugListener*, Page*);
void setBreakpoint(const String& sourceID, unsigned lineNumber, ScriptBreakpoint breakpoint);
void removeBreakpoint(const String& sourceID, unsigned lineNumber);
@@ -103,8 +90,8 @@ public:
void pageCreated(Page*);
private:
- typedef HashSet<Listener*> ListenerSet;
- typedef void (Listener::*JavaScriptExecutionCallback)();
+ typedef HashSet<ScriptDebugListener*> ListenerSet;
+ typedef void (ScriptDebugListener::*JavaScriptExecutionCallback)();
ScriptDebugServer();
~ScriptDebugServer();
diff --git a/WebCore/bindings/v8/ScriptDebugServer.h b/WebCore/bindings/v8/ScriptDebugServer.h
index 1e66011..1606824 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.h
+++ b/WebCore/bindings/v8/ScriptDebugServer.h
@@ -42,22 +42,14 @@
namespace WebCore {
+class ScriptDebugListener;
+
class ScriptDebugServer : public Noncopyable {
public:
- class Listener {
- public:
- virtual ~Listener() { }
-
- virtual void didParseSource(const String& sourceID, const String& url, const String& data, int firstLine) = 0;
- virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
- virtual void didPause() = 0;
- virtual void didContinue() = 0;
- };
-
static ScriptDebugServer& shared();
- void addListener(Listener*, Page*) { }
- void removeListener(Listener*, Page*) { }
+ void addListener(ScriptDebugListener*, Page*) { }
+ void removeListener(ScriptDebugListener*, Page*) { }
void setBreakpoint(const String& sourceID, unsigned lineNumber, ScriptBreakpoint breakpoint) { }
void removeBreakpoint(const String& sourceID, unsigned lineNumber) { }
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 169c42b..f1d9c48 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -34,6 +34,7 @@
#include "InspectorDOMAgent.h"
#include "PlatformString.h"
#include "ScriptArray.h"
+#include "ScriptBreakpoint.h"
#include "ScriptObject.h"
#include "ScriptProfile.h"
#include "ScriptState.h"
@@ -48,7 +49,7 @@
#include <wtf/Vector.h>
#if ENABLE(JAVASCRIPT_DEBUGGER)
-#include "ScriptDebugServer.h"
+#include "ScriptDebugListener.h"
#endif
namespace WebCore {
@@ -87,7 +88,7 @@ class InspectorResource;
class InspectorController
#if ENABLE(JAVASCRIPT_DEBUGGER)
- : ScriptDebugServer::Listener, public Noncopyable
+ : ScriptDebugListener, public Noncopyable
#else
: public Noncopyable
#endif
diff --git a/WebCore/inspector/ScriptDebugListener.h b/WebCore/inspector/ScriptDebugListener.h
new file mode 100644
index 0000000..5a85da1
--- /dev/null
+++ b/WebCore/inspector/ScriptDebugListener.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * 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.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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 ScriptDebugListener_h
+#define ScriptDebugListener_h
+
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+
+namespace WebCore {
+
+class String;
+
+class ScriptDebugListener {
+public:
+ virtual ~ScriptDebugListener() { }
+
+ virtual void didParseSource(const String& sourceID, const String& url, const String& data, int firstLine) = 0;
+ virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
+ virtual void didPause() = 0;
+ virtual void didContinue() = 0;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(JAVASCRIPT_DEBUGGER)
+
+#endif // ScriptDebugListener_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list