Title: [128349] trunk/Tools
- Revision
- 128349
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 12:25:52 -0700 (Wed, 12 Sep 2012)
Log Message
Regression(r128338): Broke Windows build
https://bugs.webkit.org/show_bug.cgi?id=96537
Unreviewed build fix.
Fix Apple-Win build by allocating array dynamically
since its size is not constant.
Patch by Christophe Dumez <christophe.du...@intel.com> on 2012-09-12
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::stringArrayToJS):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128348 => 128349)
--- trunk/Tools/ChangeLog 2012-09-12 19:23:37 UTC (rev 128348)
+++ trunk/Tools/ChangeLog 2012-09-12 19:25:52 UTC (rev 128349)
@@ -1,3 +1,16 @@
+2012-09-12 Christophe Dumez <christophe.du...@intel.com>
+
+ Regression(r128338): Broke Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=96537
+
+ Unreviewed build fix.
+
+ Fix Apple-Win build by allocating array dynamically
+ since its size is not constant.
+
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::stringArrayToJS):
+
2012-09-12 Alex Sakhartchouk <ale...@chromium.org>
[chromium] Add a virtual test suite for fast/hidpi
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (128348 => 128349)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-12 19:23:37 UTC (rev 128348)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-12 19:25:52 UTC (rev 128349)
@@ -46,6 +46,8 @@
#include <WebKit2/WebKit2_C.h>
#include <wtf/CurrentTime.h>
#include <wtf/HashMap.h>
+#include <wtf/OwnArrayPtr.h>
+#include <wtf/PassOwnArrayPtr.h>
#include <wtf/text/StringBuilder.h>
#if ENABLE(WEB_INTENTS)
@@ -334,14 +336,14 @@
{
const size_t count = WKArrayGetSize(strings);
- JSValueRef jsStringsArray[count];
+ OwnArrayPtr<JSValueRef> jsStringsArray = adoptArrayPtr(new JSValueRef[count]);
for (size_t i = 0; i < count; ++i) {
WKStringRef stringRef = static_cast<WKStringRef>(WKArrayGetItemAtIndex(strings, i));
JSRetainPtr<JSStringRef> stringJS = toJS(stringRef);
jsStringsArray[i] = JSValueMakeString(context, stringJS.get());
}
- return JSObjectMakeArray(context, count, jsStringsArray, 0);
+ return JSObjectMakeArray(context, count, jsStringsArray.get(), 0);
}
JSValueRef TestRunner::originsWithApplicationCache()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
