Changeset 64530 in webkit


Ignore:
Timestamp:
Aug 2, 2010 10:51:34 PM (14 years ago)
Author:
tkent@chromium.org
Message:

[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.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r64513 r64530  
     12010-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
    1112010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    212
  • trunk/WebKit/chromium/DEPS

    r63956 r64530  
    3333vars = {
    3434  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
    35   'chromium_rev': '53434',
     35  'chromium_rev': '54649',
    3636}
    3737
  • trunk/WebKitTools/ChangeLog

    r64524 r64530  
     12010-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
    1202010-08-02  Martin Robinson  <mrobinson@igalia.com>
    221
  • trunk/WebKitTools/DumpRenderTree/chromium/CppVariant.h

    r55563 r64530  
    4343#define CppVariant_h
    4444
    45 #include "base/basictypes.h"
    4645#include "public/WebBindings.h"
     46#include "webkit/support/webkit_support.h"
    4747#include <string>
    4848#include <wtf/Vector.h>
  • trunk/WebKitTools/DumpRenderTree/chromium/EventSender.cpp

    r64470 r64530  
    4646#include "TestShell.h"
    4747#include "base/keyboard_codes.h"
    48 #include "base/time.h"
    4948#include "public/WebDragData.h"
    5049#include "public/WebDragOperation.h"
     
    125124static double getCurrentEventTimeSec()
    126125{
    127     return (TimeTicks::Now().ToInternalValue() / Time::kMicrosecondsPerMillisecond + timeOffsetMs) / 1000.0;
     126    return (webkit_support::GetCurrentTimeInMillisecond() + timeOffsetMs) / 1000.0;
    128127}
    129128
  • trunk/WebKitTools/DumpRenderTree/chromium/TestNavigationController.h

    r56434 r64530  
    3232#define TestNavigationController_h
    3333
    34 #include "base/basictypes.h"
    3534#include "base/linked_ptr.h"
    3635#include "public/WebDataSource.h"
     
    3837#include "public/WebString.h"
    3938#include "public/WebURL.h"
     39#include "webkit/support/webkit_support.h"
    4040#include <string>
    4141#include <wtf/Vector.h>
  • trunk/WebKitTools/DumpRenderTree/chromium/TestShell.cpp

    r63536 r64530  
    3939#include "base/string16.h"
    4040#include "gfx/codec/png_codec.h" // FIXME: Remove dependecy. WebCore/platform/image-encoder is better?
    41 #include "net/base/escape.h" // FIXME: Remove dependency.
    4241#include "public/WebDataSource.h"
    4342#include "public/WebDocument.h"
     
    423422    } else if (!url.find(dataUrlPattern)) {
    424423        // URL-escape data URLs to match results upstream.
    425         string path = EscapePath(url.substr(dataUrlPatternSize));
     424        string path = webkit_support::EscapePath(url.substr(dataUrlPatternSize));
    426425        url.replace(dataUrlPatternSize, url.length(), path);
    427426    }
  • trunk/WebKitTools/DumpRenderTree/chromium/WebViewHost.cpp

    r62749 r64530  
    3636#include "TestShell.h"
    3737#include "TestWebWorker.h"
    38 #include "net/base/net_errors.h" // FIXME: can we remove this?
    3938#include "public/WebCString.h"
    4039#include "public/WebConsoleMessage.h"
     
    167166}
    168167
    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 we
    182             // 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     } else
    192         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 
    198168static void printNodeDescription(const WebNode& node, int exception)
    199169{
     
    716686WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request)
    717687{
    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);
    723689}
    724690
     
    961927        printResourceDescription(identifier);
    962928        fputs(" - didFailLoadingWithError: ", stdout);
    963         printErrorDescription(error);
     929        fputs(webkit_support::MakeURLErrorDescription(error).c_str(), stdout);
    964930        fputs("\n", stdout);
    965931    }
Note: See TracChangeset for help on using the changeset viewer.