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

Side by Side Diff: Source/web/WebFrameImpl.cpp

Issue 26848007: Move Navigation Timing and other various window-level objects out of page/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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/web/ChromeClientImpl.cpp ('k') | Source/web/WebPerformance.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) 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 #include "core/dom/NodeTraversal.h" 122 #include "core/dom/NodeTraversal.h"
123 #include "core/dom/shadow/ShadowRoot.h" 123 #include "core/dom/shadow/ShadowRoot.h"
124 #include "core/editing/Editor.h" 124 #include "core/editing/Editor.h"
125 #include "core/editing/FrameSelection.h" 125 #include "core/editing/FrameSelection.h"
126 #include "core/editing/InputMethodController.h" 126 #include "core/editing/InputMethodController.h"
127 #include "core/editing/SpellChecker.h" 127 #include "core/editing/SpellChecker.h"
128 #include "core/editing/TextAffinity.h" 128 #include "core/editing/TextAffinity.h"
129 #include "core/editing/TextIterator.h" 129 #include "core/editing/TextIterator.h"
130 #include "core/editing/htmlediting.h" 130 #include "core/editing/htmlediting.h"
131 #include "core/editing/markup.h" 131 #include "core/editing/markup.h"
132 #include "core/frame/Console.h"
132 #include "core/history/BackForwardController.h" 133 #include "core/history/BackForwardController.h"
133 #include "core/history/HistoryItem.h" 134 #include "core/history/HistoryItem.h"
134 #include "core/html/HTMLCollection.h" 135 #include "core/html/HTMLCollection.h"
135 #include "core/html/HTMLFormElement.h" 136 #include "core/html/HTMLFormElement.h"
136 #include "core/html/HTMLFrameOwnerElement.h" 137 #include "core/html/HTMLFrameOwnerElement.h"
137 #include "core/html/HTMLHeadElement.h" 138 #include "core/html/HTMLHeadElement.h"
138 #include "core/html/HTMLInputElement.h" 139 #include "core/html/HTMLInputElement.h"
139 #include "core/html/HTMLLinkElement.h" 140 #include "core/html/HTMLLinkElement.h"
140 #include "core/html/HTMLTextAreaElement.h" 141 #include "core/html/HTMLTextAreaElement.h"
141 #include "core/html/PluginDocument.h" 142 #include "core/html/PluginDocument.h"
142 #include "core/inspector/InspectorController.h" 143 #include "core/inspector/InspectorController.h"
143 #include "core/inspector/ScriptCallStack.h" 144 #include "core/inspector/ScriptCallStack.h"
144 #include "core/loader/DocumentLoader.h" 145 #include "core/loader/DocumentLoader.h"
145 #include "core/loader/FormState.h" 146 #include "core/loader/FormState.h"
146 #include "core/loader/FrameLoadRequest.h" 147 #include "core/loader/FrameLoadRequest.h"
147 #include "core/loader/FrameLoader.h" 148 #include "core/loader/FrameLoader.h"
148 #include "core/loader/IconController.h" 149 #include "core/loader/IconController.h"
149 #include "core/loader/SubstituteData.h" 150 #include "core/loader/SubstituteData.h"
150 #include "core/page/Chrome.h" 151 #include "core/page/Chrome.h"
151 #include "core/page/Console.h"
152 #include "core/page/DOMWindow.h" 152 #include "core/page/DOMWindow.h"
153 #include "core/page/EventHandler.h" 153 #include "core/page/EventHandler.h"
154 #include "core/page/FocusController.h" 154 #include "core/page/FocusController.h"
155 #include "core/page/FrameTree.h" 155 #include "core/page/FrameTree.h"
156 #include "core/page/FrameView.h" 156 #include "core/page/FrameView.h"
157 #include "core/page/Page.h" 157 #include "core/page/Page.h"
158 #include "core/page/Performance.h"
159 #include "core/page/PrintContext.h" 158 #include "core/page/PrintContext.h"
160 #include "core/page/Settings.h" 159 #include "core/page/Settings.h"
161 #include "core/platform/ScrollbarTheme.h" 160 #include "core/platform/ScrollbarTheme.h"
162 #include "core/platform/graphics/FontCache.h" 161 #include "core/platform/graphics/FontCache.h"
163 #include "core/platform/graphics/GraphicsContext.h" 162 #include "core/platform/graphics/GraphicsContext.h"
164 #include "core/platform/graphics/GraphicsLayerClient.h" 163 #include "core/platform/graphics/GraphicsLayerClient.h"
165 #include "core/platform/graphics/skia/SkiaUtils.h" 164 #include "core/platform/graphics/skia/SkiaUtils.h"
166 #include "core/platform/network/ResourceRequest.h" 165 #include "core/platform/network/ResourceRequest.h"
167 #include "core/rendering/HitTestResult.h" 166 #include "core/rendering/HitTestResult.h"
168 #include "core/rendering/RenderBox.h" 167 #include "core/rendering/RenderBox.h"
169 #include "core/rendering/RenderFrame.h" 168 #include "core/rendering/RenderFrame.h"
170 #include "core/rendering/RenderLayer.h" 169 #include "core/rendering/RenderLayer.h"
171 #include "core/rendering/RenderObject.h" 170 #include "core/rendering/RenderObject.h"
172 #include "core/rendering/RenderTreeAsText.h" 171 #include "core/rendering/RenderTreeAsText.h"
173 #include "core/rendering/RenderView.h" 172 #include "core/rendering/RenderView.h"
174 #include "core/rendering/style/StyleInheritedData.h" 173 #include "core/rendering/style/StyleInheritedData.h"
174 #include "core/timing/Performance.h"
175 #include "core/xml/DocumentXPathEvaluator.h" 175 #include "core/xml/DocumentXPathEvaluator.h"
176 #include "core/xml/XPathResult.h" 176 #include "core/xml/XPathResult.h"
177 #include "modules/filesystem/DOMFileSystem.h" 177 #include "modules/filesystem/DOMFileSystem.h"
178 #include "modules/filesystem/DirectoryEntry.h" 178 #include "modules/filesystem/DirectoryEntry.h"
179 #include "modules/filesystem/FileEntry.h" 179 #include "modules/filesystem/FileEntry.h"
180 #include "platform/FileSystemType.h" 180 #include "platform/FileSystemType.h"
181 #include "platform/TraceEvent.h" 181 #include "platform/TraceEvent.h"
182 #include "platform/UserGestureIndicator.h" 182 #include "platform/UserGestureIndicator.h"
183 #include "platform/clipboard/ClipboardUtilities.h" 183 #include "platform/clipboard/ClipboardUtilities.h"
184 #include "platform/scroll/ScrollTypes.h" 184 #include "platform/scroll/ScrollTypes.h"
(...skipping 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 // 2155 //
2156 // FIXME: Remove once all embedders return non-null from createChildFrame(). 2156 // FIXME: Remove once all embedders return non-null from createChildFrame().
2157 RefPtr<WebFrameImpl> webframeLifetimeHack; 2157 RefPtr<WebFrameImpl> webframeLifetimeHack;
2158 bool mustCallDidCreateFrame = false; 2158 bool mustCallDidCreateFrame = false;
2159 if (!webframe) { 2159 if (!webframe) {
2160 mustCallDidCreateFrame = true; 2160 mustCallDidCreateFrame = true;
2161 webframeLifetimeHack = adoptRef(WebFrameImpl::create(m_client)); 2161 webframeLifetimeHack = adoptRef(WebFrameImpl::create(m_client));
2162 webframe = webframeLifetimeHack.get(); 2162 webframe = webframeLifetimeHack.get();
2163 } 2163 }
2164 2164
2165 // Add an extra ref on behalf of the Frame/FrameLoader, which references the 2165 // Add an extra ref on behalf of the page/FrameLoader, which references the
2166 // WebFrame via the FrameLoaderClient interface. See the comment at the top 2166 // WebFrame via the FrameLoaderClient interface. See the comment at the top
2167 // of this file for more info. 2167 // of this file for more info.
2168 webframe->ref(); 2168 webframe->ref();
2169 2169
2170 RefPtr<Frame> childFrame = Frame::create(frame()->page(), ownerElement, &web frame->m_frameLoaderClient); 2170 RefPtr<Frame> childFrame = Frame::create(frame()->page(), ownerElement, &web frame->m_frameLoaderClient);
2171 webframe->setWebCoreFrame(childFrame.get()); 2171 webframe->setWebCoreFrame(childFrame.get());
2172 2172
2173 childFrame->tree()->setName(request.frameName()); 2173 childFrame->tree()->setName(request.frameName());
2174 2174
2175 frame()->tree()->appendChild(childFrame); 2175 frame()->tree()->appendChild(childFrame);
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
2514 2514
2515 // There is a possibility that the frame being detached was the only 2515 // There is a possibility that the frame being detached was the only
2516 // pending one. We need to make sure final replies can be sent. 2516 // pending one. We need to make sure final replies can be sent.
2517 flushCurrentScopingEffort(m_findRequestIdentifier); 2517 flushCurrentScopingEffort(m_findRequestIdentifier);
2518 2518
2519 cancelPendingScopingEffort(); 2519 cancelPendingScopingEffort();
2520 } 2520 }
2521 } 2521 }
2522 2522
2523 } // namespace WebKit 2523 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | Source/web/WebPerformance.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698