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

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

Issue 334483002: Add Blink APIs for frame tree mirroring. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Devirtualize initializeAsMainFrame 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/web/WebRemoteFrameImpl.cpp ('k') | public/web/WebRemoteFrame.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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #include "web/StorageQuotaClientImpl.h" 138 #include "web/StorageQuotaClientImpl.h"
139 #include "web/ValidationMessageClientImpl.h" 139 #include "web/ValidationMessageClientImpl.h"
140 #include "web/ViewportAnchor.h" 140 #include "web/ViewportAnchor.h"
141 #include "web/WebDevToolsAgentImpl.h" 141 #include "web/WebDevToolsAgentImpl.h"
142 #include "web/WebDevToolsAgentPrivate.h" 142 #include "web/WebDevToolsAgentPrivate.h"
143 #include "web/WebInputEventConversion.h" 143 #include "web/WebInputEventConversion.h"
144 #include "web/WebLocalFrameImpl.h" 144 #include "web/WebLocalFrameImpl.h"
145 #include "web/WebPagePopupImpl.h" 145 #include "web/WebPagePopupImpl.h"
146 #include "web/WebPluginContainerImpl.h" 146 #include "web/WebPluginContainerImpl.h"
147 #include "web/WebPopupMenuImpl.h" 147 #include "web/WebPopupMenuImpl.h"
148 #include "web/WebRemoteFrameImpl.h"
148 #include "web/WebSettingsImpl.h" 149 #include "web/WebSettingsImpl.h"
149 #include "web/WorkerGlobalScopeProxyProviderImpl.h" 150 #include "web/WorkerGlobalScopeProxyProviderImpl.h"
150 #include "web/painting/ContinuousPainter.h" 151 #include "web/painting/ContinuousPainter.h"
151 #include "wtf/CurrentTime.h" 152 #include "wtf/CurrentTime.h"
152 #include "wtf/RefPtr.h" 153 #include "wtf/RefPtr.h"
153 #include "wtf/TemporaryChange.h" 154 #include "wtf/TemporaryChange.h"
154 155
155 #if USE(DEFAULT_RENDER_THEME) 156 #if USE(DEFAULT_RENDER_THEME)
156 #include "core/rendering/RenderThemeChromiumDefault.h" 157 #include "core/rendering/RenderThemeChromiumDefault.h"
157 #endif 158 #endif
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 void WebView::didExitModalLoop() 308 void WebView::didExitModalLoop()
308 { 309 {
309 ASSERT(pageLoadDeferrerStack().size()); 310 ASSERT(pageLoadDeferrerStack().size());
310 311
311 delete pageLoadDeferrerStack().last(); 312 delete pageLoadDeferrerStack().last();
312 pageLoadDeferrerStack().removeLast(); 313 pageLoadDeferrerStack().removeLast();
313 } 314 }
314 315
315 void WebViewImpl::setMainFrame(WebFrame* frame) 316 void WebViewImpl::setMainFrame(WebFrame* frame)
316 { 317 {
317 toWebLocalFrameImpl(frame)->initializeAsMainFrame(page()); 318 if (frame->isWebLocalFrame())
319 toWebLocalFrameImpl(frame)->initializeAsMainFrame(page());
320 else
321 toWebRemoteFrameImpl(frame)->initializeAsMainFrame(page());
318 } 322 }
319 323
320 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient) 324 void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient)
321 { 325 {
322 m_autofillClient = autofillClient; 326 m_autofillClient = autofillClient;
323 } 327 }
324 328
325 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient) 329 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient)
326 { 330 {
327 if (devToolsClient) 331 if (devToolsClient)
(...skipping 3776 matching lines...) Expand 10 before | Expand all | Expand 10 after
4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4108 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4105 4109
4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4110 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4107 return false; 4111 return false;
4108 4112
4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4113 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4110 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4114 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4111 } 4115 }
4112 4116
4113 } // namespace blink 4117 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebRemoteFrameImpl.cpp ('k') | public/web/WebRemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698