Title: [140989] trunk/Source/WebKit/chromium
- Revision
- 140989
- Author
- [email protected]
- Date
- 2013-01-28 12:13:51 -0800 (Mon, 28 Jan 2013)
Log Message
Collapse OS(UNIX)||OS(ANDROID) to OS(UNIX)
https://bugs.webkit.org/show_bug.cgi?id=108091
Patch by Laszlo Gombos <[email protected]> on 2013-01-28
Reviewed by Adam Barth.
OS(UNIX) is defined when OS(ANDROID) is defined.
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleMouseDown):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (140988 => 140989)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 19:56:41 UTC (rev 140988)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 20:13:51 UTC (rev 140989)
@@ -1,3 +1,15 @@
+2013-01-28 Laszlo Gombos <[email protected]>
+
+ 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 <[email protected]>
Remove webkitNotifications.createHTMLNotification
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (140988 => 140989)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-28 19:56:41 UTC (rev 140988)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-28 20:13:51 UTC (rev 140989)
@@ -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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
