[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
abarth at webkit.org
abarth at webkit.org
Sun Feb 20 23:05:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit cb319d4ccd23bbb8951635f7b85a1ff4e53c73fe
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 10:15:39 2011 +0000
2011-01-17 Adam Barth <abarth at webkit.org>
Update path to reflect new WebKit directory location.
* tests/WebFrameTest.cpp:
(WebKit::WebFrameTest::registerMockedURLLoad):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75931 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 92fed5d..08b5b68 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-17 Adam Barth <abarth at webkit.org>
+
+ Update path to reflect new WebKit directory location.
+
+ * tests/WebFrameTest.cpp:
+ (WebKit::WebFrameTest::registerMockedURLLoad):
+
2011-01-16 Kent Tamura <tkent at chromium.org>
Unreviewed, Chromium-linux build fix.
diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
index 540fa1b..7342721 100644
--- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
+++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
@@ -55,7 +55,7 @@ public:
void registerMockedURLLoad(const WebURL& url, const WebURLResponse& response, const WebString& fileName)
{
std::string filePath = webkit_support::GetWebKitRootDir().utf8();
- filePath.append("/WebKit/chromium/tests/data/");
+ filePath.append("/Source/WebKit/chromium/tests/data/");
filePath.append(fileName.utf8());
webkit_support::RegisterMockedURL(url, response, WebString::fromUTF8(filePath));
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list