Changeset 179848 in webkit

Timestamp:

Feb 9, 2015, 3:25:35 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179841. <rdar://problem/19772847>

Location:

branches/safari-600.1.17-branch/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

branches/safari-600.1.17-branch/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-02-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179841.
+
+    2015-02-09  Brent Fulgham  <bfulgham@apple.com>
+
+            AX: [Win] OBJID_CLIENT comparisons broken in 64-bit builds
+            https://bugs.webkit.org/show_bug.cgi?id=141391
+            <rdar://problem/19767342>
+
+            Reviewed by Anders Carlsson.
+
+            * WebView.cpp:
+            (WebView::onGetObject): Cast lParam as LONG to ensure proper word size for
+            comparison against OBJID_CLIENT.
+
 2014-08-26  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.1.17-branch/Source/WebKit/win/WebView.cpp

@@ -6213 +6213 @@
     lResult = 0;
 
-    if (lParam != OBJID_CLIENT)
+    if (static_cast<LONG>(lParam) != OBJID_CLIENT)
         return false;