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