[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
aroben at apple.com
aroben at apple.com
Thu Apr 8 00:40:34 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c8412d3b5a61416501380fa714110ccdc717b48c
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 17 19:12:26 2009 +0000
Remove HeavyProfile and TreeProfile completely
These were mostly removed in r42808, but the empty files were left in
place.
Fixes <http://webkit.org/b/32664>.
Reviewed by John Sullivan.
* Android.mk:
* GNUmakefile.am:
* JavaScriptCore.gypi:
* JavaScriptCore.pri:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCoreSources.bkl:
Removed HeavyProfile/TreeProfile source files.
* profiler/HeavyProfile.cpp: Removed.
* profiler/HeavyProfile.h: Removed.
* profiler/TreeProfile.cpp: Removed.
* profiler/TreeProfile.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk
index 425d69c..1dd5ec0 100644
--- a/JavaScriptCore/Android.mk
+++ b/JavaScriptCore/Android.mk
@@ -56,12 +56,10 @@ LOCAL_SRC_FILES := \
pcre/pcre_ucp_searchfuncs.cpp \
pcre/pcre_xclass.cpp \
\
- profiler/HeavyProfile.cpp \
profiler/Profile.cpp \
profiler/ProfileGenerator.cpp \
profiler/ProfileNode.cpp \
profiler/Profiler.cpp \
- profiler/TreeProfile.cpp \
\
runtime/ArgList.cpp \
runtime/Arguments.cpp \
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 51b9936..a5bbadc 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,27 @@
+2009-12-17 Adam Roben <aroben at apple.com>
+
+ Remove HeavyProfile and TreeProfile completely
+
+ These were mostly removed in r42808, but the empty files were left in
+ place.
+
+ Fixes <http://webkit.org/b/32664>.
+
+ Reviewed by John Sullivan.
+
+ * Android.mk:
+ * GNUmakefile.am:
+ * JavaScriptCore.gypi:
+ * JavaScriptCore.pri:
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+ * JavaScriptCoreSources.bkl:
+ Removed HeavyProfile/TreeProfile source files.
+
+ * profiler/HeavyProfile.cpp: Removed.
+ * profiler/HeavyProfile.h: Removed.
+ * profiler/TreeProfile.cpp: Removed.
+ * profiler/TreeProfile.h: Removed.
+
2009-12-17 Martin Robinson <martin.james.robinson at gmail.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 062634b..50c804a 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -161,8 +161,6 @@ javascriptcore_sources += \
JavaScriptCore/pcre/pcre_xclass.cpp \
JavaScriptCore/pcre/ucpinternal.h \
JavaScriptCore/profiler/CallIdentifier.h \
- JavaScriptCore/profiler/HeavyProfile.cpp \
- JavaScriptCore/profiler/HeavyProfile.h \
JavaScriptCore/profiler/Profile.cpp \
JavaScriptCore/profiler/Profile.h \
JavaScriptCore/profiler/ProfileGenerator.cpp \
@@ -171,8 +169,6 @@ javascriptcore_sources += \
JavaScriptCore/profiler/ProfileNode.h \
JavaScriptCore/profiler/Profiler.cpp \
JavaScriptCore/profiler/Profiler.h \
- JavaScriptCore/profiler/TreeProfile.cpp \
- JavaScriptCore/profiler/TreeProfile.h \
JavaScriptCore/interpreter/CachedCall.h \
JavaScriptCore/interpreter/CallFrame.cpp \
JavaScriptCore/interpreter/CallFrame.h \
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index b4495b2..8ed1e3a 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -149,8 +149,6 @@
'pcre/ucpinternal.h',
'pcre/ucptable.cpp',
'profiler/CallIdentifier.h',
- 'profiler/HeavyProfile.cpp',
- 'profiler/HeavyProfile.h',
'profiler/Profile.cpp',
'profiler/Profile.h',
'profiler/ProfileGenerator.cpp',
@@ -160,8 +158,6 @@
'profiler/Profiler.cpp',
'profiler/Profiler.h',
'profiler/ProfilerServer.h',
- 'profiler/TreeProfile.cpp',
- 'profiler/TreeProfile.h',
'runtime/ArgList.cpp',
'runtime/ArgList.h',
'runtime/Arguments.cpp',
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index aecf01c..f05e3b7 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -126,12 +126,10 @@ SOURCES += \
parser/Nodes.cpp \
parser/ParserArena.cpp \
parser/Parser.cpp \
- profiler/HeavyProfile.cpp \
profiler/Profile.cpp \
profiler/ProfileGenerator.cpp \
profiler/ProfileNode.cpp \
profiler/Profiler.cpp \
- profiler/TreeProfile.cpp \
runtime/ArgList.cpp \
runtime/Arguments.cpp \
runtime/ArrayConstructor.cpp \
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 42c856c..995ff72 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -1489,14 +1489,6 @@
Name="Profiler"
>
<File
- RelativePath="..\..\profiler\HeavyProfile.cpp"
- >
- </File>
- <File
- RelativePath="..\..\profiler\HeavyProfile.h"
- >
- </File>
- <File
RelativePath="..\..\profiler\Profile.cpp"
>
</File>
@@ -1528,14 +1520,6 @@
RelativePath="..\..\profiler\Profiler.h"
>
</File>
- <File
- RelativePath="..\..\profiler\TreeProfile.cpp"
- >
- </File>
- <File
- RelativePath="..\..\profiler\TreeProfile.h"
- >
- </File>
</Filter>
<Filter
Name="Compiler"
diff --git a/JavaScriptCore/JavaScriptCoreSources.bkl b/JavaScriptCore/JavaScriptCoreSources.bkl
index 1f36c1c..547e32f 100644
--- a/JavaScriptCore/JavaScriptCoreSources.bkl
+++ b/JavaScriptCore/JavaScriptCoreSources.bkl
@@ -68,12 +68,10 @@ Source files for JSCore.
parser/ParserArena.cpp
</set>
<set append="1" var="JSCORE_PROFILER_SOURCES">
- profiler/HeavyProfile.cpp
profiler/ProfileGenerator.cpp
profiler/ProfileNode.cpp
profiler/Profile.cpp
profiler/Profiler.cpp
- profiler/TreeProfile.cpp
</set>
<set append="1" var="JSCORE_RUNTIME_SOURCES">
runtime/ArgList.cpp
diff --git a/JavaScriptCore/profiler/HeavyProfile.cpp b/JavaScriptCore/profiler/HeavyProfile.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/JavaScriptCore/profiler/HeavyProfile.h b/JavaScriptCore/profiler/HeavyProfile.h
deleted file mode 100644
index e69de29..0000000
diff --git a/JavaScriptCore/profiler/TreeProfile.cpp b/JavaScriptCore/profiler/TreeProfile.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/JavaScriptCore/profiler/TreeProfile.h b/JavaScriptCore/profiler/TreeProfile.h
deleted file mode 100644
index e69de29..0000000
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list