Title: [94983] trunk/Tools
- Revision
- 94983
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-12 15:21:59 -0700 (Mon, 12 Sep 2011)
Log Message
Unreviewed, rolling out r94976.
http://trac.webkit.org/changeset/94976
https://bugs.webkit.org/show_bug.cgi?id=67953
Broke a bunch of security/load& tests (Requested by rniwa on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-12
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
(LayoutTestController::pathToLocalResource):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (94982 => 94983)
--- trunk/Tools/ChangeLog 2011-09-12 22:19:37 UTC (rev 94982)
+++ trunk/Tools/ChangeLog 2011-09-12 22:21:59 UTC (rev 94983)
@@ -1,3 +1,15 @@
+2011-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r94976.
+ http://trac.webkit.org/changeset/94976
+ https://bugs.webkit.org/show_bug.cgi?id=67953
+
+ Broke a bunch of security/load& tests (Requested by rniwa on
+ #webkit).
+
+ * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+ (LayoutTestController::pathToLocalResource):
+
2011-09-12 Eric Seidel <e...@webkit.org>
Rubber-stamped by Adam Barth.
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm (94982 => 94983)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm 2011-09-12 22:19:37 UTC (rev 94982)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm 2011-09-12 22:21:59 UTC (rev 94983)
@@ -355,24 +355,9 @@
m_waitToDump = false;
}
-JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSStringRef localResourcePath)
+JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSStringRef url)
{
- // Use the absolute path for the test from m_testPathOrURL
- // to create an absolute path for the requested local resource.
- // FIXME: This code should work on all *nix platforms and can be moved into LayoutTestController.cpp.
- size_t maxBufferSize = JSStringGetMaximumUTF8CStringSize(localResourcePath);
- char* resourcePathAsUTF8 = new char[maxBufferSize];
- size_t resourcePathAsUTF8BufferSize = JSStringGetUTF8CString(localResourcePath, resourcePathAsUTF8, maxBufferSize);
-
- std::string resourcePathAsString(resourcePathAsUTF8, resourcePathAsUTF8BufferSize - 1); // Ignore the trailing \0 when creating the string.
- delete[] resourcePathAsUTF8;
-
- size_t resourceLayoutTestsIndex = resourcePathAsString.rfind("LayoutTests/");
- ASSERT(resourceLayoutTestsIndex); // Passed in paths must include "LayoutTests/"
- size_t testLayoutTestsIndex = m_testPathOrURL.rfind("LayoutTests/");
- std::string resolvedResourcePath = m_testPathOrURL.substr(0, testLayoutTestsIndex) + resourcePathAsString.substr(resourceLayoutTestsIndex);
-
- return JSStringCreateWithUTF8CString(resolvedResourcePath.c_str());
+ return JSStringRetain(url); // Do nothing on mac.
}
void LayoutTestController::queueLoad(JSStringRef url, JSStringRef target)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
