e012801420
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
|
|
index d64895137a73..c42dd6ddf172 100644
|
|
--- a/content/renderer/browser_plugin/browser_plugin.cc
|
|
+++ b/content/renderer/browser_plugin/browser_plugin.cc
|
|
@@ -642,15 +642,11 @@ blink::WebInputEventResult BrowserPlugin::HandleInputEvent(
|
|
|
|
DCHECK(!blink::WebInputEvent::IsTouchEventType(event.GetType()));
|
|
|
|
- // With direct event routing turned on, BrowserPlugin should almost never
|
|
- // see wheel events any more. The two exceptions are (1) scroll bubbling, and
|
|
- // (2) synthetic mouse wheels generated by touchpad GesturePinch events on
|
|
- // Mac, which always go to the mainframe and thus may hit BrowserPlugin if
|
|
- // it's in a top-level embedder. In both cases we should indicate the event
|
|
- // as not handled (for GesturePinch on Mac, indicating the event has been
|
|
- // handled leads to touchpad pinch not working).
|
|
- if (event.GetType() == blink::WebInputEvent::kMouseWheel)
|
|
- return blink::WebInputEventResult::kNotHandled;
|
|
+ if (event.GetType() == blink::WebInputEvent::kMouseWheel) {
|
|
+ auto wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
|
|
+ if (wheel_event.resending_plugin_id == browser_plugin_instance_id_)
|
|
+ return blink::WebInputEventResult::kNotHandled;
|
|
+ }
|
|
|
|
if (blink::WebInputEvent::IsGestureEventType(event.GetType())) {
|
|
auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);
|