Changeset 94983 in webkit

Timestamp:

Sep 12, 2011, 3:21:59 PM (14 years ago)

Author:

commit-queue@webkit.org

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.bot@gmail.com> on 2011-09-12

• DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::pathToLocalResource):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/LayoutTestControllerMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-12  Sheriff Bot  <webkit.review.bot@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  <eric@webkit.org>
 

trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm

@@ -356 +356 @@
 }
 
-JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSStringRef localResourcePath)
-{
-    // 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());
+JSStringRef LayoutTestController::pathToLocalResource(JSContextRef context, JSStringRef url)
+{
+    return JSStringRetain(url); // Do nothing on mac.
 }