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

Side by Side Diff: sky/engine/core/loader/FrameLoader.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/loader/FrameLoader.h ('k') | sky/engine/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 17 matching lines...) Expand all
28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 28 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 29 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35 #include "sky/engine/config.h" 35 #include "sky/engine/config.h"
36 #include "sky/engine/core/loader/FrameLoader.h" 36 #include "sky/engine/core/loader/FrameLoader.h"
37 37
38 #include "sky/engine/bindings/core/v8/DOMWrapperWorld.h"
39 #include "sky/engine/bindings/core/v8/ScriptController.h"
40 #include "sky/engine/bindings/core/v8/SerializedScriptValue.h"
41 #include "sky/engine/core/dom/Document.h" 38 #include "sky/engine/core/dom/Document.h"
42 #include "sky/engine/core/dom/Element.h" 39 #include "sky/engine/core/dom/Element.h"
43 #include "sky/engine/core/editing/Editor.h" 40 #include "sky/engine/core/editing/Editor.h"
44 #include "sky/engine/core/editing/UndoStack.h" 41 #include "sky/engine/core/editing/UndoStack.h"
45 #include "sky/engine/core/events/PageTransitionEvent.h" 42 #include "sky/engine/core/events/PageTransitionEvent.h"
46 #include "sky/engine/core/fetch/FetchContext.h" 43 #include "sky/engine/core/fetch/FetchContext.h"
47 #include "sky/engine/core/fetch/ResourceFetcher.h" 44 #include "sky/engine/core/fetch/ResourceFetcher.h"
48 #include "sky/engine/core/fetch/ResourceLoader.h" 45 #include "sky/engine/core/fetch/ResourceLoader.h"
49 #include "sky/engine/core/frame/FrameHost.h" 46 #include "sky/engine/core/frame/FrameHost.h"
50 #include "sky/engine/core/frame/FrameView.h" 47 #include "sky/engine/core/frame/FrameView.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // still parsing. Failure to do so can cause a world leak. 155 // still parsing. Failure to do so can cause a world leak.
159 if (m_frame->document()->parsing()) 156 if (m_frame->document()->parsing())
160 stopLoading(); 157 stopLoading();
161 158
162 m_frame->document()->fetcher()->stopFetching(); 159 m_frame->document()->fetcher()->stopFetching();
163 160
164 m_inStopAllLoaders = false; 161 m_inStopAllLoaders = false;
165 } 162 }
166 163
167 } // namespace blink 164 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/loader/FrameLoader.h ('k') | sky/engine/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698