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

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

Issue 2764773003: Change WebFrameImplBase::initializeCoreFrame to take a Page& (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.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) 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 void WebView::willEnterModalLoop() { 302 void WebView::willEnterModalLoop() {
303 pageSuspenderStack().push_back(WTF::makeUnique<ScopedPageSuspender>()); 303 pageSuspenderStack().push_back(WTF::makeUnique<ScopedPageSuspender>());
304 } 304 }
305 305
306 void WebView::didExitModalLoop() { 306 void WebView::didExitModalLoop() {
307 DCHECK(pageSuspenderStack().size()); 307 DCHECK(pageSuspenderStack().size());
308 pageSuspenderStack().pop_back(); 308 pageSuspenderStack().pop_back();
309 } 309 }
310 310
311 void WebViewImpl::setMainFrame(WebFrame* frame) { 311 void WebViewImpl::setMainFrame(WebFrame* frame) {
312 frame->toImplBase()->initializeCoreFrame(&page()->frameHost(), 0, nullAtom); 312 frame->toImplBase()->initializeCoreFrame(*page(), 0, nullAtom);
313 } 313 }
314 314
315 void WebViewImpl::setCredentialManagerClient( 315 void WebViewImpl::setCredentialManagerClient(
316 WebCredentialManagerClient* webCredentialManagerClient) { 316 WebCredentialManagerClient* webCredentialManagerClient) {
317 DCHECK(m_page); 317 DCHECK(m_page);
318 provideCredentialManagerClientTo( 318 provideCredentialManagerClientTo(
319 *m_page, new CredentialManagerClient(webCredentialManagerClient)); 319 *m_page, new CredentialManagerClient(webCredentialManagerClient));
320 } 320 }
321 321
322 void WebViewImpl::setPrerendererClient( 322 void WebViewImpl::setPrerendererClient(
(...skipping 3850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4173 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4173 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4174 return nullptr; 4174 return nullptr;
4175 return focusedFrame; 4175 return focusedFrame;
4176 } 4176 }
4177 4177
4178 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4178 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4179 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4179 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4180 } 4180 }
4181 4181
4182 } // namespace blink 4182 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698