Changeset 27763 in webkit for trunk/JavaScriptCore/kjs/interpreter.h

Timestamp:

Nov 13, 2007, 4:30:19 PM (18 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Sam Weinig.

Moved Shared.h into wtf so it could be used in more places. Deployed
Shared in places where JSCore previously had hand-rolled ref-counting
classes.

• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass):
• API/JSClassRef.h:
• API/JSObjectRef.cpp: (JSClassRetain): (JSClassRelease):
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/interpreter.cpp: (KJS::Interpreter::init):
• kjs/interpreter.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp):
• kjs/regexp.h:
• wtf/Shared.h: Copied from WebCore/platform/Shared.h.

JavaScriptGlue:

Reviewed by Sam Weinig.

Moved Shared.h into wtf so it could be used in more places.

• ForwardingHeaders/wtf/Shared.h: Added.

WebCore:

Reviewed by Sam Weinig.

Moved Shared.h into wtf so it could be used in more places. Retained
TreeShared, but moved it to its own file, TreeShared.h.

• ForwardingHeaders/wtf/Shared.h: Added.
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSSVGPODTypeWrapper.h:
• css/CSSFontFace.h:
• css/CSSRuleList.h:
• css/Counter.h:
• css/Pair.h:
• css/Rect.h:
• css/StyleBase.h:
• css/StyleSheetList.h:
• dom/Clipboard.h:
• dom/DOMImplementation.h:
• dom/Event.h:
• dom/EventListener.h:
• dom/NamedNodeMap.h:
• dom/NodeFilterCondition.h:
• dom/NodeList.h:
• dom/Range.h:
• dom/RangeException.h:
• dom/RegisteredEventListener.h:
• dom/Traversal.h:
• history/BackForwardList.h:
• history/CachedPage.h:
• history/HistoryItem.h:
• html/CanvasGradient.h:
• html/CanvasPattern.h:
• html/HTMLCollection.h:
• html/MediaError.h:
• html/TimeRanges.h:
• html/VoidCallback.h:
• ksvg2/css/SVGRenderStyleDefs.h:
• ksvg2/svg/SVGAnimatedTemplate.h:
• ksvg2/svg/SVGElementInstanceList.h:
• ksvg2/svg/SVGList.h:
• ksvg2/svg/SVGPathSeg.h:
• ksvg2/svg/SVGPreserveAspectRatio.h:
• ksvg2/svg/SVGRenderingIntent.h:
• ksvg2/svg/SVGTransform.h:
• ksvg2/svg/SVGUnitTypes.h:
• loader/DocumentLoader.h:
• loader/FormState.h:
• loader/ResourceLoader.h:
• loader/TextResourceDecoder.h:
• loader/icon/IconRecord.h:
• page/BarInfo.h:
• page/Console.h:
• page/DOMSelection.h:
• page/DOMWindow.h:
• page/History.h:
• page/InspectorController.cpp:
• page/Plugin.h:
• page/Screen.h:
• platform/ArrayImpl.h:
• platform/CString.h:
• platform/DeprecatedValueListImpl.cpp:
• platform/FontFallbackList.h:
• platform/FontFamily.h:
• platform/FontSelector.h:
• platform/GlyphPageTreeNode.h:
• platform/PopupMenu.h:
• platform/RegularExpression.cpp:
• platform/ScrollBar.h:
• platform/Shared.h: Removed.
• platform/SharedBuffer.h:
• platform/StringImpl.h:
• platform/graphics/Icon.h:
• platform/graphics/svg/SVGResource.h:
• platform/network/FormData.h:
• platform/network/ResourceHandleClient.h:
• rendering/RenderStyle.h:
• rendering/SVGCharacterLayoutInfo.h:
• storage/SQLResultSetRowList.h:
• xml/DOMParser.h:
• xml/XMLSerializer.h:
• xml/XPathEvaluator.h:
• xml/XPathExpression.h:
• xml/XPathNSResolver.h:
• xml/XPathResult.h:

WebKit/mac:

Reviewed by Sam Weinig.

Moved Shared.h into wtf so it could be used in more places.

• ChangeLog:
• WebCoreSupport/WebContextMenuClient.h:

File:

• trunk/JavaScriptCore/kjs/interpreter.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/interpreter.h

@@ -27 +27 @@
 #include "ExecState.h"
 #include "protect.h"
+#include "types.h"
 #include "value.h"
-#include "types.h"
+#include <wtf/Shared.h>
 
 namespace KJS {
@@ -76 +77 @@
    * " Object" and "Number".
    */
-  class Interpreter {
+  class Interpreter : public Shared<Interpreter> {
       friend class Collector;
   public:
@@ -101 +102 @@
      */
     Interpreter();
+    
+    virtual ~Interpreter(); // only deref should delete us
 
     /**
@@ -328 +331 @@
     bool timedOut();
     
-    void ref() { ++m_refCount; }
-    void deref() { if (--m_refCount <= 0) delete this; }
-    int refCount() const { return m_refCount; }
-    
 protected:
-    virtual ~Interpreter(); // only deref should delete us
     virtual bool shouldInterruptScript() const { return true; }
 
@@ -347 +345 @@
     Interpreter(const Interpreter&);
     Interpreter operator=(const Interpreter&);
-    
-    int m_refCount;
     
     ExecState* m_currentExec;