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 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1318 RefPtr<SecurityOrigin> securityOrigin = | 1318 RefPtr<SecurityOrigin> securityOrigin = |
1319 SecurityOrigin::create(m_provisionalDocumentLoader->request().url()); | 1319 SecurityOrigin::create(m_provisionalDocumentLoader->request().url()); |
1320 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument( | 1320 m_provisionalDocumentLoader->timing().setHasSameOriginAsPreviousDocument( |
1321 securityOrigin->canRequest(m_frame->document()->url())); | 1321 securityOrigin->canRequest(m_frame->document()->url())); |
1322 } | 1322 } |
1323 | 1323 |
1324 if (!prepareForCommit()) | 1324 if (!prepareForCommit()) |
1325 return; | 1325 return; |
1326 | 1326 |
1327 if (isLoadingMainFrame()) { | 1327 if (isLoadingMainFrame()) { |
| 1328 // TODO(wjmaclean): Instead of passing |m_frame| here we pass nullptr |
| 1329 // instead so the properties will be set on the WebView. We do this since, |
| 1330 // while we are loading, the WebFrameWidget for m_frame may not yet |
| 1331 // be available. |
1328 m_frame->page()->chromeClient().setEventListenerProperties( | 1332 m_frame->page()->chromeClient().setEventListenerProperties( |
1329 WebEventListenerClass::TouchStartOrMove, | 1333 m_frame, WebEventListenerClass::TouchStartOrMove, |
1330 WebEventListenerProperties::Nothing); | 1334 WebEventListenerProperties::Nothing); |
1331 m_frame->page()->chromeClient().setEventListenerProperties( | 1335 m_frame->page()->chromeClient().setEventListenerProperties( |
1332 WebEventListenerClass::MouseWheel, WebEventListenerProperties::Nothing); | 1336 m_frame, WebEventListenerClass::MouseWheel, |
| 1337 WebEventListenerProperties::Nothing); |
1333 m_frame->page()->chromeClient().setEventListenerProperties( | 1338 m_frame->page()->chromeClient().setEventListenerProperties( |
1334 WebEventListenerClass::TouchEndOrCancel, | 1339 m_frame, WebEventListenerClass::TouchEndOrCancel, |
1335 WebEventListenerProperties::Nothing); | 1340 WebEventListenerProperties::Nothing); |
1336 } | 1341 } |
1337 | 1342 |
1338 client()->transitionToCommittedForNewPage(); | 1343 client()->transitionToCommittedForNewPage(); |
1339 m_frame->navigationScheduler().cancel(); | 1344 m_frame->navigationScheduler().cancel(); |
1340 m_frame->editor().clearLastEditCommand(); | 1345 m_frame->editor().clearLastEditCommand(); |
1341 | 1346 |
1342 // If we are still in the process of initializing an empty document then its | 1347 // If we are still in the process of initializing an empty document then its |
1343 // frame is not in a consistent state for rendering, so avoid | 1348 // frame is not in a consistent state for rendering, so avoid |
1344 // setJSStatusBarText since it may cause clients to attempt to render the | 1349 // setJSStatusBarText since it may cause clients to attempt to render the |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1950 m_documentLoader ? m_documentLoader->url() : String()); | 1955 m_documentLoader ? m_documentLoader->url() : String()); |
1951 return tracedValue; | 1956 return tracedValue; |
1952 } | 1957 } |
1953 | 1958 |
1954 inline void FrameLoader::takeObjectSnapshot() const { | 1959 inline void FrameLoader::takeObjectSnapshot() const { |
1955 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1960 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
1956 toTracedValue()); | 1961 toTracedValue()); |
1957 } | 1962 } |
1958 | 1963 |
1959 } // namespace blink | 1964 } // namespace blink |
OLD | NEW |