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

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 12817006: Merge 144519 "EventHandler::handleGestureScrollUpdate() should i..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « Source/WebCore/platform/PlatformWheelEvent.h ('k') | no next file » | 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 TRACE_EVENT0("webkit", "WebViewImpl::updateAnimations"); 1859 TRACE_EVENT0("webkit", "WebViewImpl::updateAnimations");
1860 1860
1861 // Create synthetic wheel events as necessary for fling. 1861 // Create synthetic wheel events as necessary for fling.
1862 if (m_gestureAnimation) { 1862 if (m_gestureAnimation) {
1863 if (m_gestureAnimation->animate(monotonicFrameBeginTime)) 1863 if (m_gestureAnimation->animate(monotonicFrameBeginTime))
1864 scheduleAnimation(); 1864 scheduleAnimation();
1865 else { 1865 else {
1866 m_gestureAnimation.clear(); 1866 m_gestureAnimation.clear();
1867 if (m_layerTreeView) 1867 if (m_layerTreeView)
1868 m_layerTreeView->didStopFlinging(); 1868 m_layerTreeView->didStopFlinging();
1869
1870 mainFrameImpl()->frame()->eventHandler()->clearGestureScrollNodes();
1869 } 1871 }
1870 } 1872 }
1871 1873
1872 if (!m_page) 1874 if (!m_page)
1873 return; 1875 return;
1874 1876
1875 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime); 1877 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime);
1876 #endif 1878 #endif
1877 } 1879 }
1878 1880
(...skipping 2538 matching lines...) Expand 10 before | Expand all | Expand 10 after
4417 #endif 4419 #endif
4418 4420
4419 bool WebViewImpl::shouldDisableDesktopWorkarounds() 4421 bool WebViewImpl::shouldDisableDesktopWorkarounds()
4420 { 4422 {
4421 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); 4423 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments();
4422 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom 4424 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom
4423 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); 4425 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto);
4424 } 4426 }
4425 4427
4426 } // namespace WebKit 4428 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebCore/platform/PlatformWheelEvent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698