Unreviewed, rolling out r144016.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Feb 2013 09:04:57 +0000 (09:04 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Feb 2013 09:04:57 +0000 (09:04 +0000)
http://trac.webkit.org/changeset/144016
https://bugs.webkit.org/show_bug.cgi?id=110856

Breaks compilation on chromium mac (Requested by vsevik on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-26

Source/WebCore:

* platform/chromium/KeyCodeConversionGtk.cpp:
(WebCore::windowsKeyCodeForKeyEvent):

Source/WebKit/chromium:

* WebKit.gypi:
* tests/KeyCodeConversionTest.cpp: Removed.

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

Source/WebCore/ChangeLog
Source/WebCore/platform/chromium/KeyCodeConversionGtk.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gypi
Source/WebKit/chromium/tests/KeyCodeConversionTest.cpp [deleted file]

index a35401d..dc4a6fb 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144016.
+        http://trac.webkit.org/changeset/144016
+        https://bugs.webkit.org/show_bug.cgi?id=110856
+
+        Breaks compilation on chromium mac (Requested by vsevik on
+        #webkit).
+
+        * platform/chromium/KeyCodeConversionGtk.cpp:
+        (WebCore::windowsKeyCodeForKeyEvent):
+
 2013-02-26  Glenn Adams  <glenn@skynav.com>
 
         Add support to -webkit-line-break property for CSS3 Text line-break property values and semantics.
index 0862b76..e7c0e20 100644 (file)
@@ -88,12 +88,6 @@ int windowsKeyCodeForKeyEvent(unsigned keycode)
         return VKEY_RIGHT; // (27) RIGHT ARROW key
     case GDK_KP_Down:
         return VKEY_DOWN; // (28) DOWN ARROW key
-    case GDK_KP_Begin:
-        return VKEY_CLEAR; // (12) CLEAR key
-    case GDK_KP_Insert:
-        return VKEY_INSERT; // (45) INS key
-    case GDK_KP_Delete:
-        return VKEY_DELETE; // (46) DEL key
 
     case GDK_BackSpace:
         return VKEY_BACK; // (08) BACKSPACE key
@@ -120,7 +114,6 @@ int windowsKeyCodeForKeyEvent(unsigned keycode)
     case GDK_Alt_L:
         return VKEY_LMENU; // (A4) Left ALT key
     case GDK_Alt_R:
-    case GDK_ISO_Level3_Shift:
         return VKEY_RMENU; // (A5) Right ALT key
 
     case GDK_Pause:
index 7602513..6171e4a 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-26  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144016.
+        http://trac.webkit.org/changeset/144016
+        https://bugs.webkit.org/show_bug.cgi?id=110856
+
+        Breaks compilation on chromium mac (Requested by vsevik on
+        #webkit).
+
+        * WebKit.gypi:
+        * tests/KeyCodeConversionTest.cpp: Removed.
+
 2013-02-26  James Robinson  <jamesr@chromium.org>
 
         [chromium] Fix continuous painting mode
index 1afee54..d581128 100644 (file)
@@ -86,7 +86,6 @@
             'tests/MockDiscardablePixelRef.h',
             'tests/MockImageDecoder.h',
             'tests/KeyboardTest.cpp',
-            'tests/KeyCodeConversionTest.cpp',
             'tests/KURLTest.cpp',
             'tests/LevelDBTest.cpp',
             'tests/LinkHighlightTest.cpp',
diff --git a/Source/WebKit/chromium/tests/KeyCodeConversionTest.cpp b/Source/WebKit/chromium/tests/KeyCodeConversionTest.cpp
deleted file mode 100644 (file)
index dedb933..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "KeyCodeConversion.h"
-
-#include "KeyboardCodes.h"
-#include <gdk/gdkkeysyms.h>
-#include <gtest/gtest.h>
-
-using namespace WebCore;
-
-namespace {
-
-#if OS(LINUX)
-TEST(KeyCodeConversionTest, KeyPadClear)
-{
-    EXPECT_EQ(VKEY_CLEAR, windowsKeyCodeForKeyEvent(GDK_KP_Begin));
-}
-
-TEST(KeyCodeConversionTest, KeyPadInsert)
-{
-    EXPECT_EQ(windowsKeyCodeForKeyEvent(GDK_Insert),
-        windowsKeyCodeForKeyEvent(GDK_KP_Begin));
-}
-
-TEST(KeyCodeConversionTest, KeyPadDelete)
-{
-    EXPECT_EQ(windowsKeyCodeForKeyEvent(GDK_Delete),
-        windowsKeyCodeForKeyEvent(GDK_KP_Delete));
-}
-
-TEST(KeyCodeConversionTest, AltGr)
-{
-    EXPECT_EQ(windowsKeyCodeForKeyEvent(GDK_Alt_R),
-        windowsKeyCodeForKeyEvent(GDK_ISO_Level3_Shift));
-}
-#endif
-
-} // anonymous namespace