[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 11:39:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0449e281614b37392b3cfaafb45f01569601a942
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 3 05:51:34 2010 +0000
[DRT/Chromium] Remove dependencies to some Chromium headers
https://bugs.webkit.org/show_bug.cgi?id=43396
Reviewed by Dimitri Glazkov.
WebKit/chromium:
* DEPS: Update Chromium revision to 54649 in order to have a
webkit_support change (r54646)
WebKitTools:
* DumpRenderTree/chromium/CppVariant.h:
Remove base/basictypes.h because webkit_support.h contains it.
* DumpRenderTree/chromium/EventSender.cpp:
(getCurrentEventTimeSec): Use new wrapper function.
* DumpRenderTree/chromium/TestNavigationController.h:
Remove base/basictypes.h because webkit_support.h contains it.
* DumpRenderTree/chromium/TestShell.cpp:
(dumpHistoryItem): Use new wrapper function.
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::cancelledError): Use new wrapper function.
(WebViewHost::didFailResourceLoad): Use new wrapper function.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64530 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9a33ade..ee389cc 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-02 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [DRT/Chromium] Remove dependencies to some Chromium headers
+ https://bugs.webkit.org/show_bug.cgi?id=43396
+
+ * DEPS: Update Chromium revision to 54649 in order to have a
+ webkit_support change (r54646)
+
2010-07-27 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 7c7d7e7..bd6c19d 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '53434',
+ 'chromium_rev': '54649',
}
deps = {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5e3c5a5..c5e5eb1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-02 Kent Tamura <tkent at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [DRT/Chromium] Remove dependencies to some Chromium headers
+ https://bugs.webkit.org/show_bug.cgi?id=43396
+
+ * DumpRenderTree/chromium/CppVariant.h:
+ Remove base/basictypes.h because webkit_support.h contains it.
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (getCurrentEventTimeSec): Use new wrapper function.
+ * DumpRenderTree/chromium/TestNavigationController.h:
+ Remove base/basictypes.h because webkit_support.h contains it.
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (dumpHistoryItem): Use new wrapper function.
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::cancelledError): Use new wrapper function.
+ (WebViewHost::didFailResourceLoad): Use new wrapper function.
+
2010-08-02 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebKitTools/DumpRenderTree/chromium/CppVariant.h b/WebKitTools/DumpRenderTree/chromium/CppVariant.h
index d34a163..3aa5abb 100644
--- a/WebKitTools/DumpRenderTree/chromium/CppVariant.h
+++ b/WebKitTools/DumpRenderTree/chromium/CppVariant.h
@@ -42,8 +42,8 @@
#ifndef CppVariant_h
#define CppVariant_h
-#include "base/basictypes.h"
#include "public/WebBindings.h"
+#include "webkit/support/webkit_support.h"
#include <string>
#include <wtf/Vector.h>
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 4e84c96..4c5520a 100644
--- a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
@@ -45,7 +45,6 @@
#include "TestShell.h"
#include "base/keyboard_codes.h"
-#include "base/time.h"
#include "public/WebDragData.h"
#include "public/WebDragOperation.h"
#include "public/WebPoint.h"
@@ -124,7 +123,7 @@ static uint32 timeOffsetMs = 0;
static double getCurrentEventTimeSec()
{
- return (TimeTicks::Now().ToInternalValue() / Time::kMicrosecondsPerMillisecond + timeOffsetMs) / 1000.0;
+ return (webkit_support::GetCurrentTimeInMillisecond() + timeOffsetMs) / 1000.0;
}
static void advanceEventTime(int32_t deltaMs)
diff --git a/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h b/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h
index bd3c2f4..5a80550 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h
+++ b/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h
@@ -31,12 +31,12 @@
#ifndef TestNavigationController_h
#define TestNavigationController_h
-#include "base/basictypes.h"
#include "base/linked_ptr.h"
#include "public/WebDataSource.h"
#include "public/WebHistoryItem.h"
#include "public/WebString.h"
#include "public/WebURL.h"
+#include "webkit/support/webkit_support.h"
#include <string>
#include <wtf/Vector.h>
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 507f084..bcb503c 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -38,7 +38,6 @@
#include "base/md5.h" // FIXME: Wrap by webkit_support.
#include "base/string16.h"
#include "gfx/codec/png_codec.h" // FIXME: Remove dependecy. WebCore/platform/image-encoder is better?
-#include "net/base/escape.h" // FIXME: Remove dependency.
#include "public/WebDataSource.h"
#include "public/WebDocument.h"
#include "public/WebElement.h"
@@ -422,7 +421,7 @@ static string dumpHistoryItem(const WebHistoryItem& item, int indent, bool isCur
url.replace(0, pos + layoutTestsPatternSize, fileTestPrefix);
} else if (!url.find(dataUrlPattern)) {
// URL-escape data URLs to match results upstream.
- string path = EscapePath(url.substr(dataUrlPatternSize));
+ string path = webkit_support::EscapePath(url.substr(dataUrlPatternSize));
url.replace(dataUrlPatternSize, url.length(), path);
}
diff --git a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
index c57aeb5..ed37a31 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -35,7 +35,6 @@
#include "TestNavigationController.h"
#include "TestShell.h"
#include "TestWebWorker.h"
-#include "net/base/net_errors.h" // FIXME: can we remove this?
#include "public/WebCString.h"
#include "public/WebConsoleMessage.h"
#include "public/WebContextMenuData.h"
@@ -166,35 +165,6 @@ static void printResponseDescription(const WebURLResponse& response)
response.httpStatusCode());
}
-static void printErrorDescription(const WebURLError& error)
-{
- string domain = error.domain.utf8();
- int code = error.reason;
-
- if (domain == net::kErrorDomain) {
- domain = "NSURLErrorDomain";
- switch (error.reason) {
- case net::ERR_ABORTED:
- code = -999;
- break;
- case net::ERR_UNSAFE_PORT:
- // Our unsafe port checking happens at the network stack level, but we
- // make this translation here to match the behavior of stock WebKit.
- domain = "WebKitErrorDomain";
- code = 103;
- break;
- case net::ERR_ADDRESS_INVALID:
- case net::ERR_ADDRESS_UNREACHABLE:
- code = -1004;
- break;
- }
- } else
- LOG_ERROR("Unknown error domain");
-
- printf("<NSError domain %s, code %d, failing URL \"%s\">",
- domain.c_str(), code, error.unreachableURL.spec().data());
-}
-
static void printNodeDescription(const WebNode& node, int exception)
{
if (exception) {
@@ -715,11 +685,7 @@ WebURLError WebViewHost::cannotHandleRequestError(WebFrame*, const WebURLRequest
WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request)
{
- WebURLError error;
- error.domain = WebString::fromUTF8(net::kErrorDomain);
- error.reason = net::ERR_ABORTED;
- error.unreachableURL = request.url();
- return error;
+ return webkit_support::CreateCancelledError(request);
}
void WebViewHost::unableToImplementPolicyWithError(WebFrame* frame, const WebURLError& error)
@@ -960,7 +926,7 @@ void WebViewHost::didFailResourceLoad(WebFrame*, unsigned identifier, const WebU
if (m_shell->shouldDumpResourceLoadCallbacks()) {
printResourceDescription(identifier);
fputs(" - didFailLoadingWithError: ", stdout);
- printErrorDescription(error);
+ fputs(webkit_support::MakeURLErrorDescription(error).c_str(), stdout);
fputs("\n", stdout);
}
m_resourceIdentifierMap.remove(identifier);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list