| OLD | NEW |
| 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 Loading... |
| 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 (isLoadingMainFrame()) { | 1346 // If we are loading the mainframe, or a frame that is a local root, it is |
| 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()) { |
| 1347 m_frame->page()->chromeClient().setEventListenerProperties( | 1352 m_frame->page()->chromeClient().setEventListenerProperties( |
| 1348 WebEventListenerClass::TouchStartOrMove, | 1353 m_frame, WebEventListenerClass::TouchStartOrMove, |
| 1349 WebEventListenerProperties::Nothing); | 1354 WebEventListenerProperties::Nothing); |
| 1350 m_frame->page()->chromeClient().setEventListenerProperties( | 1355 m_frame->page()->chromeClient().setEventListenerProperties( |
| 1351 WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing); | 1356 m_frame, WebEventListenerClass::MouseWheel, |
| 1357 WebEventListenerProperties::Nothing); |
| 1352 m_frame->page()->chromeClient().setEventListenerProperties( | 1358 m_frame->page()->chromeClient().setEventListenerProperties( |
| 1353 WebEventListenerClass::TouchEndOrCancel, | 1359 m_frame, WebEventListenerClass::TouchEndOrCancel, |
| 1354 WebEventListenerProperties::Nothing); | 1360 WebEventListenerProperties::Nothing); |
| 1355 } | 1361 } |
| 1356 | 1362 |
| 1357 client()->transitionToCommittedForNewPage(); | 1363 client()->transitionToCommittedForNewPage(); |
| 1358 | 1364 |
| 1359 // PlzNavigate: We need to ensure that script initiated navigations are | 1365 // PlzNavigate: We need to ensure that script initiated navigations are |
| 1360 // honored. | 1366 // honored. |
| 1361 if (!m_isNavigationHandledByClient) | 1367 if (!m_isNavigationHandledByClient) |
| 1362 m_frame->navigationScheduler().cancel(); | 1368 m_frame->navigationScheduler().cancel(); |
| 1363 | 1369 |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1921 m_documentLoader ? m_documentLoader->url() : String()); | 1927 m_documentLoader ? m_documentLoader->url() : String()); |
| 1922 return tracedValue; | 1928 return tracedValue; |
| 1923 } | 1929 } |
| 1924 | 1930 |
| 1925 inline void FrameLoader::takeObjectSnapshot() const { | 1931 inline void FrameLoader::takeObjectSnapshot() const { |
| 1926 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1927 toTracedValue()); | 1933 toTracedValue()); |
| 1928 } | 1934 } |
| 1929 | 1935 |
| 1930 } // namespace blink | 1936 } // namespace blink |
| OLD | NEW |