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

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

Issue 17471008: Rework compositor touch hit testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Various fixes and test additions Created 7 years, 5 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
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 1929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1940 1940
1941 bool WebViewImpl::hasVerticalScrollbar() 1941 bool WebViewImpl::hasVerticalScrollbar()
1942 { 1942 {
1943 return mainFrameImpl()->frameView()->verticalScrollbar(); 1943 return mainFrameImpl()->frameView()->verticalScrollbar();
1944 } 1944 }
1945 1945
1946 const WebInputEvent* WebViewImpl::m_currentInputEvent = 0; 1946 const WebInputEvent* WebViewImpl::m_currentInputEvent = 0;
1947 1947
1948 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent) 1948 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
1949 { 1949 {
1950 TRACE_EVENT0("webkit", "WebViewImpl::handleInputEvent"); 1950 TRACE_EVENT0("input", "WebViewImpl::handleInputEvent");
1951 // If we've started a drag and drop operation, ignore input events until 1951 // If we've started a drag and drop operation, ignore input events until
1952 // we're done. 1952 // we're done.
1953 if (m_doingDragAndDrop) 1953 if (m_doingDragAndDrop)
1954 return true; 1954 return true;
1955 1955
1956 if (m_devToolsAgent && m_devToolsAgent->handleInputEvent(m_page.get(), input Event)) 1956 if (m_devToolsAgent && m_devToolsAgent->handleInputEvent(m_page.get(), input Event))
1957 return true; 1957 return true;
1958 1958
1959 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. 1959 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately.
1960 if (m_ignoreInputEvents) 1960 if (m_ignoreInputEvents)
(...skipping 2202 matching lines...) Expand 10 before | Expand all | Expand 10 after
4163 } 4163 }
4164 4164
4165 bool WebViewImpl::shouldDisableDesktopWorkarounds() 4165 bool WebViewImpl::shouldDisableDesktopWorkarounds()
4166 { 4166 {
4167 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); 4167 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments();
4168 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom 4168 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom
4169 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); 4169 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto);
4170 } 4170 }
4171 4171
4172 } // namespace WebKit 4172 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698