Changeset 68020 in webkit


Ignore:
Timestamp:
Sep 22, 2010 12:37:18 AM (14 years ago)
Author:
Patrick Gansterer
Message:

2010-09-22 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Roben.

[WIN] Add internetHandle to WebCoreSynchronousLoader.
https://bugs.webkit.org/show_bug.cgi?id=46185

For loading content via network the WebCoreSynchronousLoader needs its own (synchronous) internetHandle.
This also adds asynchronousInternetHandle() to create a static asynchronous internetHandle.

  • platform/network/win/ResourceHandleWin.cpp: (WebCore::createInternetHandle): (WebCore::asynchronousInternetHandle): (WebCore::WebCoreSynchronousLoader::internetHandle): (WebCore::WebCoreSynchronousLoader::WebCoreSynchronousLoader): Create synchronous internetHandle. (WebCore::WebCoreSynchronousLoader::~WebCoreSynchronousLoader): Delete synchronous internetHandle.
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r68019 r68020  
     12010-09-22  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        [WIN] Add internetHandle to WebCoreSynchronousLoader.
     6        https://bugs.webkit.org/show_bug.cgi?id=46185
     7
     8        For loading content via network the WebCoreSynchronousLoader needs its own (synchronous) internetHandle.
     9        This also adds asynchronousInternetHandle() to create a static asynchronous internetHandle.
     10
     11        * platform/network/win/ResourceHandleWin.cpp:
     12        (WebCore::createInternetHandle):
     13        (WebCore::asynchronousInternetHandle):
     14        (WebCore::WebCoreSynchronousLoader::internetHandle):
     15        (WebCore::WebCoreSynchronousLoader::WebCoreSynchronousLoader): Create synchronous internetHandle.
     16        (WebCore::WebCoreSynchronousLoader::~WebCoreSynchronousLoader): Delete synchronous internetHandle.
     17
    1182010-09-22  Kwang Yul Seo  <skyul@company100.net>
    219
  • trunk/WebCore/platform/network/win/ResourceHandleWin.cpp

    r67953 r68020  
    6666};
    6767
     68static inline HINTERNET createInternetHandle(const String& userAgent, bool asynchronous)
     69{
     70    String userAgentString = userAgent;
     71    HINTERNET internetHandle = InternetOpenW(userAgentString.charactersWithNullTermination(), INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, asynchronous ? INTERNET_FLAG_ASYNC : 0);
     72
     73    if (asynchronous)
     74        InternetSetStatusCallback(internetHandle, &ResourceHandle::internetStatusCallback);
     75
     76    return internetHandle;
     77}
     78
     79static HINTERNET asynchronousInternetHandle(const String& userAgent)
     80{
     81    static HINTERNET internetHandle = createInternetHandle(userAgent, true);
     82    return internetHandle;
     83}
     84
    6885static String queryHTTPHeader(HINTERNET requestHandle, DWORD infoLevel)
    6986{
     
    143160public:
    144161    WebCoreSynchronousLoader(ResourceError&, ResourceResponse&, Vector<char>&, const String& userAgent);
     162    ~WebCoreSynchronousLoader();
     163
     164    HINTERNET internetHandle() const { return m_internetHandle; }
    145165
    146166    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
     
    153173    ResourceResponse& m_response;
    154174    Vector<char>& m_data;
     175    HINTERNET m_internetHandle;
    155176};
    156177
     
    159180    , m_response(response)
    160181    , m_data(data)
    161 {
     182    , m_internetHandle(createInternetHandle(userAgent, false))
     183{
     184}
     185
     186WebCoreSynchronousLoader::~WebCoreSynchronousLoader()
     187{
     188    InternetCloseHandle(m_internetHandle);
    162189}
    163190
Note: See TracChangeset for help on using the changeset viewer.