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

Side by Side Diff: Source/web/WebLocalFrameImpl.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
« no previous file with comments | « Source/core/loader/NavigationScheduler.cpp ('k') | no next file » | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #include "core/layout/LayoutObject.h" 137 #include "core/layout/LayoutObject.h"
138 #include "core/layout/LayoutPart.h" 138 #include "core/layout/LayoutPart.h"
139 #include "core/layout/LayoutTreeAsText.h" 139 #include "core/layout/LayoutTreeAsText.h"
140 #include "core/layout/LayoutView.h" 140 #include "core/layout/LayoutView.h"
141 #include "core/style/StyleInheritedData.h" 141 #include "core/style/StyleInheritedData.h"
142 #include "core/loader/DocumentLoader.h" 142 #include "core/loader/DocumentLoader.h"
143 #include "core/loader/FrameLoadRequest.h" 143 #include "core/loader/FrameLoadRequest.h"
144 #include "core/loader/FrameLoader.h" 144 #include "core/loader/FrameLoader.h"
145 #include "core/loader/HistoryItem.h" 145 #include "core/loader/HistoryItem.h"
146 #include "core/loader/MixedContentChecker.h" 146 #include "core/loader/MixedContentChecker.h"
147 #include "core/loader/NavigationScheduler.h"
147 #include "core/page/FocusController.h" 148 #include "core/page/FocusController.h"
148 #include "core/page/FrameTree.h" 149 #include "core/page/FrameTree.h"
149 #include "core/page/Page.h" 150 #include "core/page/Page.h"
150 #include "core/page/PrintContext.h" 151 #include "core/page/PrintContext.h"
151 #include "core/paint/DeprecatedPaintLayer.h" 152 #include "core/paint/DeprecatedPaintLayer.h"
152 #include "core/paint/ScopeRecorder.h" 153 #include "core/paint/ScopeRecorder.h"
153 #include "core/paint/TransformRecorder.h" 154 #include "core/paint/TransformRecorder.h"
154 #include "core/timing/DOMWindowPerformance.h" 155 #include "core/timing/DOMWindowPerformance.h"
155 #include "core/timing/Performance.h" 156 #include "core/timing/Performance.h"
156 #include "modules/app_banner/AppBannerController.h" 157 #include "modules/app_banner/AppBannerController.h"
(...skipping 2035 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 } 2193 }
2193 2194
2194 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2195 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2195 { 2196 {
2196 if (!frame()) 2197 if (!frame())
2197 return WebSandboxFlags::None; 2198 return WebSandboxFlags::None;
2198 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2199 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2199 } 2200 }
2200 2201
2201 } // namespace blink 2202 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/NavigationScheduler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698