diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/JavaScriptCore/runtime/Operations.h | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/runtime/Operations.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/Operations.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h index 01df7e98c..7301bf6ec 100644 --- a/Source/JavaScriptCore/runtime/Operations.h +++ b/Source/JavaScriptCore/runtime/Operations.h @@ -26,7 +26,7 @@ #include "Interpreter.h" #include "JSProxy.h" #include "JSString.h" -#include "JSValueInlineMethods.h" +#include "JSValueInlines.h" namespace JSC { @@ -86,6 +86,7 @@ namespace JSC { if (ropeBuilder.length() < oldLength) // True for overflow return throwOutOfMemoryError(exec); + oldLength = ropeBuilder.length(); } return ropeBuilder.release(); @@ -105,6 +106,7 @@ namespace JSC { if (ropeBuilder.length() < oldLength) // True for overflow return throwOutOfMemoryError(exec); + oldLength = ropeBuilder.length(); } return ropeBuilder.release(); @@ -356,6 +358,23 @@ namespace JSC { } } + inline bool isPrototypeChainNormalized(JSGlobalObject* globalObject, Structure* structure) + { + for (;;) { + if (structure->typeInfo().type() == ProxyType) + return false; + + JSValue v = structure->prototypeForLookup(globalObject); + if (v.isNull()) + return true; + + structure = v.asCell()->structure(); + + if (structure->isDictionary()) + return false; + } + } + } // namespace JSC #endif // Operations_h |