Changeset 66794 in webkit
- Timestamp:
- Sep 4, 2010 7:48:30 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 34 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r66791 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Create and provide access to NetworkingContext in FrameLoader. 9 10 In the WebKit layer we added specific implementations of FrameNetworkingContext 11 so each port's FrameLoaderClient can add any port specific information to NetworkingContext 12 The NetworkingContext is, therefore, created by a FrameLoaderClient and stored 13 in the FrameLoader for each frame created. People must always use it 14 by calling FrameLoader::networkingContext() and never through their FrameLoaderClient. 15 The lifetime cycle of NetworkingContext is kept by a RefPtr, so the object is RefCounted. 16 17 It is still a preparation to NetworkingContext to be activated and 18 work for all ports. 19 20 * WebCore.exp.in: 21 * loader/EmptyClients.h: 22 (WebCore::EmptyFrameLoaderClient::createNetworkingContext): 23 * loader/FrameLoader.cpp: 24 (WebCore::FrameLoader::~FrameLoader): 25 (WebCore::FrameLoader::init): 26 (WebCore::FrameLoader::networkingContext): 27 * loader/FrameLoader.h: 28 * loader/FrameLoaderClient.h: 29 1 30 2010-09-03 Kinuko Yasuda <kinuko@chromium.org> 2 31 -
trunk/WebCore/WebCore.exp.in
r66721 r66794 857 857 __ZNK7WebCore11CachedImage5imageEv 858 858 __ZNK7WebCore11FrameLoader10isCompleteEv 859 __ZNK7WebCore11FrameLoader12blockedErrorERKNS_15ResourceRequestE 859 860 __ZNK7WebCore11FrameLoader14cancelledErrorERKNS_15ResourceRequestE 860 861 __ZNK7WebCore11FrameLoader14frameHasLoadedEv -
trunk/WebCore/loader/EmptyClients.h
r66746 r66794 41 41 #include "FocusDirection.h" 42 42 #include "FrameLoaderClient.h" 43 #include "FrameNetworkingContext.h" 43 44 #include "InspectorClient.h" 44 45 #include "PluginHalterClient.h" … … 367 368 #endif 368 369 370 virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() { return PassRefPtr<FrameNetworkingContext>(); } 369 371 }; 370 372 -
trunk/WebCore/loader/FrameLoader.cpp
r66710 r66794 59 59 #include "FrameLoadRequest.h" 60 60 #include "FrameLoaderClient.h" 61 #include "FrameNetworkingContext.h" 61 62 #include "FrameTree.h" 62 63 #include "FrameView.h" … … 217 218 218 219 m_client->frameLoaderDestroyed(); 220 221 if (m_networkingContext) 222 m_networkingContext->invalidate(); 219 223 } 220 224 … … 237 241 m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument); 238 242 m_didCallImplicitClose = true; 243 244 m_networkingContext = m_client->createNetworkingContext(); 239 245 } 240 246 … … 3448 3454 } 3449 3455 3456 NetworkingContext* FrameLoader::networkingContext() const 3457 { 3458 return m_networkingContext.get(); 3459 } 3460 3450 3461 bool FrameLoaderClient::hasHTMLView() const 3451 3462 { -
trunk/WebCore/loader/FrameLoader.h
r66677 r66794 63 63 class Frame; 64 64 class FrameLoaderClient; 65 class FrameNetworkingContext; 65 66 class HistoryItem; 66 67 class HTMLFormElement; 67 68 class IconLoader; 68 69 class NavigationAction; 70 class NetworkingContext; 69 71 class ProtectionSpace; 70 72 class ResourceError; … … 332 334 bool pageDismissalEventBeingDispatched() const { return m_pageDismissalEventBeingDispatched; } 333 335 336 inline NetworkingContext* networkingContext() const; 337 334 338 private: 335 339 bool canCachePageContainingThisFrame(); … … 498 502 bool m_didDispatchDidCommitLoad; 499 503 #endif 504 505 RefPtr<FrameNetworkingContext> m_networkingContext; 500 506 }; 501 507 -
trunk/WebCore/loader/FrameLoaderClient.h
r65021 r66794 53 53 class Frame; 54 54 class FrameLoader; 55 class FrameNetworkingContext; 55 56 class HistoryItem; 56 57 class HTMLAppletElement; … … 283 284 // This callback is similar, but for plugins. 284 285 virtual void didNotAllowPlugins() { } 286 287 virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() = 0; 285 288 }; 286 289 -
trunk/WebKit/chromium/ChangeLog
r66777 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add Chromium's implementation of NetworkingContext. 9 10 * src/FrameLoaderClientImpl.cpp: 11 (WebKit::FrameLoaderClientImpl::createNetworkingContext): 12 * src/FrameLoaderClientImpl.h: 13 1 14 2010-09-02 Vangelis Kokkevis <vangelis@chromium.org> 2 15 -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r65604 r66794 38 38 #include "FrameLoader.h" 39 39 #include "FrameLoadRequest.h" 40 #include "FrameNetworkingContextImpl.h" 40 41 #include "FrameView.h" 41 42 #include "HTTPParsers.h" … … 1513 1514 } 1514 1515 1516 PassRefPtr<FrameNetworkingContext> FrameLoaderClientImpl::createNetworkingContext() 1517 { 1518 return FrameNetworkingContextImpl::create(m_webFrame->frame()); 1519 } 1520 1515 1521 } // namespace WebKit -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.h
r65021 r66794 199 199 virtual void didNotAllowPlugins(); 200 200 201 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 202 201 203 private: 202 204 void makeDocumentView(); -
trunk/WebKit/efl/ChangeLog
r66738 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add createNetworkingContext to EFL's FrameLoaderClient. 9 10 * WebCoreSupport/FrameLoaderClientEfl.cpp: 11 (WebCore::FrameLoaderClientEfl::createNetworkingContext): 12 * WebCoreSupport/FrameLoaderClientEfl.h: 13 1 14 2010-09-03 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 15 -
trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r65163 r66794 40 40 #include "FormState.h" 41 41 #include "FrameLoader.h" 42 #include "FrameNetworkingContext.h" 42 43 #include "FrameTree.h" 43 44 #include "FrameView.h" … … 946 947 } 947 948 948 } 949 PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext() 950 { 951 return FrameNetworkingContext::create(core(m_webFrame.get())); 952 } 953 954 } -
trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
r62666 r66794 203 203 virtual bool canCachePage() const; 204 204 virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&); 205 206 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 205 207 private: 206 208 Evas_Object *m_view; -
trunk/WebKit/gtk/ChangeLog
r66725 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add GTK's specific implementation of FrameNetworkingContext. 9 10 * WebCoreSupport/FrameLoaderClientGtk.cpp: 11 (WebKit::FrameLoaderClient::createNetworkingContext): 12 * WebCoreSupport/FrameLoaderClientGtk.h: 13 1 14 2010-09-03 Xan Lopez <xlopez@igalia.com> 2 15 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r66024 r66794 33 33 #include "FormState.h" 34 34 #include "FrameLoader.h" 35 #include "FrameNetworkingContextGtk.h" 35 36 #include "FrameView.h" 36 37 #include "FrameTree.h" … … 1194 1195 } 1195 1196 1196 } 1197 PassRefPtr<FrameNetworkingContext> FrameLoaderClient::createNetworkingContext() 1198 { 1199 return FrameNetworkingContextGtk::create(core(m_frame)); 1200 } 1201 1202 } -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r65021 r66794 182 182 virtual bool canCachePage() const; 183 183 virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&); 184 185 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 186 184 187 private: 185 188 WebKitWebFrame* m_frame; -
trunk/WebKit/mac/ChangeLog
r66733 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add Mac's specific implementation of FrameNetworkingContext. 9 10 * WebCoreSupport/WebFrameLoaderClient.h: 11 * WebCoreSupport/WebFrameLoaderClient.mm: 12 * WebCoreSupport/WebFrameNetworkingContext.mm: 13 (WebFrameNetworkingContext::needsSiteSpecificQuirks): 14 (WebFrameNetworkingContext::localFileContentSniffingEnabled): 15 (WebFrameNetworkingContext::scheduledRunLoopPairs): 16 (WebFrameNetworkingContext::blockedError): 17 1 18 2010-09-03 John Sullivan <sullivan@apple.com> 2 19 -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
r65021 r66794 229 229 virtual bool canCachePage() const; 230 230 231 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 232 231 233 RetainPtr<WebFrame> m_webFrame; 232 234 -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r66577 r66794 48 48 #import "WebFrameInternal.h" 49 49 #import "WebFrameLoadDelegate.h" 50 #import "WebFrameNetworkingContext.h" 50 51 #import "WebFrameViewInternal.h" 51 52 #import "WebHTMLRepresentationPrivate.h" … … 1905 1906 } 1906 1907 1908 PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext() 1909 { 1910 return WebFrameNetworkingContext::create(core(m_webFrame.get())); 1911 } 1912 1907 1913 #if ENABLE(JAVA_BRIDGE) 1908 1914 jobject WebFrameLoaderClient::javaApplet(NSView* view) -
trunk/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm
r65579 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #import "WebFrameNetworkingContext.h" 21 22 #import <WebCore/Page.h> 23 #import <WebCore/ResourceError.h> 24 #import <WebCore/Settings.h> 25 26 using namespace WebCore; 27 28 bool WebFrameNetworkingContext::needsSiteSpecificQuirks() const 29 { 30 return frame() && frame()->settings() && frame()->settings()->needsSiteSpecificQuirks(); 31 } 32 33 bool WebFrameNetworkingContext::localFileContentSniffingEnabled() const 34 { 35 return frame() && frame()->settings() && frame()->settings()->localFileContentSniffingEnabled(); 36 } 37 38 SchedulePairHashSet* WebFrameNetworkingContext::scheduledRunLoopPairs() const 39 { 40 return frame() && frame()->page() ? frame()->page()->scheduledRunLoopPairs() : 0; 41 } 42 43 ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const 44 { 45 return frame()->loader()->blockedError(request); 46 } -
trunk/WebKit/qt/ChangeLog
r66720 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add Qt's specific implementation of NetworkingContext. 9 10 * WebCoreSupport/FrameLoaderClientQt.cpp: 11 (WebCore::FrameLoaderClientQt::setFrame): 12 (WebCore::FrameLoaderClientQt::createNetworkingContext): 13 * WebCoreSupport/FrameLoaderClientQt.h: 14 * WebCoreSupport/FrameNetworkingContextQt.cpp: 15 (WebCore::FrameNetworkingContextQt::FrameNetworkingContextQt): 16 (WebCore::FrameNetworkingContextQt::create): 17 (WebCore::FrameNetworkingContextQt::originatingObject): 18 (WebCore::FrameNetworkingContextQt::networkAccessManager): 19 1 20 2010-09-02 Yury Semikhatsky <yurys@chromium.org> 2 21 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r66030 r66794 36 36 #include "FormState.h" 37 37 #include "FrameLoaderClientQt.h" 38 #include "FrameNetworkingContextQt.h" 38 39 #include "FrameTree.h" 39 40 #include "FrameView.h" … … 205 206 m_webFrame = webFrame; 206 207 m_frame = frame; 208 207 209 if (!m_webFrame || !m_webFrame->page()) { 208 210 qWarning("FrameLoaderClientQt::setFrame frame without Page!"); … … 1520 1522 } 1521 1523 1524 PassRefPtr<FrameNetworkingContext> FrameLoaderClientQt::createNetworkingContext() 1525 { 1526 return FrameNetworkingContextQt::create(m_frame, m_webFrame, m_webFrame->page()->networkAccessManager()); 1527 } 1528 1522 1529 } 1523 1530 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
r65708 r66794 36 36 #include "FrameLoaderClient.h" 37 37 #include "KURL.h" 38 #include <wtf/OwnPtr.h> 38 39 #include "PluginView.h" 39 40 #include "RefCounted.h" … … 52 53 class FormState; 53 54 class NavigationAction; 55 class FrameNetworkingContext; 54 56 class ResourceLoader; 55 57 … … 214 216 QString chooseFile(const QString& oldFile); 215 217 218 virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext(); 219 216 220 static bool dumpFrameLoaderCallbacks; 217 221 static bool dumpResourceLoadCallbacks; -
trunk/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
r65579 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #include "config.h" 21 22 #include "FrameNetworkingContextQt.h" 23 24 #include <QNetworkAccessManager> 25 #include <QObject> 26 27 namespace WebCore { 28 29 FrameNetworkingContextQt::FrameNetworkingContextQt(Frame* frame, QObject* originatingObject, QNetworkAccessManager* networkAccessManager) 30 : FrameNetworkingContext(frame) 31 , m_originatingObject(originatingObject) 32 , m_networkAccessManager(networkAccessManager) 33 { 34 } 35 36 PassRefPtr<FrameNetworkingContextQt> FrameNetworkingContextQt::create(Frame* frame, QObject* originatingObject, QNetworkAccessManager* networkAccessManager) 37 { 38 return adoptRef(new FrameNetworkingContextQt(frame, originatingObject, networkAccessManager)); 39 } 40 41 QObject* FrameNetworkingContextQt::originatingObject() const 42 { 43 return m_originatingObject; 44 } 45 46 QNetworkAccessManager* FrameNetworkingContextQt::networkAccessManager() const 47 { 48 return m_networkAccessManager; 49 } 50 51 } -
trunk/WebKit/win/ChangeLog
r66767 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add Win's specific implementation of NetworkingContext. 9 10 * WebCoreSupport/WebFrameNetworkingContext.cpp: 11 (WebFrameNetworkingContext::create): 12 (WebFrameNetworkingContext::userAgent): 13 (WebFrameNetworkingContext::referrer): 14 * WebFrame.cpp: 15 (WebFrame::createNetworkingContext): 16 * WebFrame.h: 17 1 18 2010-09-03 Adam Roben <aroben@apple.com> 2 19 -
trunk/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp
r65579 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #include "config.h" 21 22 #include "WebFrameNetworkingContext.h" 23 24 using namespace WebCore; 25 26 PassRefPtr<WebFrameNetworkingContext> WebFrameNetworkingContext::create(Frame* frame, const String& userAgent) 27 { 28 return adoptRef(new WebFrameNetworkingContext(frame, userAgent)); 29 } 30 31 String WebFrameNetworkingContext::userAgent() const 32 { 33 return m_userAgent; 34 } 35 36 String WebFrameNetworkingContext::referrer() const 37 { 38 return frame()->loader()->referrer(); 39 } -
trunk/WebKit/win/WebFrame.cpp
r66580 r66794 43 43 #include "WebEditorClient.h" 44 44 #include "WebError.h" 45 #include "WebFrameNetworkingContext.h" 45 46 #include "WebFramePolicyListener.h" 46 47 #include "WebHistory.h" … … 2615 2616 } 2616 2617 2618 PassRefPtr<FrameNetworkingContext> WebFrame::createNetworkingContext() 2619 { 2620 return WebFrameNetworkingContext::create(core(this), userAgent(url())); 2621 } -
trunk/WebKit/win/WebFrame.h
r65107 r66794 344 344 virtual void registerForIconNotification(bool listen); 345 345 346 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 347 346 348 // WebFrame 347 349 PassRefPtr<WebCore::Frame> init(IWebView*, WebCore::Page*, WebCore::HTMLFrameOwnerElement*); -
trunk/WebKit2/ChangeLog
r66790 r66794 1 2010-09-03 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> 2 3 Reviewed by Darin Adler. 4 5 Add NetworkingContext to avoid layer violations 6 https://bugs.webkit.org/show_bug.cgi?id=42292 7 8 Add FrameNetworkingContext implementation. 9 10 * WebKit2.pro: 11 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 12 (WebKit::WebFrameLoaderClient::createNetworkingContext): 13 * WebProcess/WebCoreSupport/WebFrameLoaderClient.h: 14 * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: 15 (WebKit::WebFrameNetworkingContext::needsSiteSpecificQuirks): 16 (WebKit::WebFrameNetworkingContext::localFileContentSniffingEnabled): 17 (WebKit::WebFrameNetworkingContext::scheduledRunLoopPairs): 18 (WebKit::WebFrameNetworkingContext::blockedError): 19 * WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp: Added. 20 (WebCore::WebFrameNetworkingContext::WebFrameNetworkingContext): 21 (WebCore::WebFrameNetworkingContext::create): 22 (WebCore::WebFrameNetworkingContext::originatingObject): 23 (WebCore::WebFrameNetworkingContext::networkAccessManager): 24 * WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h: Added. 25 * WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp: Added. 26 * WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h: Added. 27 (WebFrameNetworkingContext::create): 28 (WebFrameNetworkingContext::WebFrameNetworkingContext): 29 * win/WebKit2.vcproj: 30 * win/WebKit2Common.vsprops: 31 1 32 2010-09-03 Sam Weinig <sam@webkit.org> 2 33 -
trunk/WebKit2/WebKit2.pro
r66688 r66794 124 124 WebProcess/Plugins/Netscape \ 125 125 WebProcess/WebCoreSupport \ 126 WebProcess/WebCoreSupport/qt \ 126 127 WebProcess/WebPage \ 127 128 $$INCLUDEPATH … … 251 252 WebProcess/WebCoreSupport/WebPopupMenu.h \ 252 253 WebProcess/WebCoreSupport/WebSearchPopupMenu.h \ 254 WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h \ 253 255 WebProcess/WebPage/ChunkedUpdateDrawingArea.h \ 254 256 WebProcess/WebPage/DrawingArea.h \ … … 359 361 WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \ 360 362 WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \ 363 WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp \ 361 364 WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \ 362 365 WebProcess/WebPage/DrawingArea.cpp \ -
trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r66789 r66794 36 36 #include "WebEvent.h" 37 37 #include "WebFrame.h" 38 #include "WebFrameNetworkingContext.h" 38 39 #include "WebNavigationDataStore.h" 39 40 #include "WebPage.h" … … 1051 1052 } 1052 1053 1054 PassRefPtr<FrameNetworkingContext> WebFrameLoaderClient::createNetworkingContext() 1055 { 1056 return WebFrameNetworkingContext::create(m_frame->coreFrame()); 1057 } 1058 1053 1059 } // namespace WebKit -
trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
r65021 r66794 205 205 206 206 void receivedData(const char* data, int length, const WTF::String& textEncoding); 207 208 virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext(); 207 209 208 210 WebFrame* m_frame; -
trunk/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
r65579 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #import "WebFrameNetworkingContext.h" 21 22 #import <WebCore/Page.h> 23 #import <WebCore/ResourceError.h> 24 #import <WebCore/Settings.h> 25 26 using namespace WebCore; 27 28 namespace WebKit { 29 30 bool WebFrameNetworkingContext::needsSiteSpecificQuirks() const 31 { 32 return frame() && frame()->settings() && frame()->settings()->needsSiteSpecificQuirks(); 33 } 34 35 bool WebFrameNetworkingContext::localFileContentSniffingEnabled() const 36 { 37 return frame() && frame()->settings() && frame()->settings()->localFileContentSniffingEnabled(); 38 } 39 40 SchedulePairHashSet* WebFrameNetworkingContext::scheduledRunLoopPairs() const 41 { 42 return frame() && frame()->page() ? frame()->page()->scheduledRunLoopPairs() : 0; 43 } 44 45 ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const 46 { 47 return frame()->loader()->blockedError(request); 48 } 49 50 } -
trunk/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
r66793 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #ifndef WebFrameNetworkingContext_h 21 #define WebFrameNetworkingContext_h 22 23 #include <WebCore/FrameNetworkingContext.h> 24 25 namespace WebCore { 26 27 class WebFrameNetworkingContext : public FrameNetworkingContext { 28 public: 29 static PassRefPtr<WebFrameNetworkingContext> create(Frame*); 30 31 private: 32 WebFrameNetworkingContext(Frame*); 33 34 virtual QObject* originatingObject() const; 35 virtual QNetworkAccessManager* networkAccessManager() const; 36 37 QObject* m_originatingObject; 38 QNetworkAccessManager* m_networkAccessManager; 39 }; 40 41 } 42 43 #endif // WebFrameNetworkingContext_h -
trunk/WebKit2/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp
r66793 r66794 17 17 Boston, MA 02110-1301, USA. 18 18 */ 19 20 19 // Checking this file in empty to get the build system work out of the way. 21 20 // Will put the code in here later. -
trunk/WebKit2/WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.h
r66793 r66794 18 18 */ 19 19 20 // Checking this file in empty to get the build system work out of the way. 21 // Will put the code in here later. 20 #ifndef WebFrameNetworkingContext_h 21 #define WebFrameNetworkingContext_h 22 23 #include <WebCore/FrameNetworkingContext.h> 24 25 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext { 26 public: 27 static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame*) 28 { 29 return 0; 30 } 31 32 private: 33 WebFrameNetworkingContext(WebCore::Frame* frame) 34 : WebCore::FrameNetworkingContext(frame) 35 { 36 } 37 38 virtual WTF::String userAgent() const; 39 virtual WTF::String referrer() const; 40 41 WTF::String m_userAgent; 42 }; 43 44 #endif // WebFrameNetworkingContext_h -
trunk/WebKit2/win/WebKit2.vcproj
r66688 r66794 691 691 > 692 692 </File> 693 <File 694 RelativePath="..\WebProcess\WebCoreSupport\win\WebFrameNetworkingContext.cpp" 695 > 696 </File> 697 <File 698 RelativePath="..\WebProcess\WebCoreSupport\win\WebFrameNetworkingContext.h" 699 > 700 </File> 693 701 </Filter> 694 702 </Filter> -
trunk/WebKit2/win/WebKit2Common.vsprops
-
Property
svn:executable
set to
*
r64795 r66794 7 7 <Tool 8 8 Name="VCCLCompilerTool" 9 AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\Web Page";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders""9 AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(WebKitOutputDir)\Include";"$(WebKitOutputDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(WebKitOutputDir)\Include\JavaScriptCore";"$(WebKitOutputDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders"" 10 10 PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT" 11 11 UsePrecompiledHeader="2" -
Property
svn:executable
set to
Note: See TracChangeset
for help on using the changeset viewer.