From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/JavaScriptCore/runtime/JSWeakMap.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSWeakMap.cpp') diff --git a/Source/JavaScriptCore/runtime/JSWeakMap.cpp b/Source/JavaScriptCore/runtime/JSWeakMap.cpp index 049686df2..8a2b30d84 100644 --- a/Source/JavaScriptCore/runtime/JSWeakMap.cpp +++ b/Source/JavaScriptCore/runtime/JSWeakMap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple, Inc. All rights reserved. + * Copyright (C) 2013, 2016 Apple, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,13 +26,12 @@ #include "config.h" #include "JSWeakMap.h" -#include "JSCJSValueInlines.h" -#include "SlotVisitorInlines.h" +#include "JSCInlines.h" #include "WeakMapData.h" namespace JSC { -const ClassInfo JSWeakMap::s_info = { "WeakMap", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSWeakMap) }; +const ClassInfo JSWeakMap::s_info = { "WeakMap", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWeakMap) }; void JSWeakMap::finishCreation(VM& vm) { @@ -44,7 +43,12 @@ void JSWeakMap::visitChildren(JSCell* cell, SlotVisitor& visitor) { Base::visitChildren(cell, visitor); JSWeakMap* thisObj = jsCast(cell); - visitor.append(&thisObj->m_weakMapData); + visitor.append(thisObj->m_weakMapData); +} + +String JSWeakMap::toStringName(const JSObject*, ExecState*) +{ + return ASCIILiteral("Object"); } } -- cgit v1.2.1