Changeset 112273 in webkit


Ignore:
Timestamp:
Mar 27, 2012 8:22:56 AM (12 years ago)
Author:
Carlos Garcia Campos
Message:

Implement WebFrameNetworkingContext for soup in WebKit2

[SOUP] Implement WebFrameNetworkingContext for soup in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=82081

Reviewed by Martin Robinson.

  • GNUmakefile.am: Add new files to compilation
  • WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.

(WebKit::WebFrameNetworkingContext::soupSession): Return the
default SoupSession.

  • WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.

(WebKit):
(WebFrameNetworkingContext):
(WebKit::WebFrameNetworkingContext::create): Create a new
WebFrameNetworkingContext().
(WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):

Location:
trunk/Source/WebKit2
Files:
1 added
2 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r112265 r112273  
     12012-03-27  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Implement WebFrameNetworkingContext for soup in WebKit2
     4
     5        [SOUP] Implement WebFrameNetworkingContext for soup in WebKit2
     6        https://bugs.webkit.org/show_bug.cgi?id=82081
     7
     8        Reviewed by Martin Robinson.
     9
     10        * GNUmakefile.am: Add new files to compilation
     11        * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.
     12        (WebKit::WebFrameNetworkingContext::soupSession): Return the
     13        default SoupSession.
     14        * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.
     15        (WebKit):
     16        (WebFrameNetworkingContext):
     17        (WebKit::WebFrameNetworkingContext::create): Create a new
     18        WebFrameNetworkingContext().
     19        (WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
     20
    1212012-03-27  Yael Aharon  <yael.aharon@nokia.com>
    222
  • trunk/Source/WebKit2/GNUmakefile.am

    r112221 r112273  
    910910        Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp \
    911911        Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp \
    912         Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h \
    913912        Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp \
     913        Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp \
     914        Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h \
    914915        Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
    915916        Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
     
    10461047        -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport \
    10471048        -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/gtk \
     1049        -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/soup \
    10481050        -I$(srcdir)/Source/WebKit2/WebProcess/WebPage \
    10491051        -I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp

    r112272 r112273  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
    3  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     2 * Copyright (C) 2012 Igalia S.L.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2524 */
    2625
    27 #ifndef WebFrameNetworkingContext_h
    28 #define WebFrameNetworkingContext_h
     26#include "config.h"
     27#include "WebFrameNetworkingContext.h"
    2928
    30 #include "WebFrame.h"
     29#include <WebCore/ResourceHandle.h>
    3130
    32 #include <WebCore/FrameNetworkingContext.h>
     31using namespace WebCore;
    3332
    34 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
    35 public:
    36     static PassRefPtr<WebFrameNetworkingContext> create(WebKit::WebFrame*)
    37     {
    38         return 0;
    39     }
     33namespace WebKit {
    4034
    41 private:
    42     WebFrameNetworkingContext(WebKit::WebFrame* frame)
    43         : WebCore::FrameNetworkingContext(frame->coreFrame())
    44     {
    45     }
     35SoupSession* WebFrameNetworkingContext::soupSession() const
     36{
     37    return ResourceHandle::defaultSession();
     38}
    4639
    47     virtual WTF::String userAgent() const;
    48     virtual WTF::String referrer() const;
     40}
    4941
    50     WTF::String m_userAgent;
    51 };
    52 
    53 #endif // WebFrameNetworkingContext_h
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h

    r112272 r112273  
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    33 * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
     4 * Copyright (C) 2012 Igalia S.L.
    45 *
    56 * Redistribution and use in source and binary forms, with or without
     
    3233#include <WebCore/FrameNetworkingContext.h>
    3334
     35namespace WebKit {
     36
    3437class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
    3538public:
    36     static PassRefPtr<WebFrameNetworkingContext> create(WebKit::WebFrame*)
     39    static PassRefPtr<WebFrameNetworkingContext> create(WebFrame* frame)
    3740    {
    38         return 0;
     41        return adoptRef(new WebFrameNetworkingContext(frame));
    3942    }
    4043
    4144private:
    42     WebFrameNetworkingContext(WebKit::WebFrame* frame)
     45    WebFrameNetworkingContext(WebFrame* frame)
    4346        : WebCore::FrameNetworkingContext(frame->coreFrame())
    4447    {
    4548    }
    4649
    47     virtual WTF::String userAgent() const;
    48     virtual WTF::String referrer() const;
    49 
    50     WTF::String m_userAgent;
     50    virtual SoupSession* soupSession() const;
    5151};
    5252
     53}
     54
    5355#endif // WebFrameNetworkingContext_h
Note: See TracChangeset for help on using the changeset viewer.