[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:51:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5c63b3b122e5cfc5f1590bb3fc710b6d493a2f9c
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 02:06:38 2010 +0000
Speculative chromium build fix IV.
* src/WebPageSerializerImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65033 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 26e221b..22ed612 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,11 @@
2010-08-09 Gavin Barraclough <barraclough at apple.com>
+ Speculative chromium build fix IV.
+
+ * src/WebPageSerializerImpl.h:
+
+2010-08-09 Gavin Barraclough <barraclough at apple.com>
+
Speculative chromium build fix II.
* src/AssertMatchingEnums.cpp:
diff --git a/WebKit/chromium/src/WebPageSerializerImpl.h b/WebKit/chromium/src/WebPageSerializerImpl.h
index aa8d235..03f0a3b 100644
--- a/WebKit/chromium/src/WebPageSerializerImpl.h
+++ b/WebKit/chromium/src/WebPageSerializerImpl.h
@@ -32,11 +32,11 @@
#define WebPageSerializerImpl_h
#include "PlatformString.h"
-#include "StringBuilder.h"
#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
+#include "StringBuilder.h"
#include "WebEntities.h"
#include "WebPageSerializer.h"
@@ -98,7 +98,7 @@ private:
// original link.
LinkLocalPathMap m_localLinks;
// Data buffer for saving result of serialized DOM data.
- WTF::StringBuilder m_dataBuffer;
+ WebCore::StringBuilder m_dataBuffer;
// Passing true to recursive_serialization_ indicates we will serialize not
// only the specified frame but also all sub-frames in the specific frame.
// Otherwise we only serialize the specified frame excluded all sub-frames.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list