Changeset 85859 in webkit

Timestamp:

May 5, 2011 9:40:14 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-05-05 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Return correct GTK version for NPNVToolkit
​https://bugs.webkit.org/show_bug.cgi?id=60275

• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: (WebKit::NPN_GetValue): Return always 2 for NPNVToolkit in GTK platform.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Return correct GTK version for NPNVToolkit
+        https://bugs.webkit.org/show_bug.cgi?id=60275
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_GetValue): Return always 2 for NPNVToolkit in GTK
+        platform.
+
 2011-05-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -509 +509 @@
 
        case NPNVToolkit: {
+#if PLATFORM(GTK)
+           *reinterpret_cast<uint32_t*>(value) = 2;
+#else
            const uint32_t expectedGTKToolKitVersion = 2;
 
@@ -522 +525 @@
 
            *reinterpret_cast<uint32_t*>(value) = requiresGTKToolKitVersion ? expectedGTKToolKitVersion : 0;
+#endif
            break;
        }