[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
hyatt at apple.com
hyatt at apple.com
Thu Oct 29 20:38:18 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit bcb1d12328b89baec5d5fb3ffd48c21f9dbc8d7f
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 2 20:07:15 2009 +0000
Fix Windows bustage.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index e07c30d..c6d10c7 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -5459,7 +5459,7 @@ HRESULT WebView::addUserScriptToGroup(BSTR groupName, unsigned worldID, BSTR sou
return E_FAIL;
pageGroup->addUserScript(String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
- toStringVector(whitelist), toStringVector(blacklist), worldID,
+ toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist), worldID,
injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd);
return S_OK;
@@ -5479,7 +5479,7 @@ HRESULT WebView::addUserStyleSheetToGroup(BSTR groupName, unsigned worldID, BSTR
return E_FAIL;
pageGroup->addUserStyleSheet(String(source, SysStringLen(source)), KURL(KURL(), String(url, SysStringLen(url))),
- toStringVector(whitelist), toStringVector(blacklist), worldID);
+ toStringVector(whitelistCount, whitelist), toStringVector(blacklistCount, blacklist), worldID);
return S_OK;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list