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

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

Issue 334283004: Rename DOMWindow to LocalDOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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
« no previous file with comments | « Source/core/loader/DocumentWriter.cpp ('k') | Source/core/page/CreateWindow.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 30 matching lines...) Expand all
41 #include "core/HTMLNames.h" 41 #include "core/HTMLNames.h"
42 #include "core/dom/Document.h" 42 #include "core/dom/Document.h"
43 #include "core/dom/Element.h" 43 #include "core/dom/Element.h"
44 #include "core/dom/ViewportDescription.h" 44 #include "core/dom/ViewportDescription.h"
45 #include "core/editing/Editor.h" 45 #include "core/editing/Editor.h"
46 #include "core/editing/UndoStack.h" 46 #include "core/editing/UndoStack.h"
47 #include "core/events/PageTransitionEvent.h" 47 #include "core/events/PageTransitionEvent.h"
48 #include "core/fetch/FetchContext.h" 48 #include "core/fetch/FetchContext.h"
49 #include "core/fetch/ResourceFetcher.h" 49 #include "core/fetch/ResourceFetcher.h"
50 #include "core/fetch/ResourceLoader.h" 50 #include "core/fetch/ResourceLoader.h"
51 #include "core/frame/DOMWindow.h" 51 #include "core/frame/LocalDOMWindow.h"
52 #include "core/frame/FrameHost.h" 52 #include "core/frame/FrameHost.h"
53 #include "core/frame/FrameView.h" 53 #include "core/frame/FrameView.h"
54 #include "core/frame/LocalFrame.h" 54 #include "core/frame/LocalFrame.h"
55 #include "core/frame/PinchViewport.h" 55 #include "core/frame/PinchViewport.h"
56 #include "core/frame/csp/ContentSecurityPolicy.h" 56 #include "core/frame/csp/ContentSecurityPolicy.h"
57 #include "core/html/HTMLFormElement.h" 57 #include "core/html/HTMLFormElement.h"
58 #include "core/html/HTMLFrameOwnerElement.h" 58 #include "core/html/HTMLFrameOwnerElement.h"
59 #include "core/html/parser/HTMLParserIdioms.h" 59 #include "core/html/parser/HTMLParserIdioms.h"
60 #include "core/inspector/InspectorController.h" 60 #include "core/inspector/InspectorController.h"
61 #include "core/inspector/InspectorInstrumentation.h" 61 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 m_frame->page()->chrome().client().needTouchEvents(false); 901 m_frame->page()->chrome().client().needTouchEvents(false);
902 902
903 client()->transitionToCommittedForNewPage(); 903 client()->transitionToCommittedForNewPage();
904 m_frame->navigationScheduler().cancel(); 904 m_frame->navigationScheduler().cancel();
905 m_frame->editor().clearLastEditCommand(); 905 m_frame->editor().clearLastEditCommand();
906 906
907 // If we are still in the process of initializing an empty document then 907 // If we are still in the process of initializing an empty document then
908 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText 908 // its frame is not in a consistent state for rendering, so avoid setJSStatu sBarText
909 // since it may cause clients to attempt to render the frame. 909 // since it may cause clients to attempt to render the frame.
910 if (!m_stateMachine.creatingInitialEmptyDocument()) { 910 if (!m_stateMachine.creatingInitialEmptyDocument()) {
911 DOMWindow* window = m_frame->domWindow(); 911 LocalDOMWindow* window = m_frame->domWindow();
912 window->setStatus(String()); 912 window->setStatus(String());
913 window->setDefaultStatus(String()); 913 window->setDefaultStatus(String());
914 } 914 }
915 started(); 915 started();
916 } 916 }
917 917
918 bool FrameLoader::isLoadingMainFrame() const 918 bool FrameLoader::isLoadingMainFrame() const
919 { 919 {
920 return m_frame->isMainFrame(); 920 return m_frame->isMainFrame();
921 } 921 }
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1474 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1475 Frame* parentFrame = m_frame->tree().parent(); 1475 Frame* parentFrame = m_frame->tree().parent();
1476 if (parentFrame && parentFrame->isLocalFrame()) 1476 if (parentFrame && parentFrame->isLocalFrame())
1477 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1477 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1478 if (FrameOwner* frameOwner = m_frame->owner()) 1478 if (FrameOwner* frameOwner = m_frame->owner())
1479 flags |= frameOwner->sandboxFlags(); 1479 flags |= frameOwner->sandboxFlags();
1480 return flags; 1480 return flags;
1481 } 1481 }
1482 1482
1483 } // namespace WebCore 1483 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentWriter.cpp ('k') | Source/core/page/CreateWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698