Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

Issue 16140020: Delete NetworkingContext and its subclasses. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 14 matching lines...) Expand all
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "config.h" 32 #include "config.h"
33 #include "FrameLoaderClientImpl.h" 33 #include "FrameLoaderClientImpl.h"
34 34
35 #include "FrameNetworkingContextImpl.h"
36 #include "HTMLNames.h" 35 #include "HTMLNames.h"
37 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
38 #include "core/dom/MessageEvent.h" 37 #include "core/dom/MessageEvent.h"
39 #include "core/dom/MouseEvent.h" 38 #include "core/dom/MouseEvent.h"
40 #include "core/history/HistoryItem.h" 39 #include "core/history/HistoryItem.h"
41 #include "core/html/HTMLAppletElement.h" 40 #include "core/html/HTMLAppletElement.h"
42 #include "core/html/HTMLFormElement.h" // needed by core/loader/FormState.h 41 #include "core/html/HTMLFormElement.h" // needed by core/loader/FormState.h
43 #include "core/loader/DocumentLoader.h" 42 #include "core/loader/DocumentLoader.h"
44 #include "core/loader/FormState.h" 43 #include "core/loader/FormState.h"
45 #include "core/loader/FrameLoadRequest.h" 44 #include "core/loader/FrameLoadRequest.h"
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 m_webFrame->frame()->loader()->activeDocumentLoader()); 1289 m_webFrame->frame()->loader()->activeDocumentLoader());
1291 if (!ds) { 1290 if (!ds) {
1292 // We can arrive here if a popstate event handler detaches this frame. 1291 // We can arrive here if a popstate event handler detaches this frame.
1293 // FIXME: Remove this code once http://webkit.org/b/36202 is fixed. 1292 // FIXME: Remove this code once http://webkit.org/b/36202 is fixed.
1294 ASSERT(!m_webFrame->frame()->page()); 1293 ASSERT(!m_webFrame->frame()->page());
1295 return nullptr; 1294 return nullptr;
1296 } 1295 }
1297 return ds->releasePluginLoadObserver(); 1296 return ds->releasePluginLoadObserver();
1298 } 1297 }
1299 1298
1300 PassRefPtr<FrameNetworkingContext> FrameLoaderClientImpl::createNetworkingContex t() 1299 WebCookieJar* FrameLoaderClientImpl::cookieJar() const
1301 { 1300 {
1302 return FrameNetworkingContextImpl::create(m_webFrame->frame()); 1301 if (!m_webFrame->client())
1302 return 0;
1303 return m_webFrame->client()->cookieJar(m_webFrame);
1303 } 1304 }
1304 1305
1305 bool FrameLoaderClientImpl::willCheckAndDispatchMessageEvent( 1306 bool FrameLoaderClientImpl::willCheckAndDispatchMessageEvent(
1306 SecurityOrigin* target, MessageEvent* event) const 1307 SecurityOrigin* target, MessageEvent* event) const
1307 { 1308 {
1308 if (!m_webFrame->client()) 1309 if (!m_webFrame->client())
1309 return false; 1310 return false;
1310 1311
1311 WebFrame* source = 0; 1312 WebFrame* source = 0;
1312 if (event && event->source() && event->source()->document()) 1313 if (event && event->source() && event->source()->document())
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason); 1353 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason);
1353 } 1354 }
1354 1355
1355 void FrameLoaderClientImpl::dispatchWillInsertBody() 1356 void FrameLoaderClientImpl::dispatchWillInsertBody()
1356 { 1357 {
1357 if (m_webFrame->client()) 1358 if (m_webFrame->client())
1358 m_webFrame->client()->willInsertBody(m_webFrame); 1359 m_webFrame->client()->willInsertBody(m_webFrame);
1359 } 1360 }
1360 1361
1361 } // namespace WebKit 1362 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698