Changeset 112273 in webkit
- Timestamp:
- Mar 27, 2012 8:22:56 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 1 added
- 2 edited
- 1 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r112265 r112273 1 2012-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 1 21 2012-03-27 Yael Aharon <yael.aharon@nokia.com> 2 22 -
trunk/Source/WebKit2/GNUmakefile.am
r112221 r112273 910 910 Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp \ 911 911 Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp \ 912 Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h \913 912 Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp \ 913 Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp \ 914 Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h \ 914 915 Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \ 915 916 Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \ … … 1046 1047 -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport \ 1047 1048 -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/gtk \ 1049 -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/soup \ 1048 1050 -I$(srcdir)/Source/WebKit2/WebProcess/WebPage \ 1049 1051 -I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \ -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
r112272 r112273 1 1 /* 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. 4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 25 24 */ 26 25 27 #i fndef WebFrameNetworkingContext_h28 # define WebFrameNetworkingContext_h26 #include "config.h" 27 #include "WebFrameNetworkingContext.h" 29 28 30 #include "WebFrame.h"29 #include <WebCore/ResourceHandle.h> 31 30 32 #include <WebCore/FrameNetworkingContext.h> 31 using namespace WebCore; 33 32 34 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext { 35 public: 36 static PassRefPtr<WebFrameNetworkingContext> create(WebKit::WebFrame*) 37 { 38 return 0; 39 } 33 namespace WebKit { 40 34 41 private: 42 WebFrameNetworkingContext(WebKit::WebFrame* frame) 43 : WebCore::FrameNetworkingContext(frame->coreFrame()) 44 { 45 } 35 SoupSession* WebFrameNetworkingContext::soupSession() const 36 { 37 return ResourceHandle::defaultSession(); 38 } 46 39 47 virtual WTF::String userAgent() const; 48 virtual WTF::String referrer() const; 40 } 49 41 50 WTF::String m_userAgent;51 };52 53 #endif // WebFrameNetworkingContext_h -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h
r112272 r112273 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 3 * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. 4 * Copyright (C) 2012 Igalia S.L. 4 5 * 5 6 * Redistribution and use in source and binary forms, with or without … … 32 33 #include <WebCore/FrameNetworkingContext.h> 33 34 35 namespace WebKit { 36 34 37 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext { 35 38 public: 36 static PassRefPtr<WebFrameNetworkingContext> create(Web Kit::WebFrame*)39 static PassRefPtr<WebFrameNetworkingContext> create(WebFrame* frame) 37 40 { 38 return 0;41 return adoptRef(new WebFrameNetworkingContext(frame)); 39 42 } 40 43 41 44 private: 42 WebFrameNetworkingContext(Web Kit::WebFrame* frame)45 WebFrameNetworkingContext(WebFrame* frame) 43 46 : WebCore::FrameNetworkingContext(frame->coreFrame()) 44 47 { 45 48 } 46 49 47 virtual WTF::String userAgent() const; 48 virtual WTF::String referrer() const; 49 50 WTF::String m_userAgent; 50 virtual SoupSession* soupSession() const; 51 51 }; 52 52 53 } 54 53 55 #endif // WebFrameNetworkingContext_h
Note: See TracChangeset
for help on using the changeset viewer.