Changeset 64530 in webkit
- Timestamp:
- Aug 2, 2010 10:51:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r64513 r64530 1 2010-08-02 Kent Tamura <tkent@chromium.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 [DRT/Chromium] Remove dependencies to some Chromium headers 6 https://bugs.webkit.org/show_bug.cgi?id=43396 7 8 * DEPS: Update Chromium revision to 54649 in order to have a 9 webkit_support change (r54646) 10 1 11 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 12 -
trunk/WebKit/chromium/DEPS
r63956 r64530 33 33 vars = { 34 34 'chromium_svn': 'http://src.chromium.org/svn/trunk/src', 35 'chromium_rev': '5 3434',35 'chromium_rev': '54649', 36 36 } 37 37 -
trunk/WebKitTools/ChangeLog
r64524 r64530 1 2010-08-02 Kent Tamura <tkent@chromium.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 [DRT/Chromium] Remove dependencies to some Chromium headers 6 https://bugs.webkit.org/show_bug.cgi?id=43396 7 8 * DumpRenderTree/chromium/CppVariant.h: 9 Remove base/basictypes.h because webkit_support.h contains it. 10 * DumpRenderTree/chromium/EventSender.cpp: 11 (getCurrentEventTimeSec): Use new wrapper function. 12 * DumpRenderTree/chromium/TestNavigationController.h: 13 Remove base/basictypes.h because webkit_support.h contains it. 14 * DumpRenderTree/chromium/TestShell.cpp: 15 (dumpHistoryItem): Use new wrapper function. 16 * DumpRenderTree/chromium/WebViewHost.cpp: 17 (WebViewHost::cancelledError): Use new wrapper function. 18 (WebViewHost::didFailResourceLoad): Use new wrapper function. 19 1 20 2010-08-02 Martin Robinson <mrobinson@igalia.com> 2 21 -
trunk/WebKitTools/DumpRenderTree/chromium/CppVariant.h
r55563 r64530 43 43 #define CppVariant_h 44 44 45 #include "base/basictypes.h"46 45 #include "public/WebBindings.h" 46 #include "webkit/support/webkit_support.h" 47 47 #include <string> 48 48 #include <wtf/Vector.h> -
trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
r64470 r64530 46 46 #include "TestShell.h" 47 47 #include "base/keyboard_codes.h" 48 #include "base/time.h"49 48 #include "public/WebDragData.h" 50 49 #include "public/WebDragOperation.h" … … 125 124 static double getCurrentEventTimeSec() 126 125 { 127 return ( TimeTicks::Now().ToInternalValue() / Time::kMicrosecondsPerMillisecond+ timeOffsetMs) / 1000.0;126 return (webkit_support::GetCurrentTimeInMillisecond() + timeOffsetMs) / 1000.0; 128 127 } 129 128 -
trunk/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h
r56434 r64530 32 32 #define TestNavigationController_h 33 33 34 #include "base/basictypes.h"35 34 #include "base/linked_ptr.h" 36 35 #include "public/WebDataSource.h" … … 38 37 #include "public/WebString.h" 39 38 #include "public/WebURL.h" 39 #include "webkit/support/webkit_support.h" 40 40 #include <string> 41 41 #include <wtf/Vector.h> -
trunk/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
r63536 r64530 39 39 #include "base/string16.h" 40 40 #include "gfx/codec/png_codec.h" // FIXME: Remove dependecy. WebCore/platform/image-encoder is better? 41 #include "net/base/escape.h" // FIXME: Remove dependency.42 41 #include "public/WebDataSource.h" 43 42 #include "public/WebDocument.h" … … 423 422 } else if (!url.find(dataUrlPattern)) { 424 423 // URL-escape data URLs to match results upstream. 425 string path = EscapePath(url.substr(dataUrlPatternSize));424 string path = webkit_support::EscapePath(url.substr(dataUrlPatternSize)); 426 425 url.replace(dataUrlPatternSize, url.length(), path); 427 426 } -
trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp
r62749 r64530 36 36 #include "TestShell.h" 37 37 #include "TestWebWorker.h" 38 #include "net/base/net_errors.h" // FIXME: can we remove this?39 38 #include "public/WebCString.h" 40 39 #include "public/WebConsoleMessage.h" … … 167 166 } 168 167 169 static void printErrorDescription(const WebURLError& error)170 {171 string domain = error.domain.utf8();172 int code = error.reason;173 174 if (domain == net::kErrorDomain) {175 domain = "NSURLErrorDomain";176 switch (error.reason) {177 case net::ERR_ABORTED:178 code = -999;179 break;180 case net::ERR_UNSAFE_PORT:181 // Our unsafe port checking happens at the network stack level, but we182 // make this translation here to match the behavior of stock WebKit.183 domain = "WebKitErrorDomain";184 code = 103;185 break;186 case net::ERR_ADDRESS_INVALID:187 case net::ERR_ADDRESS_UNREACHABLE:188 code = -1004;189 break;190 }191 } else192 LOG_ERROR("Unknown error domain");193 194 printf("<NSError domain %s, code %d, failing URL \"%s\">",195 domain.c_str(), code, error.unreachableURL.spec().data());196 }197 198 168 static void printNodeDescription(const WebNode& node, int exception) 199 169 { … … 716 686 WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request) 717 687 { 718 WebURLError error; 719 error.domain = WebString::fromUTF8(net::kErrorDomain); 720 error.reason = net::ERR_ABORTED; 721 error.unreachableURL = request.url(); 722 return error; 688 return webkit_support::CreateCancelledError(request); 723 689 } 724 690 … … 961 927 printResourceDescription(identifier); 962 928 fputs(" - didFailLoadingWithError: ", stdout); 963 printErrorDescription(error);929 fputs(webkit_support::MakeURLErrorDescription(error).c_str(), stdout); 964 930 fputs("\n", stdout); 965 931 }
Note: See TracChangeset
for help on using the changeset viewer.