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

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

Issue 14280004: Revert removal of events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/page/ChromeClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 setDocumentLoader(m_provisionalDocumentLoader.get()); 1693 setDocumentLoader(m_provisionalDocumentLoader.get());
1694 setProvisionalDocumentLoader(0); 1694 setProvisionalDocumentLoader(0);
1695 1695
1696 if (pdl != m_documentLoader) { 1696 if (pdl != m_documentLoader) {
1697 ASSERT(m_state == FrameStateComplete); 1697 ASSERT(m_state == FrameStateComplete);
1698 return; 1698 return;
1699 } 1699 }
1700 1700
1701 setState(FrameStateCommittedPage); 1701 setState(FrameStateCommittedPage);
1702 1702
1703 #if ENABLE(TOUCH_EVENTS)
1703 if (isLoadingMainFrame()) 1704 if (isLoadingMainFrame())
1704 m_frame->page()->chrome()->client()->needTouchEvents(false); 1705 m_frame->page()->chrome()->client()->needTouchEvents(false);
1706 #endif
1705 1707
1706 // Handle adding the URL to the back/forward list. 1708 // Handle adding the URL to the back/forward list.
1707 DocumentLoader* dl = m_documentLoader.get(); 1709 DocumentLoader* dl = m_documentLoader.get();
1708 1710
1709 switch (m_loadType) { 1711 switch (m_loadType) {
1710 case FrameLoadTypeForward: 1712 case FrameLoadTypeForward:
1711 case FrameLoadTypeBack: 1713 case FrameLoadTypeBack:
1712 case FrameLoadTypeIndexedBackForward: 1714 case FrameLoadTypeIndexedBackForward:
1713 if (m_frame->page()) { 1715 if (m_frame->page()) {
1714 // If the first load within a frame is a navigation within a bac k/forward list that was attached 1716 // If the first load within a frame is a navigation within a bac k/forward list that was attached
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
3214 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3216 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3215 3217
3216 page->chrome()->setWindowRect(newWindowRect); 3218 page->chrome()->setWindowRect(newWindowRect);
3217 page->chrome()->show(); 3219 page->chrome()->show();
3218 3220
3219 created = true; 3221 created = true;
3220 return frame; 3222 return frame;
3221 } 3223 }
3222 3224
3223 } // namespace WebCore 3225 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/EmptyClients.h ('k') | Source/core/page/ChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698