Changeset 49550 in webkit

Timestamp:

Oct 13, 2009 7:42:58 PM (15 years ago)

Author:

hyatt@apple.com

Message:

Fix more WebView bustage.

• WebView.cpp:

(WebView::addUserScriptToGroup):
(WebView::addUserStyleSheetToGroup):
(WebView::removeUserScriptsFromGroup):
(WebView::removeUserStyleSheetsFromGroup):

Location:

trunk/WebKit/win

Files:

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

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-10-13  Dave Hyatt  <hyatt@apple.com>
+
+        Fix more WebView bustage.
+
+        * WebView.cpp:
+        (WebView::addUserScriptToGroup):
+        (WebView::addUserStyleSheetToGroup):
+        (WebView::removeUserScriptsFromGroup):
+        (WebView::removeUserStyleSheetsFromGroup):
+
 2009-10-13  Dave Hyatt  <hyatt@apple.com>
 

trunk/WebKit/win/WebView.cpp

@@ -5454 +5454 @@
         return E_FAIL;
 
-    pageGroup->addUserScriptToGroup(String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
-                                    toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist), worldID,
+    pageGroup->addUserScriptToWorld(worldID, String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
+                                    toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist),
                                     injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd);
 
@@ -5474 +5474 @@
         return E_FAIL;
 
-    pageGroup->addUserStyleSheetToGroup(String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
-                                        toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist), worldID);
+    pageGroup->addUserStyleSheetToWorld(worldID, String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
+                                        toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist));
 
     return S_OK;
@@ -5523 +5523 @@
         return E_FAIL;
 
-    pageGroup->removeUserScriptFromWorld(worldID);
+    pageGroup->removeUserScriptsFromWorld(worldID);
     return S_OK;
 }
@@ -5538 +5538 @@
         return E_FAIL;
 
-    pageGroup->removeUserStyleSheetFromWorld(worldID);
+    pageGroup->removeUserStyleSheetsFromWorld(worldID);
     return S_OK;
 }