[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
jianli at chromium.org
jianli at chromium.org
Wed Mar 17 18:28:21 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 8e9fe1fefbc9d70248799a92a4bba5309702940e
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 8 20:03:33 2010 +0000
No review. Fix build break on Tiger intel release.
* html/Blob.cpp:
* html/Blob.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2660e8b..d9f9671 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-08 Jian Li <jianli at chromium.org>
+
+ No review. Fix build break on Tiger intel release.
+
+ * html/Blob.cpp:
+ * html/Blob.h:
+
2010-03-02 Adam Treat <atreat at rim.com>
Reviewed by Dave Hyatt.
diff --git a/WebCore/html/Blob.cpp b/WebCore/html/Blob.cpp
index be42442..83bbdc0 100644
--- a/WebCore/html/Blob.cpp
+++ b/WebCore/html/Blob.cpp
@@ -35,6 +35,11 @@
namespace WebCore {
+#if ENABLE(BLOB_SLICE)
+const int Blob::toEndOfFile = -1;
+const double Blob::doNotCheckFileChange = 0;
+#endif
+
Blob::Blob(const String& path)
: m_path(path)
#if ENABLE(BLOB_SLICE)
diff --git a/WebCore/html/Blob.h b/WebCore/html/Blob.h
index 07e61af..610842e 100644
--- a/WebCore/html/Blob.h
+++ b/WebCore/html/Blob.h
@@ -42,8 +42,8 @@ namespace WebCore {
class Blob : public RefCounted<Blob> {
public:
#if ENABLE(BLOB_SLICE)
- static const int toEndOfFile = -1;
- static const double doNotCheckFileChange = 0;
+ static const int toEndOfFile;
+ static const double doNotCheckFileChange;
#endif
static PassRefPtr<Blob> create(const String& path)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list