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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 1333323003: SnapManager implementation using V8 Extras - {WIP} Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update with latest master Created 4 years, 5 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
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "core/loader/NetworkHintsInterface.h" 74 #include "core/loader/NetworkHintsInterface.h"
75 #include "core/loader/ProgressTracker.h" 75 #include "core/loader/ProgressTracker.h"
76 #include "core/loader/appcache/ApplicationCacheHost.h" 76 #include "core/loader/appcache/ApplicationCacheHost.h"
77 #include "core/origin_trials/OriginTrialContext.h" 77 #include "core/origin_trials/OriginTrialContext.h"
78 #include "core/page/ChromeClient.h" 78 #include "core/page/ChromeClient.h"
79 #include "core/page/CreateWindow.h" 79 #include "core/page/CreateWindow.h"
80 #include "core/page/FrameTree.h" 80 #include "core/page/FrameTree.h"
81 #include "core/page/Page.h" 81 #include "core/page/Page.h"
82 #include "core/page/WindowFeatures.h" 82 #include "core/page/WindowFeatures.h"
83 #include "core/page/scrolling/ScrollingCoordinator.h" 83 #include "core/page/scrolling/ScrollingCoordinator.h"
84 #include "core/page/scrolling/SnapCoordinator.h"
84 #include "core/svg/graphics/SVGImage.h" 85 #include "core/svg/graphics/SVGImage.h"
85 #include "core/xml/parser/XMLDocumentParser.h" 86 #include "core/xml/parser/XMLDocumentParser.h"
86 #include "platform/Logging.h" 87 #include "platform/Logging.h"
87 #include "platform/PluginScriptForbiddenScope.h" 88 #include "platform/PluginScriptForbiddenScope.h"
88 #include "platform/ScriptForbiddenScope.h" 89 #include "platform/ScriptForbiddenScope.h"
89 #include "platform/TraceEvent.h" 90 #include "platform/TraceEvent.h"
90 #include "platform/UserGestureIndicator.h" 91 #include "platform/UserGestureIndicator.h"
91 #include "platform/network/HTTPParsers.h" 92 #include "platform/network/HTTPParsers.h"
92 #include "platform/network/ResourceRequest.h" 93 #include "platform/network/ResourceRequest.h"
93 #include "platform/scroll/ScrollAnimatorBase.h" 94 #include "platform/scroll/ScrollAnimatorBase.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // clear() is called during (Local)Frame detachment or when 300 // clear() is called during (Local)Frame detachment or when
300 // reusing a FrameLoader by putting a new Document within it 301 // reusing a FrameLoader by putting a new Document within it
301 // (DocumentLoader::ensureWriter().) 302 // (DocumentLoader::ensureWriter().)
302 if (m_stateMachine.creatingInitialEmptyDocument()) 303 if (m_stateMachine.creatingInitialEmptyDocument())
303 return; 304 return;
304 305
305 m_frame->editor().clear(); 306 m_frame->editor().clear();
306 m_frame->document()->removeFocusedElementOfSubtree(m_frame->document()); 307 m_frame->document()->removeFocusedElementOfSubtree(m_frame->document());
307 m_frame->selection().prepareForDestruction(); 308 m_frame->selection().prepareForDestruction();
308 m_frame->eventHandler().clear(); 309 m_frame->eventHandler().clear();
310
309 if (m_frame->view()) 311 if (m_frame->view())
310 m_frame->view()->clear(); 312 m_frame->view()->clear();
311 313
312 m_frame->script().enableEval(); 314 m_frame->script().enableEval();
313 315
314 m_frame->navigationScheduler().cancel(); 316 m_frame->navigationScheduler().cancel();
315 317
316 m_checkTimer.stop(); 318 m_checkTimer.stop();
317 319
318 if (m_stateMachine.isDisplayingInitialEmptyDocument()) 320 if (m_stateMachine.isDisplayingInitialEmptyDocument())
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String()); 1626 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa der->url() : String());
1625 return tracedValue; 1627 return tracedValue;
1626 } 1628 }
1627 1629
1628 inline void FrameLoader::takeObjectSnapshot() const 1630 inline void FrameLoader::takeObjectSnapshot() const
1629 { 1631 {
1630 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value()); 1632 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced Value());
1631 } 1633 }
1632 1634
1633 } // namespace blink 1635 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/page/scrolling/SnapCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698