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

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

Issue 1330653003: Oilpan: tidy up NavigationScheduler. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove redundant constructor hiding Created 5 years, 3 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) 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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"
66 #include "core/loader/DocumentLoadTiming.h" 66 #include "core/loader/DocumentLoadTiming.h"
67 #include "core/loader/DocumentLoader.h" 67 #include "core/loader/DocumentLoader.h"
68 #include "core/loader/FormSubmission.h" 68 #include "core/loader/FormSubmission.h"
69 #include "core/loader/FrameLoadRequest.h" 69 #include "core/loader/FrameLoadRequest.h"
70 #include "core/loader/FrameLoaderClient.h" 70 #include "core/loader/FrameLoaderClient.h"
71 #include "core/loader/MixedContentChecker.h" 71 #include "core/loader/MixedContentChecker.h"
72 #include "core/loader/NavigationScheduler.h"
72 #include "core/loader/ProgressTracker.h" 73 #include "core/loader/ProgressTracker.h"
73 #include "core/loader/appcache/ApplicationCacheHost.h" 74 #include "core/loader/appcache/ApplicationCacheHost.h"
74 #include "core/page/ChromeClient.h" 75 #include "core/page/ChromeClient.h"
75 #include "core/page/CreateWindow.h" 76 #include "core/page/CreateWindow.h"
76 #include "core/page/FrameTree.h" 77 #include "core/page/FrameTree.h"
77 #include "core/page/Page.h" 78 #include "core/page/Page.h"
78 #include "core/page/WindowFeatures.h" 79 #include "core/page/WindowFeatures.h"
79 #include "core/page/scrolling/ScrollingCoordinator.h" 80 #include "core/page/scrolling/ScrollingCoordinator.h"
80 #include "core/svg/graphics/SVGImage.h" 81 #include "core/svg/graphics/SVGImage.h"
81 #include "core/xml/parser/XMLDocumentParser.h" 82 #include "core/xml/parser/XMLDocumentParser.h"
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 // FIXME: We need a way to propagate insecure requests policy flags to 1517 // FIXME: We need a way to propagate insecure requests policy flags to
1517 // out-of-process frames. For now, we'll always use default behavior. 1518 // out-of-process frames. For now, we'll always use default behavior.
1518 if (!parentFrame->isLocalFrame()) 1519 if (!parentFrame->isLocalFrame())
1519 return nullptr; 1520 return nullptr;
1520 1521
1521 ASSERT(toLocalFrame(parentFrame)->document()); 1522 ASSERT(toLocalFrame(parentFrame)->document());
1522 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1523 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1523 } 1524 }
1524 1525
1525 } // namespace blink 1526 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/parser/XSSAuditorDelegate.cpp ('k') | Source/core/loader/NavigationScheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698