Changeset 80067 in webkit

Timestamp:

Mar 1, 2011 4:56:50 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-03-01 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

WKPluginSiteDataManagerClearAllSiteData is not working
​https://bugs.webkit.org/show_bug.cgi?id=55528
<rdar://problem/9071823>

• Shared/Plugins/Netscape/NetscapePluginModule.cpp: (WebKit::NetscapePluginModule::tryGetSitesWithData): Remove version checks, checking that the function pointer is not null is enough.

(WebKit::NetscapePluginModule::tryClearSiteData):
Remove version checks, checking that the function pointer is not null is enough.
Also, correctly convert a null String to a null CString.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/NetscapePluginModule.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-01  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WKPluginSiteDataManagerClearAllSiteData is not working
+        https://bugs.webkit.org/show_bug.cgi?id=55528
+        <rdar://problem/9071823>
+
+        * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+        (WebKit::NetscapePluginModule::tryGetSitesWithData):
+        Remove version checks, checking that the function pointer is not null is enough.
+
+        (WebKit::NetscapePluginModule::tryClearSiteData):
+        Remove version checks, checking that the function pointer is not null is enough.
+        Also, correctly convert a null String to a null CString.
+
 2011-03-01  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp

@@ -95 +95 @@
 
     // Check if the plug-in supports NPP_GetSitesWithData.
-    if (m_pluginFuncs.size < sizeof(NPPluginFuncs))
-        return false;
-
-    if ((m_pluginFuncs.version & 0xff) < NPVERS_HAS_CLEAR_SITE_DATA)
-        return false;
-
     if (!m_pluginFuncs.getsiteswithdata)
         return false;
@@ -124 +118 @@
         return false;
 
-    // Check if the plug-in supports NPP_GetSitesWithData.
-    if (m_pluginFuncs.size < sizeof(NPPluginFuncs))
-        return false;
-    
-    if ((m_pluginFuncs.version & 0xff) < NPVERS_HAS_CLEAR_SITE_DATA)
-        return false;
-    
+    // Check if the plug-in supports NPP_ClearSiteData.
     if (!m_pluginFuncs.clearsitedata)
         return false;
 
-    return m_pluginFuncs.clearsitedata(site.utf8().data(), flags, maxAge) != NPERR_NO_ERROR;
+    CString siteString;
+    if (!site.isNull())
+        siteString = site.utf8();
+
+    return m_pluginFuncs.clearsitedata(siteString.data(), flags, maxAge) == NPERR_NO_ERROR;
 }