[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:02:44 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit d73126eea49e81bc56a2fa1f58e4903871ed3804
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 19:26:32 2011 +0000
2011-01-15 Joone Hur <joone.hur at collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] Linux build with FileSystem API enabled fails
https://bugs.webkit.org/show_bug.cgi?id=43878
This patch allows WebKitGtk+ to build with FileSystem API option.
No new tests because no new functionality.
* GNUmakefile.am: Included AsyncFileSystem.h,cpp and Excluded duplicated JSFileException.h,cpp.
* bindings/js/JSDirectoryEntryCustom.cpp: Included ExceptionCode.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75879 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a81ee7c..f6117be 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-15 Joone Hur <joone.hur at collabora.co.uk>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Linux build with FileSystem API enabled fails
+ https://bugs.webkit.org/show_bug.cgi?id=43878
+
+ This patch allows WebKitGtk+ to build with FileSystem API option.
+
+ No new tests because no new functionality.
+
+ * GNUmakefile.am: Included AsyncFileSystem.h,cpp and Excluded duplicated JSFileException.h,cpp.
+ * bindings/js/JSDirectoryEntryCustom.cpp: Included ExceptionCode.h.
+
2011-01-14 Sam Magnuson <smagnuso at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 6c364ab..efbbb70 100644
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -2284,6 +2284,8 @@ webcore_sources += \
Source/WebCore/platform/Arena.cpp \
Source/WebCore/platform/Arena.h \
Source/WebCore/platform/AsyncFileStream.h \
+ Source/WebCore/platform/AsyncFileSystem.cpp \
+ Source/WebCore/platform/AsyncFileSystem.h \
Source/WebCore/platform/AutodrainedPool.h \
Source/WebCore/platform/ContentType.cpp \
Source/WebCore/platform/ContentType.h \
@@ -4083,8 +4085,6 @@ webcore_built_sources += \
DerivedSources/WebCore/JSFileEntry.h \
DerivedSources/WebCore/JSFileEntrySync.cpp \
DerivedSources/WebCore/JSFileEntrySync.h \
- DerivedSources/WebCore/JSFileException.cpp \
- DerivedSources/WebCore/JSFileException.h \
DerivedSources/WebCore/JSFileSystemCallback.cpp \
DerivedSources/WebCore/JSFileSystemCallback.h \
DerivedSources/WebCore/JSFileWriter.cpp \
diff --git a/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp b/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp
index a0e0455..ceb3ccb 100644
--- a/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp
@@ -34,6 +34,7 @@
#include "JSDirectoryEntry.h"
+#include "ExceptionCode.h"
#include "JSDOMBinding.h"
#include "JSEntryCallback.h"
#include "JSErrorCallback.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list