diff options
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/scripts/CodeGeneratorV8.pm | 12 | ||||
| -rw-r--r-- | WebCore/bindings/v8/ScriptControllerQt.cpp | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8GCController.cpp | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm index 26c1dc7..6f39582 100644 --- a/WebCore/bindings/scripts/CodeGeneratorV8.pm +++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm @@ -1,4 +1,3 @@ - # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org> # Copyright (C) 2006 Anders Carlsson <andersca@mac.com> # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> @@ -39,6 +38,7 @@ my @implFixedHeader = (); my @implContent = (); my @implContentDecls = (); my %implIncludes = (); +my %headerIncludes = (); my @allParents = (); @@ -204,8 +204,11 @@ sub GetSVGPropertyTypes $implIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1; } elsif ($svgNativeType =~ /SVGTransformListPropertyTearOff/) { $svgListPropertyType = $svgWrappedNativeType; - $implIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1; - $implIncludes{"SVGTransformListPropertyTearOff.h"} = 1; + $headerIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1; + $headerIncludes{"SVGTransformListPropertyTearOff.h"} = 1; + } elsif ($svgNativeType =~ /SVGPathSegListPropertyTearOff/) { + $svgListPropertyType = $svgWrappedNativeType; + $headerIncludes{"SVGPathSegListPropertyTearOff.h"} = 1; } if ($svgPropertyType) { @@ -233,7 +236,6 @@ sub GenerateHeader # - Add default header template push(@headerContent, GenerateHeaderContentHeader($dataNode)); - my %headerInclues = (); $headerIncludes{"wtf/text/StringHash.h"} = 1; $headerIncludes{"WrapperTypeInfo.h"} = 1; $headerIncludes{"V8DOMWrapper.h"} = 1; @@ -249,7 +251,7 @@ sub GenerateHeader push(@headerContent, "#include <v8.h>\n"); push(@headerContent, "#include <wtf/HashMap.h>\n"); - + push(@headerContent, "\nnamespace WebCore {\n"); push(@headerContent, "\ntemplate<typename PropertyType> class SVGPropertyTearOff;\n") if $svgPropertyType; if ($svgNativeType) { diff --git a/WebCore/bindings/v8/ScriptControllerQt.cpp b/WebCore/bindings/v8/ScriptControllerQt.cpp index 246921e..11bcb01 100644 --- a/WebCore/bindings/v8/ScriptControllerQt.cpp +++ b/WebCore/bindings/v8/ScriptControllerQt.cpp @@ -40,7 +40,7 @@ QScriptEngine* ScriptController::qtScriptEngine() v8::Context::Scope scope(v8Context); if (v8Context.IsEmpty()) return 0; - m_qtScriptEngine = new QScriptEngine(QScriptEngine::AdoptCurrentContext); + m_qtScriptEngine = new QScriptEngine; } return m_qtScriptEngine.get(); } diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp index b26882b..3eeacec 100644 --- a/WebCore/bindings/v8/V8GCController.cpp +++ b/WebCore/bindings/v8/V8GCController.cpp @@ -444,7 +444,7 @@ void V8GCController::gcEpilogue() void V8GCController::checkMemoryUsage() { -#if PLATFORM(CHROMIUM) +#if PLATFORM(CHROMIUM) || PLATFORM(QT) && !OS(SYMBIAN) // These values are appropriate for Chromium only. const int lowUsageMB = 256; // If memory usage is below this threshold, do not bother forcing GC. const int highUsageMB = 1024; // If memory usage is above this threshold, force GC more aggresively. |