commit 542f049bb335b28453a78aba58f5bd6a032d1ec2
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 28 20:13:51 2013 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 28 20:13:51 2013 +0000
tree 37cccd3e4b2749b0a7f65cee28c27b333a866145
parent c9dd2f5fbcf2c1795df8422ec95bb9f86a3b0d37

Collapse OS(UNIX)||OS(ANDROID) to OS(UNIX)
https://bugs.webkit.org/show_bug.cgi?id=108091

Patch by Laszlo Gombos <l.gombos@samsung.com> on 2013-01-28
Reviewed by Adam Barth.

OS(UNIX) is defined when OS(ANDROID) is defined.

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleMouseDown):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index d7eae0a..b680b73 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-28  Laszlo Gombos  <l.gombos@samsung.com>
+
+        Collapse OS(UNIX)||OS(ANDROID) to OS(UNIX)
+        https://bugs.webkit.org/show_bug.cgi?id=108091
+
+        Reviewed by Adam Barth.
+
+        OS(UNIX) is defined when OS(ANDROID) is defined.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleMouseDown):
+
 2013-01-28  Adam Barth  <abarth@webkit.org>
 
         Remove webkitNotifications.createHTMLNotification

Source/WebKit/chromium/src/WebViewImpl.cpp

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 267755c..d74ed6b 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -603,7 +603,7 @@
         || (event.button == WebMouseEvent::ButtonLeft
             && event.modifiers & WebMouseEvent::ControlKey))
         mouseContextMenu(event);
-#elif OS(UNIX) || OS(ANDROID)
+#elif OS(UNIX)
     if (event.button == WebMouseEvent::ButtonRight)
         mouseContextMenu(event);
 #endif