Chromium Code Reviews| Index: Source/WebCore/page/EventHandler.cpp |
| diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp |
| index a91db2a695e79c4b7696ce7346dc978135097ce1..0f7d544a9889294c9520a2248ead374ba9abb421 100644 |
| --- a/Source/WebCore/page/EventHandler.cpp |
| +++ b/Source/WebCore/page/EventHandler.cpp |
| @@ -1747,7 +1747,7 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent) |
| bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mev.targetNode(), true, m_clickCount, mouseEvent, false); |
| bool contextMenuEvent = mouseEvent.button() == RightButton; |
| -#if PLATFORM(CHROMIUM) && OS(DARWIN) |
| +#if OS(DARWIN) |
| // FIXME: The Mac port achieves the same behavior by checking whether the context menu is currently open in WebPage::mouseEvent(). Consider merging the implementations. |
| if (mouseEvent.button() == LeftButton && mouseEvent.modifiers() & PlatformEvent::CtrlKey) |
| contextMenuEvent = true; |
| @@ -2195,7 +2195,7 @@ bool EventHandler::isInsideScrollbar(const IntPoint& windowPoint) const |
| return false; |
| } |
| -#if !(PLATFORM(CHROMIUM) && (OS(UNIX) && !OS(DARWIN))) |
| +#if !(OS(UNIX) && !OS(DARWIN)) |
|
jamesr
2013/04/12 02:38:53
!(OS(UNIX) && !OS(DARWIN))
!OS(UNIX) || OS(DARWIN
Nico
2013/04/12 04:04:15
Done.
|
| bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&, const PlatformWheelEvent&) const |
| { |
| return false; |