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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (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
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 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 setDocumentLoader(m_provisionalDocumentLoader.get()); 1732 setDocumentLoader(m_provisionalDocumentLoader.get());
1733 setProvisionalDocumentLoader(0); 1733 setProvisionalDocumentLoader(0);
1734 1734
1735 if (pdl != m_documentLoader) { 1735 if (pdl != m_documentLoader) {
1736 ASSERT(m_state == FrameStateComplete); 1736 ASSERT(m_state == FrameStateComplete);
1737 return; 1737 return;
1738 } 1738 }
1739 1739
1740 setState(FrameStateCommittedPage); 1740 setState(FrameStateCommittedPage);
1741 1741
1742 #if ENABLE(TOUCH_EVENTS)
1743 if (isLoadingMainFrame()) 1742 if (isLoadingMainFrame())
1744 m_frame->page()->chrome()->client()->needTouchEvents(false); 1743 m_frame->page()->chrome()->client()->needTouchEvents(false);
1745 #endif
1746 1744
1747 // Handle adding the URL to the back/forward list. 1745 // Handle adding the URL to the back/forward list.
1748 DocumentLoader* dl = m_documentLoader.get(); 1746 DocumentLoader* dl = m_documentLoader.get();
1749 1747
1750 switch (m_loadType) { 1748 switch (m_loadType) {
1751 case FrameLoadTypeForward: 1749 case FrameLoadTypeForward:
1752 case FrameLoadTypeBack: 1750 case FrameLoadTypeBack:
1753 case FrameLoadTypeIndexedBackForward: 1751 case FrameLoadTypeIndexedBackForward:
1754 if (m_frame->page()) { 1752 if (m_frame->page()) {
1755 // If the first load within a frame is a navigation within a bac k/forward list that was attached 1753 // If the first load within a frame is a navigation within a bac k/forward list that was attached
(...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after
3270 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3268 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3271 3269
3272 page->chrome()->setWindowRect(newWindowRect); 3270 page->chrome()->setWindowRect(newWindowRect);
3273 page->chrome()->show(); 3271 page->chrome()->show();
3274 3272
3275 created = true; 3273 created = true;
3276 return frame; 3274 return frame;
3277 } 3275 }
3278 3276
3279 } // namespace WebCore 3277 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698