Title: [118385] trunk/Source
- Revision
- 118385
- Author
- [email protected]
- Date
- 2012-05-24 09:39:51 -0700 (Thu, 24 May 2012)
Log Message
[Qt] Fix Webkit1 + V8 build.
https://bugs.webkit.org/show_bug.cgi?id=87368
Patch by Gabor Ballabas <[email protected]> on 2012-05-24
Reviewed by Eric Seidel.
Source/WebCore:
No new tests, because this is a buildfix.
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateImplementation):
* bindings/v8/npruntime_impl.h:
* bindings/v8/npruntime_priv.h:
Source/WebKit/qt:
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::evaluateScriptInIsolatedWorld):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118384 => 118385)
--- trunk/Source/WebCore/ChangeLog 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebCore/ChangeLog 2012-05-24 16:39:51 UTC (rev 118385)
@@ -1,3 +1,17 @@
+2012-05-24 Gabor Ballabas <[email protected]>
+
+ [Qt] Fix Webkit1 + V8 build.
+ https://bugs.webkit.org/show_bug.cgi?id=87368
+
+ Reviewed by Eric Seidel.
+
+ No new tests, because this is a buildfix.
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateImplementation):
+ * bindings/v8/npruntime_impl.h:
+ * bindings/v8/npruntime_priv.h:
+
2012-05-24 Dana Jansens <[email protected]>
[chromium] Only display frames created with memory allocations meant to be displayed
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (118384 => 118385)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-05-24 16:39:51 UTC (rev 118385)
@@ -2848,6 +2848,8 @@
void ${className}::installPerContextProperties(v8::Handle<v8::Object> instance, ${implClassName}* impl)
{
v8::Local<v8::Object> proto = v8::Local<v8::Object>::Cast(instance->GetPrototype());
+ // When building QtWebkit with V8 this variable is unused when none of the features are enabled.
+ UNUSED_PARAM(proto);
END
# Setup the enable-by-settings attrs if we have them
foreach my $runtimeAttr (@enabledPerContext) {
Modified: trunk/Source/WebCore/bindings/v8/npruntime_impl.h (118384 => 118385)
--- trunk/Source/WebCore/bindings/v8/npruntime_impl.h 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebCore/bindings/v8/npruntime_impl.h 2012-05-24 16:39:51 UTC (rev 118385)
@@ -34,7 +34,7 @@
#if PLATFORM(CHROMIUM)
#include <bindings/npruntime.h>
#else
-#include "npruntime.h"
+#include "npruntime_internal.h"
#endif
// This file exists to support WebCore, which expects to be able to call upon
Modified: trunk/Source/WebCore/bindings/v8/npruntime_priv.h (118384 => 118385)
--- trunk/Source/WebCore/bindings/v8/npruntime_priv.h 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebCore/bindings/v8/npruntime_priv.h 2012-05-24 16:39:51 UTC (rev 118385)
@@ -29,7 +29,7 @@
#if PLATFORM(CHROMIUM)
#include <bindings/npruntime.h>
#else
-#include "npruntime.h"
+#include "npruntime_internal.h"
#endif
#ifdef __cplusplus
Modified: trunk/Source/WebKit/qt/ChangeLog (118384 => 118385)
--- trunk/Source/WebKit/qt/ChangeLog 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-05-24 16:39:51 UTC (rev 118385)
@@ -1,3 +1,13 @@
+2012-05-24 Gabor Ballabas <[email protected]>
+
+ [Qt] Fix Webkit1 + V8 build.
+ https://bugs.webkit.org/show_bug.cgi?id=87368
+
+ Reviewed by Eric Seidel.
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::evaluateScriptInIsolatedWorld):
+
2012-05-24 Steffen Imhof <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=67093
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (118384 => 118385)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-05-24 16:29:22 UTC (rev 118384)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-05-24 16:39:51 UTC (rev 118385)
@@ -918,7 +918,8 @@
ScriptSourceCode source(script);
Vector<ScriptSourceCode> sources;
sources.append(source);
- proxy->evaluateInIsolatedWorld(0, sources, true);
+ Vector<ScriptValue> result;
+ proxy->evaluateInIsolatedWorld(0, sources, &result);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
