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

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

Issue 1187563005: Code cleanup in core/loader/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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/EmptyClients.h ('k') | Source/core/loader/LinkHeader.cpp » ('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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/GestureEvent.h" 47 #include "core/events/GestureEvent.h"
48 #include "core/events/KeyboardEvent.h" 48 #include "core/events/KeyboardEvent.h"
49 #include "core/events/MouseEvent.h" 49 #include "core/events/MouseEvent.h"
50 #include "core/events/PageTransitionEvent.h" 50 #include "core/events/PageTransitionEvent.h"
51 #include "core/fetch/ResourceFetcher.h" 51 #include "core/fetch/ResourceFetcher.h"
52 #include "core/fetch/ResourceLoader.h" 52 #include "core/fetch/ResourceLoader.h"
53 #include "core/frame/LocalDOMWindow.h"
54 #include "core/frame/FrameHost.h" 53 #include "core/frame/FrameHost.h"
55 #include "core/frame/FrameView.h" 54 #include "core/frame/FrameView.h"
55 #include "core/frame/LocalDOMWindow.h"
56 #include "core/frame/LocalFrame.h" 56 #include "core/frame/LocalFrame.h"
57 #include "core/frame/PinchViewport.h" 57 #include "core/frame/PinchViewport.h"
58 #include "core/frame/Settings.h" 58 #include "core/frame/Settings.h"
59 #include "core/frame/csp/ContentSecurityPolicy.h" 59 #include "core/frame/csp/ContentSecurityPolicy.h"
60 #include "core/html/HTMLFormElement.h" 60 #include "core/html/HTMLFormElement.h"
61 #include "core/html/HTMLFrameOwnerElement.h" 61 #include "core/html/HTMLFrameOwnerElement.h"
62 #include "core/html/parser/HTMLParserIdioms.h" 62 #include "core/html/parser/HTMLParserIdioms.h"
63 #include "core/input/EventHandler.h" 63 #include "core/input/EventHandler.h"
64 #include "core/inspector/ConsoleMessage.h" 64 #include "core/inspector/ConsoleMessage.h"
65 #include "core/inspector/InspectorInstrumentation.h" 65 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 // FIXME: We need a way to propagate insecure requests policy flags to 1482 // FIXME: We need a way to propagate insecure requests policy flags to
1483 // out-of-process frames. For now, we'll always use default behavior. 1483 // out-of-process frames. For now, we'll always use default behavior.
1484 if (!parentFrame->isLocalFrame()) 1484 if (!parentFrame->isLocalFrame())
1485 return nullptr; 1485 return nullptr;
1486 1486
1487 ASSERT(toLocalFrame(parentFrame)->document()); 1487 ASSERT(toLocalFrame(parentFrame)->document());
1488 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1488 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1489 } 1489 }
1490 1490
1491 } // namespace blink 1491 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/loader/LinkHeader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698