Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f

* changes:
  Merge WebKit at r78450: Update ThirdPartyProject.prop
  Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
  Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
  Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
  Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
  Merge WebKit at r78450: FrameLoader::url() removed
  Merge WebKit at r78450: HTMLParserQuirks removed
  Merge WebKit at r78450: TextRun::padding() renamed
  Merge WebKit at r78450: Use new FontMetrics
  Merge WebKit at r78450: GraphicsContext current path removed
  Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
  Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
  Merge WebKit at r78450: IntRect::bottom()/right() renamed
  Merge WebKit at r78450: Fix remaining conflicts
  Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
  Merge WebKit at r78450: Fix conflicts in media controls
  Merge WebKit at r78450: Fix Makefiles
  Merge WebKit at r78450: Initial merge by git.

1 files changed, 28 insertions, 19 deletions

diff --git a/Tools/DumpRenderTree/gtk/EventSender.cpp b/Tools/DumpRenderTree/gtk/EventSender.cpp
index 923a4ba..10e129c 100644
--- a/Tools/DumpRenderTree/gtk/EventSender.cpp
+++ b/Tools/DumpRenderTree/gtk/EventSender.cpp
@@ -240,33 +240,42 @@ static void updateClickCount(int button)
         clickCount++;
 }
 
+static guint gdkModifierFromJSValue(JSContextRef context, const JSValueRef value)
+{
+    JSStringRef string = JSValueToStringCopy(context, value, 0);
+    guint gdkModifier = 0;
+    if (JSStringIsEqualToUTF8CString(string, "ctrlKey")
+        || JSStringIsEqualToUTF8CString(string, "addSelectionKey"))
+        gdkModifier = GDK_CONTROL_MASK;
+    else if (JSStringIsEqualToUTF8CString(string, "shiftKey")
+             || JSStringIsEqualToUTF8CString(string, "rangeSelectionKey"))
+        gdkModifier = GDK_SHIFT_MASK;
+    else if (JSStringIsEqualToUTF8CString(string, "altKey"))
+        gdkModifier = GDK_MOD1_MASK;
+    
+    // Currently the metaKey as defined in WebCore/platform/gtk/MouseEventGtk.cpp
+    // is GDK_MOD2_MASK. This code must be kept in sync with that file.
+    else if (JSStringIsEqualToUTF8CString(string, "metaKey"))
+        gdkModifier = GDK_MOD2_MASK;
+    
+    JSStringRelease(string);
+    return gdkModifier;
+}
+
 static guint gdkModifersFromJSValue(JSContextRef context, const JSValueRef modifiers)
 {
+    // The value may either be a string with a single modifier or an array of modifiers.
+    if (JSValueIsString(context, modifiers))
+        return gdkModifierFromJSValue(context, modifiers);
+
     JSObjectRef modifiersArray = JSValueToObject(context, modifiers, 0);
     if (!modifiersArray)
         return 0;
 
     guint gdkModifiers = 0;
     int modifiersCount = JSValueToNumber(context, JSObjectGetProperty(context, modifiersArray, JSStringCreateWithUTF8CString("length"), 0), 0);
-    for (int i = 0; i < modifiersCount; ++i) {
-        JSValueRef value = JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0);
-        JSStringRef string = JSValueToStringCopy(context, value, 0);
-        if (JSStringIsEqualToUTF8CString(string, "ctrlKey")
-            || JSStringIsEqualToUTF8CString(string, "addSelectionKey"))
-            gdkModifiers |= GDK_CONTROL_MASK;
-        else if (JSStringIsEqualToUTF8CString(string, "shiftKey")
-                 || JSStringIsEqualToUTF8CString(string, "rangeSelectionKey"))
-            gdkModifiers |= GDK_SHIFT_MASK;
-        else if (JSStringIsEqualToUTF8CString(string, "altKey"))
-            gdkModifiers |= GDK_MOD1_MASK;
-
-        // Currently the metaKey as defined in WebCore/platform/gtk/MouseEventGtk.cpp
-        // is GDK_MOD2_MASK. This code must be kept in sync with that file.
-        else if (JSStringIsEqualToUTF8CString(string, "metaKey"))
-            gdkModifiers |= GDK_MOD2_MASK;
-
-        JSStringRelease(string);
-    }
+    for (int i = 0; i < modifiersCount; ++i)
+        gdkModifiers |= gdkModifierFromJSValue(context, JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0));
     return gdkModifiers;
 }