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

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm

Issue 2650403006: Remove PlatformMouseEvent and use WebMouseEvent instead (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm
index 88c92c377cb7d67cb53f5accb11b736f57d456b0..5fd9bd0d3af4ae033c896cbf52d84cb278744b77 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm
@@ -27,7 +27,6 @@
#include "platform/scroll/ScrollbarThemeMac.h"
#include <Carbon/Carbon.h>
-#include "platform/PlatformMouseEvent.h"
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/GraphicsContextStateSaver.h"
#include "platform/graphics/paint/DrawingRecorder.h"
@@ -36,6 +35,7 @@
#include "platform/mac/NSScrollerImpDetails.h"
#include "platform/mac/ScrollAnimatorMac.h"
#include "platform/scroll/ScrollbarThemeClient.h"
+#include "public/platform/WebMouseEvent.h"
#include "public/platform/WebThemeEngine.h"
#include "public/platform/Platform.h"
#include "public/platform/WebRect.h"
@@ -172,8 +172,8 @@ double ScrollbarThemeMac::autoscrollTimerDelay() {
bool ScrollbarThemeMac::shouldDragDocumentInsteadOfThumb(
const ScrollbarThemeClient&,
- const PlatformMouseEvent& event) {
- return event.altKey();
+ const WebMouseEvent& event) {
+ return (event.modifiers() & WebInputEvent::Modifiers::AltKey) != 0;
}
int ScrollbarThemeMac::scrollbarPartToHIPressedState(ScrollbarPart part) {

Powered by Google App Engine
This is Rietveld 408576698