[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jianli at chromium.org
jianli at chromium.org
Wed Dec 22 11:53:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e2a89c0f942f69e0edd72bb4a83544e511408862
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 20:38:30 2010 +0000
Chromium build fix.
* DumpRenderTree/chromium/MockSpellCheck.cpp:
* DumpRenderTree/chromium/NotificationPresenter.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 061c35f..f00221f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-10 Jian Li <jianli at chromium.org>
+
+ Chromium build fix.
+
+ * DumpRenderTree/chromium/MockSpellCheck.cpp:
+ * DumpRenderTree/chromium/NotificationPresenter.cpp:
+
2010-08-10 Victor Wang <victorw at chromium.org>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
index fe70cab..5c3e2a4 100644
--- a/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/MockSpellCheck.cpp
@@ -31,10 +31,12 @@
#include "config.h"
#include "MockSpellCheck.h"
-#include "public/WebString.h"
+#include "PlatformString.h"
#include <wtf/ASCIICType.h>
#include <wtf/Assertions.h>
+#include "public/WebString.h"
+
using namespace WebCore;
using namespace WebKit;
diff --git a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
index 86903be..b7bb685 100644
--- a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
@@ -31,13 +31,15 @@
#include "config.h"
#include "NotificationPresenter.h"
+#include "PlatformString.h"
+#include <wtf/text/CString.h>
+
#include "googleurl/src/gurl.h"
#include "public/WebNotification.h"
#include "public/WebNotificationPermissionCallback.h"
#include "public/WebSecurityOrigin.h"
#include "public/WebString.h"
#include "public/WebURL.h"
-#include <wtf/text/CString.h>
using namespace WebCore;
using namespace WebKit;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list