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

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

Issue 2649573003: Revert of Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: Created 3 years, 11 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
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 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 if (m_frame->document()) { 1336 if (m_frame->document()) {
1337 RefPtr<SecurityOrigin> securityOrigin = 1337 RefPtr<SecurityOrigin> securityOrigin =
1338 SecurityOrigin::create(m_provisionalDocumentLoader->getRequest().url()); 1338 SecurityOrigin::create(m_provisionalDocumentLoader->getRequest().url());
1339 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument( 1339 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument(
1340 securityOrigin->canRequest(m_frame->document()->url())); 1340 securityOrigin->canRequest(m_frame->document()->url()));
1341 } 1341 }
1342 1342
1343 if (!prepareForCommit()) 1343 if (!prepareForCommit())
1344 return; 1344 return;
1345 1345
1346 // If we are loading the mainframe, or a frame that is a local root, it is 1346 if (isLoadingMainFrame()) {
1347 // important to explicitly set the event listenener properties to Nothing as
1348 // this triggers notifications to the client. Clients may assume the presence
1349 // of handlers for touch and wheel events, so these notifications tell it
1350 // there are (presently) no handlers.
1351 if (m_frame->isLocalRoot()) {
1352 m_frame->page()->chromeClient().setEventListenerProperties( 1347 m_frame->page()->chromeClient().setEventListenerProperties(
1353 m_frame, WebEventListenerClass::TouchStartOrMove, 1348 WebEventListenerClass::TouchStartOrMove,
1354 WebEventListenerProperties::Nothing); 1349 WebEventListenerProperties::Nothing);
1355 m_frame->page()->chromeClient().setEventListenerProperties( 1350 m_frame->page()->chromeClient().setEventListenerProperties(
1356 m_frame, WebEventListenerClass::MouseWheel, 1351 WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing);
1357 WebEventListenerProperties::Nothing);
1358 m_frame->page()->chromeClient().setEventListenerProperties( 1352 m_frame->page()->chromeClient().setEventListenerProperties(
1359 m_frame, WebEventListenerClass::TouchEndOrCancel, 1353 WebEventListenerClass::TouchEndOrCancel,
1360 WebEventListenerProperties::Nothing); 1354 WebEventListenerProperties::Nothing);
1361 } 1355 }
1362 1356
1363 client()->transitionToCommittedForNewPage(); 1357 client()->transitionToCommittedForNewPage();
1364 m_frame->navigationScheduler().cancel(); 1358 m_frame->navigationScheduler().cancel();
1365 m_frame->editor().clearLastEditCommand(); 1359 m_frame->editor().clearLastEditCommand();
1366 1360
1367 // If we are still in the process of initializing an empty document then its 1361 // If we are still in the process of initializing an empty document then its
1368 // frame is not in a consistent state for rendering, so avoid 1362 // frame is not in a consistent state for rendering, so avoid
1369 // setJSStatusBarText since it may cause clients to attempt to render the 1363 // setJSStatusBarText since it may cause clients to attempt to render the
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 m_documentLoader ? m_documentLoader->url() : String()); 1906 m_documentLoader ? m_documentLoader->url() : String());
1913 return tracedValue; 1907 return tracedValue;
1914 } 1908 }
1915 1909
1916 inline void FrameLoader::takeObjectSnapshot() const { 1910 inline void FrameLoader::takeObjectSnapshot() const {
1917 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1911 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1918 toTracedValue()); 1912 toTracedValue());
1919 } 1913 }
1920 1914
1921 } // namespace blink 1915 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.h ('k') | third_party/WebKit/Source/core/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698