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

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

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Rebase to master@{#429880}. Created 4 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1316 RefPtr<SecurityOrigin> securityOrigin = 1316 RefPtr<SecurityOrigin> securityOrigin =
1317 SecurityOrigin::create(m_provisionalDocumentLoader->request().url()); 1317 SecurityOrigin::create(m_provisionalDocumentLoader->request().url());
1318 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument( 1318 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument(
1319 securityOrigin->canRequest(m_frame->document()->url())); 1319 securityOrigin->canRequest(m_frame->document()->url()));
1320 } 1320 }
1321 1321
1322 if (!prepareForCommit()) 1322 if (!prepareForCommit())
1323 return; 1323 return;
1324 1324
1325 if (isLoadingMainFrame()) { 1325 if (isLoadingMainFrame()) {
1326 // TODO(wjmaclean): Instead of passing |m_frame| here we pass nullptr
1327 // instead so the properties will be set on the WebView. We do this since,
1328 // while we are loading, the WebFrameWidget for m_frame may not yet
1329 // be available.
dcheng 2016/11/04 21:00:02 Can we switch the order of initialization in Creat
wjmaclean 2016/11/07 15:57:27 It's possible we can switch the order, though I do
dcheng 2016/11/08 18:11:00 Can we investigate doing this cleanup preemptively
wjmaclean 2016/11/09 18:09:38 Actually, as I recall, this only seems to have bee
1326 m_frame->page()->chromeClient().setEventListenerProperties( 1330 m_frame->page()->chromeClient().setEventListenerProperties(
1327 WebEventListenerClass::TouchStartOrMove, 1331 nullptr, WebEventListenerClass::TouchStartOrMove,
1328 WebEventListenerProperties::Nothing); 1332 WebEventListenerProperties::Nothing);
1329 m_frame->page()->chromeClient().setEventListenerProperties( 1333 m_frame->page()->chromeClient().setEventListenerProperties(
1330 WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing); 1334 nullptr, WebEventListenerClass::MouseWheel,
1335 WebEventListenerProperties::Nothing);
1331 m_frame->page()->chromeClient().setEventListenerProperties( 1336 m_frame->page()->chromeClient().setEventListenerProperties(
1332 WebEventListenerClass::TouchEndOrCancel, 1337 nullptr, WebEventListenerClass::TouchEndOrCancel,
1333 WebEventListenerProperties::Nothing); 1338 WebEventListenerProperties::Nothing);
1334 } 1339 }
1335 1340
1336 client()->transitionToCommittedForNewPage(); 1341 client()->transitionToCommittedForNewPage();
1337 m_frame->navigationScheduler().cancel(); 1342 m_frame->navigationScheduler().cancel();
1338 m_frame->editor().clearLastEditCommand(); 1343 m_frame->editor().clearLastEditCommand();
1339 1344
1340 // If we are still in the process of initializing an empty document then its 1345 // If we are still in the process of initializing an empty document then its
1341 // frame is not in a consistent state for rendering, so avoid 1346 // frame is not in a consistent state for rendering, so avoid
1342 // setJSStatusBarText since it may cause clients to attempt to render the 1347 // setJSStatusBarText since it may cause clients to attempt to render the
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1945 m_documentLoader ? m_documentLoader->url() : String()); 1950 m_documentLoader ? m_documentLoader->url() : String());
1946 return tracedValue; 1951 return tracedValue;
1947 } 1952 }
1948 1953
1949 inline void FrameLoader::takeObjectSnapshot() const { 1954 inline void FrameLoader::takeObjectSnapshot() const {
1950 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1955 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1951 toTracedValue()); 1956 toTracedValue());
1952 } 1957 }
1953 1958
1954 } // namespace blink 1959 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698