[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
ggaren at apple.com
ggaren at apple.com
Thu Oct 29 20:32:59 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit da87ce6bd4f6b1eb5e36ff139ad0112cb00252d9
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 24 07:20:43 2009 +0000
More build fix: Removed JSSharedWorkerContextCustom.cpp from project
files, since it no longer exists in the repository.
Patch by Geoffrey Garen <ggaren at apple.com> on 2009-09-24
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48707 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a61d46..6486004 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
2009-09-24 Geoffrey Garen <ggaren at apple.com>
+ More build fix: Removed JSSharedWorkerContextCustom.cpp from project
+ files, since it no longer exists in the repository.
+
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+
+2009-09-24 Geoffrey Garen <ggaren at apple.com>
+
Windows build fix: Declare set/unsetPendingActivity public, so
SharedWorkerScriptLoader can call them.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index defe117..f633b8f 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2469,7 +2469,6 @@ webcore_cppflags += \
webcore_built_sources += \
WebCore/bindings/js/JSSharedWorkerConstructor.cpp \
WebCore/bindings/js/JSSharedWorkerConstructor.h \
- WebCore/bindings/js/JSSharedWorkerContextCustom.cpp \
WebCore/bindings/js/JSSharedWorkerCustom.cpp \
WebCore/workers/DefaultSharedWorkerRepository.cpp \
WebCore/workers/DefaultSharedWorkerRepository.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 198b8d5..758d99d 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -532,7 +532,6 @@
'bindings/js/JSRGBColor.h',
'bindings/js/JSSharedWorkerConstructor.cpp',
'bindings/js/JSSharedWorkerConstructor.h',
- 'bindings/js/JSSharedWorkerContextCustom.cpp',
'bindings/js/JSSharedWorkerCustom.cpp',
'bindings/js/JSSQLResultSetRowListCustom.cpp',
'bindings/js/JSSQLTransactionCustom.cpp',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f15fd1b..3782592 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2636,7 +2636,6 @@ contains(DEFINES, ENABLE_SHARED_WORKERS=1) {
SOURCES += \
bindings/js/JSSharedWorkerConstructor.cpp \
- bindings/js/JSSharedWorkerContextCustom.cpp \
bindings/js/JSSharedWorkerCustom.cpp \
workers/DefaultSharedWorkerRepository.cpp \
workers/SharedWorker.cpp \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 8ff0e51..21f8ad3 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -29307,10 +29307,6 @@
>
</File>
<File
- RelativePath="..\bindings\js\JSSharedWorkerContextCustom.cpp"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSSharedWorkerCustom.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list