JSPropertyAttributes attributes;
};
-struct OpaqueJSClass : public Shared<OpaqueJSClass> {
+struct OpaqueJSClass : public RefCounted<OpaqueJSClass> {
static OpaqueJSClass* create(const JSClassDefinition*);
static OpaqueJSClass* createNoAutomaticPrototype(const JSClassDefinition*);
~OpaqueJSClass();
+2007-11-13 Geoffrey Garen <ggaren@apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Renamed Shared to RefCounted.
+
+ * API/JSClassRef.h:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * kjs/interpreter.h:
+ * kjs/regexp.h:
+ * wtf/RefCounted.h: Copied from JavaScriptCore/wtf/Shared.h.
+ (WTF::RefCounted::RefCounted):
+ * wtf/Shared.h: Removed.
+
2007-11-13 Adam Roben <aroben@apple.com>
Build fix
/* Begin PBXBuildFile section */
141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
- 1419D2010CEA4D0D00FF507A /* Shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D1030CEA472C00FF507A /* Shared.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1419D32D0CEA7CDE00FF507A /* RefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D32C0CEA7CDE00FF507A /* RefCounted.h */; settings = {ATTRIBUTES = (Private, ); }; };
1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
142711390A460BBB0080EEEA /* JSBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 142711380A460BBB0080EEEA /* JSBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
143A97E60A4A06E200456B66 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minidom.c; sourceTree = "<group>"; };
1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = minidom.js; sourceTree = "<group>"; };
141211200A48793C00480255 /* minidom */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = minidom; sourceTree = BUILT_PRODUCTS_DIR; };
- 1419D1030CEA472C00FF507A /* Shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shared.h; sourceTree = "<group>"; };
+ 1419D32C0CEA7CDE00FF507A /* RefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h; sourceTree = "<group>"; };
1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp; sourceTree = "<group>"; };
142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSBase.h; path = ../API/JSBase.h; sourceTree = "<group>"; };
1440051F0A531D3B0005F061 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Node.h; sourceTree = "<group>"; };
isa = PBXGroup;
children = (
E195678D09E7CF1200B89D13 /* unicode */,
- 65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
- 65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
- 65DFC92D08EA173A00F7300B /* HashTable.cpp */,
93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
1482B78A0A4305AB00517CFC /* APICast.h */,
938772E5038BFE19008635CE /* array_instance.h */,
F692A84E0255597D01FF60F7 /* array_object.h */,
65B1749909D0FEB700820339 /* array_object.lut.h */,
938C4F690CA06BC700D9310A /* ASCIICType.h */,
+ 65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
65E217B708E7EECC0023E5F6 /* Assertions.h */,
704FD35305697E6D003DBED9 /* bool_object.h */,
5182A53B06012C3000CBD2F2 /* c_class.h */,
651F6413039D5B5F0078395C /* dtoa.h */,
F692A85B0255597D01FF60F7 /* error_object.h */,
14BD53F30A3E12D800BAF59C /* ExecState.h */,
+ 65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
65E217BA08E7EECC0023E5F6 /* FastMalloc.h */,
935AF46909E9D9DB00ACD1D8 /* Forward.h */,
F692A85F0255597D01FF60F7 /* function.h */,
652246A40C8D7A0E007BDAF7 /* HashIterators.h */,
65DFC92B08EA173A00F7300B /* HashMap.h */,
65DFC92C08EA173A00F7300B /* HashSet.h */,
+ 65DFC92D08EA173A00F7300B /* HashTable.cpp */,
65DFC92E08EA173A00F7300B /* HashTable.h */,
65DFC92F08EA173A00F7300B /* HashTraits.h */,
933A349A038AE7C6008635CE /* identifier.h */,
65621E6C089E859700760F35 /* property_slot.h */,
65400C100A69BAF200509887 /* PropertyNameArray.h */,
65C02FBB0637462A003E7EE6 /* protect.h */,
+ 1419D32C0CEA7CDE00FF507A /* RefCounted.h */,
65C647B3093EF8D60022C380 /* RefPtr.h */,
F692A87E0255597D01FF60F7 /* regexp.h */,
F692A87C0255597D01FF60F7 /* regexp_object.h */,
5114F47C05E4426200D1BBBD /* runtime_root.h */,
14BD534A0A3E0AEA00BAF59C /* SavedBuiltins.h */,
9374D3A7038D9D74008635CE /* scope_chain.h */,
- 1419D1030CEA472C00FF507A /* Shared.h */,
F692A8800255597D01FF60F7 /* string_object.h */,
65B174F409D100FA00820339 /* string_object.lut.h */,
E11D51750B2E798D0056C188 /* StringExtras.h */,
14A396A60CD2933100B5B4FF /* SymbolTable.h */,
6541BD6E08E80A17002CBEE7 /* TCPageMap.h */,
6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,
+ 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */,
F692A8840255597D01FF60F7 /* types.h */,
93E26BFC08B151D400F85226 /* ucpinternal.h */,
6592C316098B7DE10003D4F6 /* Vector.h */,
6592C317098B7DE10003D4F6 /* VectorTraits.h */,
1CAF34880A6C421700ABE06E /* WebScriptObject.h */,
- 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
);
path = wtf;
sourceTree = "<group>";
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 1419D2010CEA4D0D00FF507A /* Shared.h in Headers */,
1482B78B0A4305AB00517CFC /* APICast.h in Headers */,
938C4F6A0CA06BC700D9310A /* ASCIICType.h in Headers */,
93AA4F780957251F0084B3A7 /* AlwaysInline.h in Headers */,
932F5B5C0822A1C700736975 /* ustring.h in Headers */,
14ABB36F099C076400E2A24F /* value.h in Headers */,
E1EF79AB0CE97BA60088D500 /* UTF8.h in Headers */,
+ 1419D32D0CEA7CDE00FF507A /* RefCounted.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
#include "protect.h"
#include "types.h"
#include "value.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace KJS {
* evaluation, and also provides access to built-in properties such as
* " Object" and "Number".
*/
- class Interpreter : public Shared<Interpreter> {
+ class Interpreter : public RefCounted<Interpreter> {
friend class Collector;
public:
/**
namespace KJS {
- class RegExp : public Shared<RegExp> {
+ class RegExp : public RefCounted<RegExp> {
private:
enum {
Global = 1,
*
*/
-#ifndef Shared_h
-#define Shared_h
+#ifndef RefCounted_h
+#define RefCounted_h
#include <wtf/Assertions.h>
#include <wtf/Noncopyable.h>
namespace WTF {
-template<class T> class Shared : Noncopyable {
+template<class T> class RefCounted : Noncopyable {
public:
- Shared()
+ RefCounted()
: m_refCount(0)
#ifndef NDEBUG
, m_deletionHasBegun(false)
} // namespace WTF
-using WTF::Shared;
+using WTF::RefCounted;
-#endif
+#endif // RefCounted_h
2007-11-13 Geoffrey Garen <ggaren@apple.com>
+ Reviewed by Anders Carlsson.
+
+ Renamed Shared to RefCounted.
+
+ * ForwardingHeaders/wtf/RefCounted.h: Copied from JavaScriptGlue/ForwardingHeaders/wtf/Shared.h.
+ * ForwardingHeaders/wtf/Shared.h: Removed.
+
+2007-11-13 Geoffrey Garen <ggaren@apple.com>
+
Reviewed by Sam Weinig.
Moved Shared.h into wtf so it could be used in more places.
--- /dev/null
+#include <JavaScriptCore/RefCounted.h>
+++ /dev/null
-#include <JavaScriptCore/Shared.h>
+2007-11-13 Geoffrey Garen <ggaren@apple.com>
+
+ Reviewed by Anders Carlsson.
+
+ Renamed Shared to RefCounted.
+
+ * ForwardingHeaders/wtf/RefCounted.h: Copied from WebCore/ForwardingHeaders/wtf/Shared.h.
+ * ForwardingHeaders/wtf/Shared.h: Removed.
+ * 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/Attribute.h:
+ * dom/Clipboard.h:
+ * dom/DOMImplementation.h:
+ * dom/Event.h:
+ * dom/EventListener.h:
+ * dom/NamedNodeMap.h:
+ * dom/NodeFilter.h:
+ * dom/NodeFilterCondition.h:
+ * dom/NodeList.h:
+ * dom/QualifiedName.h:
+ * dom/Range.h:
+ * dom/RangeException.h:
+ * dom/RegisteredEventListener.h:
+ * dom/Traversal.h:
+ * editing/EditCommand.h:
+ * history/BackForwardList.h:
+ * history/CachedPage.h:
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem):
+ * history/HistoryItem.h:
+ * html/CanvasGradient.h:
+ * html/CanvasPattern.h:
+ * html/CanvasRenderingContext2D.h:
+ * html/CanvasStyle.h:
+ * html/HTMLCollection.h:
+ * html/MediaError.h:
+ * html/TimeRanges.h:
+ * html/VoidCallback.h:
+ * ksvg2/css/SVGRenderStyle.cpp:
+ (WebCore::SVGRenderStyle::SVGRenderStyle):
+ * ksvg2/css/SVGRenderStyle.h:
+ * ksvg2/css/SVGRenderStyleDefs.cpp:
+ (StyleFillData::StyleFillData):
+ (StyleStrokeData::StyleStrokeData):
+ (StyleStopData::StyleStopData):
+ (StyleTextData::StyleTextData):
+ (StyleClipData::StyleClipData):
+ (StyleMaskData::StyleMaskData):
+ (StyleMarkerData::StyleMarkerData):
+ (StyleMiscData::StyleMiscData):
+ * ksvg2/css/SVGRenderStyleDefs.h:
+ * ksvg2/svg/SVGAngle.cpp:
+ (WebCore::SVGAngle::SVGAngle):
+ * ksvg2/svg/SVGAngle.h:
+ * ksvg2/svg/SVGAnimatedTemplate.h:
+ * ksvg2/svg/SVGElementInstanceList.h:
+ * ksvg2/svg/SVGException.h:
+ * ksvg2/svg/SVGList.h:
+ * ksvg2/svg/SVGPathSeg.h:
+ * ksvg2/svg/SVGPreserveAspectRatio.cpp:
+ (WebCore::SVGPreserveAspectRatio::SVGPreserveAspectRatio):
+ * 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/Frame.h:
+ * page/History.h:
+ * page/InspectorController.cpp:
+ * page/Plugin.h:
+ * page/Screen.h:
+ * platform/ArrayImpl.h:
+ * platform/CString.h:
+ * platform/Cursor.h:
+ * platform/DeprecatedValueListImpl.cpp:
+ (WebCore::DeprecatedValueListImpl::Private::Private):
+ * platform/FileChooser.h:
+ * platform/FontFallbackList.h:
+ * platform/FontFamily.cpp:
+ (WebCore::FontFamily::FontFamily):
+ * platform/FontFamily.h:
+ * platform/FontSelector.h:
+ * platform/GlyphPageTreeNode.h:
+ * platform/PopupMenu.h:
+ * platform/RegularExpression.cpp:
+ * platform/ScrollBar.h:
+ * platform/SharedBuffer.h:
+ * platform/StringImpl.h:
+ * platform/graphics/Icon.h:
+ * platform/graphics/svg/SVGResource.h:
+ * platform/network/FormData.cpp:
+ (WebCore::FormData::FormData):
+ * platform/network/FormData.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleClient.h:
+ * rendering/RenderStyle.cpp:
+ (WebCore::StyleSurroundData::StyleSurroundData):
+ (WebCore::StyleBoxData::StyleBoxData):
+ (WebCore::StyleVisualData::StyleVisualData):
+ (WebCore::StyleBackgroundData::StyleBackgroundData):
+ (WebCore::StyleMarqueeData::StyleMarqueeData):
+ (WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData):
+ (WebCore::StyleMultiColData::StyleMultiColData):
+ (WebCore::StyleTransformData::StyleTransformData):
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+ (WebCore::StyleInheritedData::StyleInheritedData):
+ * rendering/RenderStyle.h:
+ * rendering/SVGCharacterLayoutInfo.h:
+ (WebCore::SVGCharOnPath::SVGCharOnPath):
+ * storage/SQLResultSetRowList.h:
+ * xml/DOMParser.h:
+ * xml/XMLHttpRequest.h:
+ * xml/XMLSerializer.h:
+ * xml/XPathEvaluator.h:
+ * xml/XPathExpression.h:
+ * xml/XPathNSResolver.h:
+ * xml/XPathResult.h:
+ * xml/XPathValue.h:
+ * xml/XSLTProcessor.h:
+
2007-11-13 Brady Eidson <beidson@apple.com>
Reviewed by Mark Rowe
--- /dev/null
+#include <JavaScriptCore/RefCounted.h>
+++ /dev/null
-#include <JavaScriptCore/Shared.h>
#if ENABLE(SVG)
#include "Frame.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SVGElement.h"
#include <wtf/Assertions.h>
namespace WebCore {
template<typename PODType>
-class JSSVGPODTypeWrapper : public
Shared<JSSVGPODTypeWrapper<PODType> >
+class JSSVGPODTypeWrapper : public
RefCounted<JSSVGPODTypeWrapper<PODType> >
{
public:
virtual ~JSSVGPODTypeWrapper() { }
#define CSSFontFace_h
#include <wtf/Vector.h>
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class FontData;
class FontDescription;
-class CSSFontFace : public Shared<CSSFontFace> {
+class CSSFontFace : public RefCounted<CSSFontFace> {
public:
CSSFontFace(CSSFontSelector*);
~CSSFontFace();
#define CSSRuleList_h
#include "DeprecatedPtrList.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class CSSRule;
class StyleList;
-class CSSRuleList : public Shared<CSSRuleList> {
+class CSSRuleList : public RefCounted<CSSRuleList> {
public:
CSSRuleList();
CSSRuleList(StyleList*, bool omitCharsetRules = false);
#include "CSSPrimitiveValue.h"
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/PassRefPtr.h>
namespace WebCore {
-class Counter : public Shared<Counter> {
+class Counter : public RefCounted<Counter> {
public:
Counter(PassRefPtr<CSSPrimitiveValue> identifier, PassRefPtr<CSSPrimitiveValue> listStyle, PassRefPtr<CSSPrimitiveValue> separator)
: m_identifier(identifier)
#ifndef Pair_h
#define Pair_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "CSSPrimitiveValue.h"
#include <wtf/PassRefPtr.h>
// and border-spacing (all of which are space-separated sets of two values). At the moment we are only using it for
// border-radius and background-size, but (FIXME) border-spacing and background-position could be converted over to use
// it (eliminating some extra -webkit- internal properties).
-class Pair : public
Shared<Pair> {
+class Pair : public
RefCounted<Pair> {
public:
Pair() : m_first(0), m_second(0) { }
Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second)
#define Rect_h
#include "CSSPrimitiveValue.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
namespace WebCore {
- class Rect : public Shared<Rect> {
+ class Rect : public RefCounted<Rect> {
public:
virtual ~Rect() { }
#ifndef StyleBase_h
#define StyleBase_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class StyleSheet;
// a style class which has a parent (almost all have)
- class StyleBase : public Shared<StyleBase> {
+ class StyleBase : public RefCounted<StyleBase> {
public:
StyleBase(StyleBase* parent)
: m_parent(parent)
#ifndef StyleSheetList_h
#define StyleSheetList_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "DeprecatedPtrList.h"
namespace WebCore {
class StyleSheet;
class String;
-class StyleSheetList : public Shared<StyleSheetList> {
+class StyleSheetList : public RefCounted<StyleSheetList> {
public:
StyleSheetList(Document*);
~StyleSheetList();
// the actual Attr (Attr) with its value as textchild
// is only allocated on demand by the DOM bindings.
// Any use of Attr inside khtml should be avoided.
-class Attribute : public
Shared<Attribute> {
+class Attribute : public
RefCounted<Attribute> {
friend class Attr;
friend class Element;
friend class NamedAttrMap;
#include "DragImage.h"
#include "IntPoint.h"
#include "Node.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class String;
// State available during IE's events for drag and drop and copy/paste
- class Clipboard : public Shared<Clipboard> {
+ class Clipboard : public RefCounted<Clipboard> {
public:
Clipboard(ClipboardAccessPolicy policy, bool isForDragging);
virtual ~Clipboard() { }
#ifndef DOMImplementation_h
#define DOMImplementation_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
namespace WebCore {
typedef int ExceptionCode;
-class DOMImplementation : public Shared<DOMImplementation> {
+class DOMImplementation : public RefCounted<DOMImplementation> {
public:
virtual ~DOMImplementation();
#include "AtomicString.h"
#include "EventTarget.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
const int EventExceptionMax = 199;
enum EventExceptionCode { UNSPECIFIED_EVENT_TYPE_ERR = EventExceptionOffset };
- class Event : public Shared<Event> {
+ class Event : public RefCounted<Event> {
public:
enum PhaseType {
CAPTURING_PHASE = 1,
#ifndef EventListener_h
#define EventListener_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Event;
- class EventListener : public Shared<EventListener> {
+ class EventListener : public RefCounted<EventListener> {
public:
virtual ~EventListener() { }
virtual void handleEvent(Event*, bool isWindowEvent = false) = 0;
#ifndef NamedNodeMap_h
#define NamedNodeMap_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/PassRefPtr.h>
namespace WebCore {
// Generic NamedNodeMap interface
// Other classes implement this for more specific situations e.g. attributes of an element.
-class NamedNodeMap : public Shared<NamedNodeMap> {
+class NamedNodeMap : public RefCounted<NamedNodeMap> {
public:
NamedNodeMap() { }
virtual ~NamedNodeMap() { }
namespace WebCore {
- class NodeFilter : public Shared<NodeFilter> {
+ class NodeFilter : public RefCounted<NodeFilter> {
public:
/**
* The following constants are returned by the acceptNode()
#ifndef NodeFilterCondition_h
#define NodeFilterCondition_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Node;
- class NodeFilterCondition : public Shared<NodeFilterCondition> {
+ class NodeFilterCondition : public RefCounted<NodeFilterCondition> {
public:
virtual ~NodeFilterCondition() { }
virtual short acceptNode(Node*) const;
#ifndef NodeList_h
#define NodeList_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
class AtomicString;
class Node;
-class NodeList : public Shared<NodeList> {
+class NodeList : public RefCounted<NodeList> {
public:
struct Caches {
class QualifiedName {
public:
- class QualifiedNameImpl : public Shared<QualifiedNameImpl> {
+ class QualifiedNameImpl : public RefCounted<QualifiedNameImpl> {
public:
QualifiedNameImpl(const AtomicString& p, const AtomicString& l, const AtomicString& n) :m_prefix(p), m_localName(l), m_namespace(n) {}
#ifndef Range_h
#define Range_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
class Position;
class String;
-class Range : public Shared<Range>
+class Range : public RefCounted<Range>
{
public:
Range(Document*);
#ifndef RangeException_h
#define RangeException_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
const int RangeExceptionMax = 299;
enum RangeExceptionCode { BAD_BOUNDARYPOINTS_ERR = RangeExceptionOffset + 1, INVALID_NODE_TYPE_ERR };
-class RangeException : public Shared<RangeException> {
+class RangeException : public RefCounted<RangeException> {
public :
static const unsigned short BAD_BOUNDARYPOINTS_ERR = 1;
static const unsigned short INVALID_NODE_TYPE_ERR = 2;
#define RegisteredEventListener_h
#include "AtomicString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class EventListener;
- class RegisteredEventListener : public Shared<RegisteredEventListener> {
+ class RegisteredEventListener : public RefCounted<RegisteredEventListener> {
public:
RegisteredEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
#ifndef Traversal_h
#define Traversal_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
class Node;
class NodeFilter;
- class Traversal : public Shared<Traversal> {
+ class Traversal : public RefCounted<Traversal> {
public:
Traversal(Node*, unsigned whatToShow, PassRefPtr<NodeFilter>, bool expandEntityReferences);
virtual ~Traversal();
class CompositeEditCommand;
class CSSMutableStyleDeclaration;
-class EditCommand : public Shared<EditCommand> {
+class EditCommand : public RefCounted<EditCommand> {
public:
EditCommand(Document*);
virtual ~EditCommand();
#ifndef BackForwardList_h
#define BackForwardList_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
typedef HashSet<RefPtr<HistoryItem> > HistoryItemHashSet;
-class BackForwardList : public Shared<BackForwardList> {
+class BackForwardList : public RefCounted<BackForwardList> {
public:
BackForwardList(Page*);
~BackForwardList();
#define CachedPage_h
#include "DocumentLoader.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
#include <wtf/OwnPtr.h>
class Node;
class Page;
-class CachedPage : public Shared<CachedPage> {
+class CachedPage : public RefCounted<CachedPage> {
public:
static PassRefPtr<CachedPage> create(Page*);
~CachedPage();
}
HistoryItem::HistoryItem(const HistoryItem& item)
- : Shared<HistoryItem>()
+ : RefCounted<HistoryItem>()
, m_urlString(item.m_urlString)
, m_originalURLString(item.m_originalURLString)
, m_target(item.m_target)
#include "IntPoint.h"
#include "KURL.h"
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "StringHash.h"
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
extern void (*notifyHistoryItemChanged)();
-class HistoryItem : public Shared<HistoryItem> {
+class HistoryItem : public RefCounted<HistoryItem> {
friend class PageCache;
public:
#define CanvasGradient_h
#include "FloatPoint.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
#if PLATFORM(CG)
class String;
- class CanvasGradient : public Shared<CanvasGradient> {
+ class CanvasGradient : public RefCounted<CanvasGradient> {
public:
CanvasGradient(const FloatPoint& p0, const FloatPoint& p1);
CanvasGradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1);
#define CanvasPattern_h
#include "CachedResourceClient.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#if PLATFORM(CG)
#include <wtf/RetainPtr.h>
typedef int ExceptionCode;
- class CanvasPattern : public Shared<CanvasPattern>, CachedResourceClient {
+ class CanvasPattern : public RefCounted<CanvasPattern>, CachedResourceClient {
public:
static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
typedef int ExceptionCode;
- class CanvasRenderingContext2D : public Shared<CanvasRenderingContext2D> {
+ class CanvasRenderingContext2D : public RefCounted<CanvasRenderingContext2D> {
public:
CanvasRenderingContext2D(HTMLCanvasElement*);
class CanvasPattern;
class GraphicsContext;
- class CanvasStyle : public Shared<CanvasStyle> {
+ class CanvasStyle : public RefCounted<CanvasStyle> {
public:
CanvasStyle(const String& color);
CanvasStyle(float grayLevel);
#ifndef HTMLCollection_h
#define HTMLCollection_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
class NodeList;
class String;
-class HTMLCollection : public Shared<HTMLCollection> {
+class HTMLCollection : public RefCounted<HTMLCollection> {
public:
enum Type {
// from JSHTMLDocument
#if ENABLE(VIDEO)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
-class MediaError : public Shared<MediaError> {
+class MediaError : public RefCounted<MediaError> {
public:
enum Code { MEDIA_ERR_ABORTED = 1, MEDIA_ERR_NETWORK, MEDIA_ERR_DECODE };
#define TimeRanges_h
#include "ExceptionCode.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "wtf/Vector.h"
namespace WebCore {
-class TimeRanges : public Shared<TimeRanges> {
+class TimeRanges : public RefCounted<TimeRanges> {
public:
TimeRanges() { }
TimeRanges(float start, float end);
#define VoidCallback_h
#include <kjs/protect.h>
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "wtf/PassRefPtr.h"
namespace WebCore {
class Frame;
-class VoidCallback : public Shared<VoidCallback> {
+class VoidCallback : public RefCounted<VoidCallback> {
public:
VoidCallback(KJS::JSValue* func);
virtual ~VoidCallback();
markers.init();
}
-SVGRenderStyle::SVGRenderStyle(const SVGRenderStyle &other) : Shared<SVGRenderStyle>()
+SVGRenderStyle::SVGRenderStyle(const SVGRenderStyle &other) : RefCounted<SVGRenderStyle>()
{
fill = other.fill;
stroke = other.stroke;
class RenderObject;
class RenderStyle;
- class SVGRenderStyle : public Shared<SVGRenderStyle> {
+ class SVGRenderStyle : public RefCounted<SVGRenderStyle> {
public:
SVGRenderStyle();
SVGRenderStyle(bool); // Used to create the default style.
using namespace WebCore;
-StyleFillData::StyleFillData() : Shared<StyleFillData>()
+StyleFillData::StyleFillData() : RefCounted<StyleFillData>()
{
paint = SVGRenderStyle::initialFillPaint();
opacity = SVGRenderStyle::initialFillOpacity();
}
-StyleFillData::StyleFillData(const StyleFillData &other) : Shared<StyleFillData>()
+StyleFillData::StyleFillData(const StyleFillData &other) : RefCounted<StyleFillData>()
{
paint = other.paint;
opacity = other.opacity;
return paint == other.paint;
}
-StyleStrokeData::StyleStrokeData() : Shared<StyleStrokeData>()
+StyleStrokeData::StyleStrokeData() : RefCounted<StyleStrokeData>()
{
width = SVGRenderStyle::initialStrokeWidth();
paint = SVGRenderStyle::initialStrokePaint();
dashArray = SVGRenderStyle::initialStrokeDashArray();
}
-StyleStrokeData::StyleStrokeData(const StyleStrokeData &other) : Shared<StyleStrokeData>()
+StyleStrokeData::StyleStrokeData(const StyleStrokeData &other) : RefCounted<StyleStrokeData>()
{
width = other.width;
paint = other.paint;
(dashArray == other.dashArray);
}
-StyleStopData::StyleStopData() : Shared<StyleStopData>()
+StyleStopData::StyleStopData() : RefCounted<StyleStopData>()
{
color = SVGRenderStyle::initialStopColor();
opacity = SVGRenderStyle::initialStopOpacity();
}
-StyleStopData::StyleStopData(const StyleStopData &other) : Shared<StyleStopData>()
+StyleStopData::StyleStopData(const StyleStopData &other) : RefCounted<StyleStopData>()
{
color = other.color;
opacity = other.opacity;
(opacity == other.opacity);
}
-StyleTextData::StyleTextData() : Shared<StyleTextData>()
+StyleTextData::StyleTextData() : RefCounted<StyleTextData>()
{
kerning = SVGRenderStyle::initialKerning();
}
-StyleTextData::StyleTextData(const StyleTextData& other) : Shared<StyleTextData>()
+StyleTextData::StyleTextData(const StyleTextData& other) : RefCounted<StyleTextData>()
{
kerning = other.kerning;
}
return kerning == other.kerning;
}
-StyleClipData::StyleClipData() : Shared<StyleClipData>()
+StyleClipData::StyleClipData() : RefCounted<StyleClipData>()
{
clipPath = SVGRenderStyle::initialClipPath();
}
-StyleClipData::StyleClipData(const StyleClipData &other) : Shared<StyleClipData>()
+StyleClipData::StyleClipData(const StyleClipData &other) : RefCounted<StyleClipData>()
{
clipPath = other.clipPath;
}
return (clipPath == other.clipPath);
}
-StyleMaskData::StyleMaskData() : Shared<StyleMaskData>()
+StyleMaskData::StyleMaskData() : RefCounted<StyleMaskData>()
{
maskElement = SVGRenderStyle::initialMaskElement();
}
-StyleMaskData::StyleMaskData(const StyleMaskData &other) : Shared<StyleMaskData>()
+StyleMaskData::StyleMaskData(const StyleMaskData &other) : RefCounted<StyleMaskData>()
{
maskElement = other.maskElement;
}
return (maskElement == other.maskElement);
}
-StyleMarkerData::StyleMarkerData() : Shared<StyleMarkerData>()
+StyleMarkerData::StyleMarkerData() : RefCounted<StyleMarkerData>()
{
startMarker = SVGRenderStyle::initialStartMarker();
midMarker = SVGRenderStyle::initialMidMarker();
endMarker = SVGRenderStyle::initialEndMarker();
}
-StyleMarkerData::StyleMarkerData(const StyleMarkerData &other) : Shared<StyleMarkerData>()
+StyleMarkerData::StyleMarkerData(const StyleMarkerData &other) : RefCounted<StyleMarkerData>()
{
startMarker = other.startMarker;
midMarker = other.midMarker;
return (startMarker == other.startMarker && midMarker == other.midMarker && endMarker == other.endMarker);
}
-StyleMiscData::StyleMiscData() : Shared<StyleMiscData>()
+StyleMiscData::StyleMiscData() : RefCounted<StyleMiscData>()
{
floodColor = SVGRenderStyle::initialFloodColor();
floodOpacity = SVGRenderStyle::initialFloodOpacity();
baselineShiftValue = SVGRenderStyle::initialBaselineShiftValue();
}
-StyleMiscData::StyleMiscData(const StyleMiscData &other) : Shared<StyleMiscData>()
+StyleMiscData::StyleMiscData(const StyleMiscData &other) : RefCounted<StyleMiscData>()
{
filter = other.filter;
floodColor = other.floodColor;
#include "Color.h"
#include "Path.h"
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
// Helper macros for 'SVGRenderStyle'
class SVGPaint;
// Inherited/Non-Inherited Style Datastructures
- class StyleFillData : public Shared<StyleFillData> {
+ class StyleFillData : public RefCounted<StyleFillData> {
public:
StyleFillData();
StyleFillData(const StyleFillData &other);
StyleFillData &operator=(const StyleFillData &);
};
- class StyleStrokeData : public Shared<StyleStrokeData> {
+ class StyleStrokeData : public RefCounted<StyleStrokeData> {
public:
StyleStrokeData();
StyleStrokeData(const StyleStrokeData&);
StyleStrokeData &operator=(const StyleStrokeData&);
};
- class StyleStopData : public Shared<StyleStopData> {
+ class StyleStopData : public RefCounted<StyleStopData> {
public:
StyleStopData();
StyleStopData(const StyleStopData &other);
StyleStopData &operator=(const StyleStopData &);
};
- class StyleTextData : public Shared<StyleTextData> {
+ class StyleTextData : public RefCounted<StyleTextData> {
public:
StyleTextData();
StyleTextData(const StyleTextData& other);
StyleTextData& operator=(const StyleTextData&);
};
- class StyleClipData : public Shared<StyleClipData> {
+ class StyleClipData : public RefCounted<StyleClipData> {
public:
StyleClipData();
StyleClipData(const StyleClipData &other);
StyleClipData &operator=(const StyleClipData &);
};
- class StyleMaskData : public Shared<StyleMaskData> {
+ class StyleMaskData : public RefCounted<StyleMaskData> {
public:
StyleMaskData();
StyleMaskData(const StyleMaskData &other);
StyleMaskData &operator=(const StyleMaskData &);
};
- class StyleMarkerData : public Shared<StyleMarkerData> {
+ class StyleMarkerData : public RefCounted<StyleMarkerData> {
public:
StyleMarkerData();
StyleMarkerData(const StyleMarkerData &other);
};
// Note : the rule for this class is, *no inheritance* of these props
- class StyleMiscData : public Shared<StyleMiscData> {
+ class StyleMiscData : public RefCounted<StyleMiscData> {
public:
StyleMiscData();
StyleMiscData(const StyleMiscData &other);
namespace WebCore {
SVGAngle::SVGAngle()
- : Shared<SVGAngle>()
+ : RefCounted<SVGAngle>()
, m_unitType(SVG_ANGLETYPE_UNKNOWN)
, m_value(0)
, m_valueInSpecifiedUnits(0)
class SVGStyledElement;
- class SVGAngle : public Shared<SVGAngle> {
+ class SVGAngle : public RefCounted<SVGAngle> {
public:
SVGAngle();
virtual ~SVGAngle();
#if ENABLE(SVG)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "AtomicString.h"
namespace WebCore {
};
template<typename BareType>
- class SVGAnimatedTemplate : public Shared<SVGAnimatedTemplate<BareType> >
+ class SVGAnimatedTemplate : public RefCounted<SVGAnimatedTemplate<BareType> >
{
public:
virtual ~SVGAnimatedTemplate() { forgetWrapper(this); }
#if ENABLE(SVG)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SVGElementInstance.h"
namespace WebCore {
- class SVGElementInstanceList : public Shared<SVGElementInstanceList> {
+ class SVGElementInstanceList : public RefCounted<SVGElementInstanceList> {
public:
SVGElementInstanceList(PassRefPtr<SVGElementInstance> rootInstance);
virtual ~SVGElementInstanceList();
};
// This class is NEVER used inside ksvg2. It only inherits from Shared for IDL generation.
- class SVGException : public Shared<SVGException> {
+ class SVGException : public RefCounted<SVGException> {
public:
// Forward declare these enums in the w3c naming scheme, for IDL generation
// We do NOT match the W3C here - we can't return 0/1/2 as JS values - we have to match ours!
#include <wtf/Vector.h>
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SVGListTraits.h"
#include "ExceptionCode.h"
};
template<typename Item>
- class SVGList : public Shared<SVGList<Item> >
+ class SVGList : public RefCounted<SVGList<Item> >
{
private:
typedef SVGListTypeOperations<Item> TypeOperations;
};
template<typename Item>
- class SVGPODListItem : public Shared<SVGPODListItem<Item> >
+ class SVGPODListItem : public RefCounted<SVGPODListItem<Item> >
{
public:
SVGPODListItem() : m_item() { }
#if ENABLE(SVG)
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore
{
class SVGPathElement;
class SVGStyledElement;
- class SVGPathSeg : public Shared<SVGPathSeg>
+ class SVGPathSeg : public RefCounted<SVGPathSeg>
{
public:
SVGPathSeg() { }
namespace WebCore {
SVGPreserveAspectRatio::SVGPreserveAspectRatio()
- : Shared<SVGPreserveAspectRatio>()
+ : RefCounted<SVGPreserveAspectRatio>()
, m_align(SVG_PRESERVEASPECTRATIO_XMIDYMID)
, m_meetOrSlice(SVG_MEETORSLICE_MEET)
{
#if ENABLE(SVG)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <PlatformString.h>
namespace WebCore {
class AffineTransform;
class SVGStyledElement;
- class SVGPreserveAspectRatio : public Shared<SVGPreserveAspectRatio> {
+ class SVGPreserveAspectRatio : public RefCounted<SVGPreserveAspectRatio> {
public:
enum SVGPreserveAspectRatioType {
SVG_PRESERVEASPECTRATIO_UNKNOWN = 0,
#if ENABLE(SVG)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
-class SVGRenderingIntent : public Shared<SVGRenderingIntent>
+class SVGRenderingIntent : public RefCounted<SVGRenderingIntent>
{
public:
enum SVGRenderingIntentType {
#include "AffineTransform.h"
#include "FloatPoint.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
namespace WebCore {
#if ENABLE(SVG)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
-class SVGUnitTypes : public Shared<SVGUnitTypes>
+class SVGUnitTypes : public RefCounted<SVGUnitTypes>
{
public:
enum SVGUnitType {
#include "IconDatabase.h"
#include "NavigationAction.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "PlatformString.h"
#include "ResourceError.h"
#include "ResourceRequest.h"
typedef HashSet<RefPtr<ResourceLoader> > ResourceLoaderSet;
typedef Vector<ResourceResponse> ResponseVector;
- class DocumentLoader : public Shared<DocumentLoader> {
+ class DocumentLoader : public RefCounted<DocumentLoader> {
public:
DocumentLoader(const ResourceRequest&, const SubstituteData&);
virtual ~DocumentLoader();
#ifndef FormState_h
#define FormState_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "StringHash.h"
#include <wtf/HashMap.h>
class Frame;
class HTMLFormElement;
- class FormState : public Shared<FormState> {
+ class FormState : public RefCounted<FormState> {
public:
static PassRefPtr<FormState> create(PassRefPtr<HTMLFormElement> form, const HashMap<String, String>& values, PassRefPtr<Frame> sourceFrame);
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "ResourceLoader.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "AuthenticationChallenge.h"
#include "KURL.h"
class ResourceHandle;
class SharedBuffer;
- class ResourceLoader : public Shared<ResourceLoader>, protected ResourceHandleClient {
+ class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
public:
virtual ~ResourceLoader();
#define TextResourceDecoder_h
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "TextDecoder.h"
#include <wtf/Vector.h>
namespace WebCore {
-class TextResourceDecoder : public Shared<TextResourceDecoder> {
+class TextResourceDecoder : public RefCounted<TextResourceDecoder> {
public:
enum EncodingSource {
DefaultEncoding,
#define IconRecord_h
#include "PageURLRecord.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SharedBuffer.h"
#include <wtf/HashSet.h>
RefPtr<SharedBuffer> data;
};
-class IconRecord : public Shared<IconRecord> {
+class IconRecord : public RefCounted<IconRecord> {
friend class PageURLRecord;
public:
IconRecord(const String& url);
#ifndef BarInfo_h
#define BarInfo_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Frame;
- class BarInfo : public Shared<BarInfo> {
+ class BarInfo : public RefCounted<BarInfo> {
public:
enum Type { Locationbar, Menubar, Personalbar, Scrollbars, Statusbar, Toolbar };
#ifndef Console_h
#define Console_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "PlatformString.h"
namespace WebCore {
class Frame;
- class Console : public Shared<Console> {
+ class Console : public RefCounted<Console> {
public:
Console(Frame*);
void disconnectFrame();
#ifndef DOMSelection_h
#define DOMSelection_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
typedef int ExceptionCode;
- class DOMSelection : public Shared<DOMSelection> {
+ class DOMSelection : public RefCounted<DOMSelection> {
public:
DOMSelection(Frame*);
#define DOMWindow_h
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
typedef int ExceptionCode;
- class DOMWindow : public Shared<DOMWindow> {
+ class DOMWindow : public RefCounted<DOMWindow> {
public:
DOMWindow(Frame*);
virtual ~DOMWindow();
template <typename T> class Timer;
-class Frame : public Shared<Frame> {
+class Frame : public RefCounted<Frame> {
public:
Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
virtual void setView(FrameView*);
#ifndef History_h
#define History_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Frame;
- class History : public Shared<History> {
+ class History : public RefCounted<History> {
public:
History(Frame*);
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "Settings.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SharedBuffer.h"
#include "SystemTime.h"
#include "TextEncoding.h"
String url;
};
-struct InspectorResource : public Shared<InspectorResource> {
+struct InspectorResource : public RefCounted<InspectorResource> {
// Keep these in sync with WebInspector.Resource.Type
enum Type {
Doc,
};
#if ENABLE(DATABASE)
-struct InspectorDatabaseResource : public Shared<InspectorDatabaseResource> {
+struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
InspectorDatabaseResource(Database* database, String domain, String name, String version)
: database(database)
, domain(domain)
#ifndef Plugin_h
#define Plugin_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Widget;
- class Plugin : public
Shared<Plugin> {
+ class Plugin : public
RefCounted<Plugin> {
public:
Plugin(Widget* view) : m_view(view) { }
Widget* view() const { return m_view; }
#ifndef Screen_h
#define Screen_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class Frame;
- class Screen : public Shared<Screen> {
+ class Screen : public RefCounted<Screen> {
public:
Screen(Frame*);
void disconnectFrame();
#define ArrayImpl_h
#include <wtf/RefPtr.h>
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
bool operator==(const ArrayImpl &) const;
private:
- class ArrayPrivate : public
Shared<ArrayPrivate>
+ class ArrayPrivate : public
RefCounted<ArrayPrivate>
{
public:
ArrayPrivate(size_t pNumItems, size_t pItemSize);
#ifndef CString_h
#define CString_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
using std::min;
class DeprecatedCString;
- class CStringBuffer : public Shared<CStringBuffer> {
+ class CStringBuffer : public RefCounted<CStringBuffer> {
public:
CStringBuffer(unsigned length) : m_vector(length) { }
class IntPoint;
#if PLATFORM(WIN)
- class SharedCursor : public Shared<SharedCursor> {
+ class SharedCursor : public RefCounted<SharedCursor> {
public:
SharedCursor(HCURSOR nativeCursor) : m_nativeCursor(nativeCursor) {}
~SharedCursor() {
#include "config.h"
#include "DeprecatedValueListImpl.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <stdlib.h>
namespace WebCore {
-class DeprecatedValueListImpl::Private : public Shared<DeprecatedValueListImpl::Private>
+class DeprecatedValueListImpl::Private : public RefCounted<DeprecatedValueListImpl::Private>
{
public:
Private(void (*deleteFunc)(DeprecatedValueListImplNode *), DeprecatedValueListImplNode *(*copyFunc)(DeprecatedValueListImplNode *));
{
}
-inline DeprecatedValueListImpl::Private::Private(const Private &other) :
- Shared<DeprecatedValueListImpl::Private>(),
- deleteNode(other.deleteNode),
- copyNode(other.copyNode),
- count(other.count)
+inline DeprecatedValueListImpl::Private::Private(const Private &other)
+ : RefCounted<DeprecatedValueListImpl::Private>()
+ , deleteNode(other.deleteNode)
+ , copyNode(other.copyNode)
+ , count(other.count)
{
other.copyList(other.head, head, tail);
}
virtual void valueChanged() = 0;
};
-class FileChooser : public Shared<FileChooser> {
+class FileChooser : public RefCounted<FileChooser> {
public:
static PassRefPtr<FileChooser> create(FileChooserClient*, const String& initialFilename);
~FileChooser();
// and so this should catch anyone trying to include this file in public cpp files.
#include "FontData.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "FontSelector.h"
#include <wtf/Vector.h>
const int cAllFamiliesScanned = -1;
-class FontFallbackList : public Shared<FontFallbackList> {
+class FontFallbackList : public RefCounted<FontFallbackList> {
public:
FontFallbackList();
namespace WebCore {
FontFamily::FontFamily(const FontFamily& other)
- : Shared<FontFamily>()
+ : RefCounted<FontFamily>()
, m_family(other.m_family)
, m_next(other.m_next)
{
#define FontFamily_h
#include "AtomicString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
namespace WebCore {
-class FontFamily : public Shared<FontFamily> {
+class FontFamily : public RefCounted<FontFamily> {
public:
FontFamily() { }
#ifndef FontSelector_h
#define FontSelector_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class FontData;
class FontDescription;
-class FontSelector : public Shared<FontSelector> {
+class FontSelector : public RefCounted<FontSelector> {
public:
virtual ~FontSelector() {};
virtual FontData* getFontData(const FontDescription& fontDescription, const AtomicString& familyName) = 0;
#ifndef GlyphPageTreeNode_h
#define GlyphPageTreeNode_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/unicode/Unicode.h>
#include <wtf/Noncopyable.h>
#include <wtf/HashMap.h>
// missing in the parimary font. It is owned by exactly one GlyphPageTreeNode,
// although multiple nodes may reference it as their "page" if they are supposed
// to be overriding the parent's node, but provide no additional information.
-struct GlyphPage : public Shared<GlyphPage> {
+struct GlyphPage : public RefCounted<GlyphPage> {
GlyphPage()
: m_owner(0)
{
#ifndef PopupMenu_h
#define PopupMenu_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "IntRect.h"
#include "PopupMenuClient.h"
class FrameView;
class PlatformScrollbar;
-class PopupMenu : public
Shared<PopupMenu>
+class PopupMenu : public
RefCounted<PopupMenu>
#if PLATFORM(WIN)
, private ScrollbarClient
#endif
#include "RegularExpression.h"
#include "Logging.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <pcre/pcre.h>
#include <sys/types.h>
const size_t maxSubstrings = 10;
const size_t maxOffsets = 3 * maxSubstrings;
-class RegularExpression::Private : public Shared<RegularExpression::Private>
+class RegularExpression::Private : public RefCounted<RegularExpression::Private>
{
public:
Private();
#ifndef ScrollBar_h
#define ScrollBar_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "ScrollTypes.h"
#include <wtf/MathExtras.h>
virtual IntRect windowClipRect() const = 0;
};
-class Scrollbar : public Shared<Scrollbar> {
+class Scrollbar : public RefCounted<Scrollbar> {
protected:
Scrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
#define SharedBuffer_h
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#include <wtf/Vector.h>
namespace WebCore {
-class SharedBuffer : public Shared<SharedBuffer> {
+class SharedBuffer : public RefCounted<SharedBuffer> {
public:
SharedBuffer();
SharedBuffer(const char*, int);
#ifndef StringImpl_h
#define StringImpl_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/unicode/Unicode.h>
#include <kjs/identifier.h>
#include <wtf/Forward.h>
struct CStringTranslator;
struct Length;
-class StringImpl : public Shared<StringImpl> {
+class StringImpl : public RefCounted<StringImpl> {
private:
struct WithOneRef { };
StringImpl(WithOneRef) : m_length(0), m_data(0), m_hash(0), m_inTable(false) { ref(); }
#ifndef Icon_h
#define Icon_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
#if PLATFORM(MAC)
class IntRect;
class String;
-class Icon : public Shared<Icon> {
+class Icon : public RefCounted<Icon> {
public:
Icon();
~Icon();
#if ENABLE(SVG)
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "StringHash.h"
#include <wtf/HashMap.h>
//
// SVG creates/uses these resources.
- class SVGResource : public Shared<SVGResource> {
+ class SVGResource : public RefCounted<SVGResource> {
public:
SVGResource();
virtual ~SVGResource();
}
FormData::FormData(const FormData& data)
- : Shared<FormData>()
+ : RefCounted<FormData>()
, m_elements(data.m_elements)
{
}
#define FormData_h
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
namespace WebCore {
return !(a == b);
}
-class FormData : public Shared<FormData> {
+class FormData : public RefCounted<FormData> {
public:
FormData() { }
FormData(const void* data, size_t);
template <typename T> class Timer;
-class ResourceHandle : public Shared<ResourceHandle> {
+class ResourceHandle : public RefCounted<ResourceHandle> {
private:
ResourceHandle(const ResourceRequest&, ResourceHandleClient*, bool defersLoading, bool shouldContentSniff, bool mightDownloadFromHandle);
#ifndef ResourceHandleClient_h
#define ResourceHandleClient_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Platform.h>
#include <wtf/RefPtr.h>
}
StyleSurroundData::StyleSurroundData(const StyleSurroundData& o)
- : Shared<StyleSurroundData>()
+ : RefCounted<StyleSurroundData>()
, offset(o.offset)
, margin(o.margin)
, padding(o.padding)
}
StyleBoxData::StyleBoxData(const StyleBoxData& o)
- : Shared<StyleBoxData>()
+ : RefCounted<StyleBoxData>()
, width(o.width)
, height(o.height)
, min_width(o.min_width)
}
StyleVisualData::StyleVisualData(const StyleVisualData& o)
- : Shared<StyleVisualData>()
+ : RefCounted<StyleVisualData>()
, clip(o.clip)
, hasClip(o.hasClip)
, textDecoration(o.textDecoration)
}
StyleBackgroundData::StyleBackgroundData(const StyleBackgroundData& o)
- : Shared<StyleBackgroundData>(), m_background(o.m_background), m_outline(o.m_outline)
+ : RefCounted<StyleBackgroundData>(), m_background(o.m_background), m_outline(o.m_outline)
{
}
}
StyleMarqueeData::StyleMarqueeData(const StyleMarqueeData& o)
- : Shared<StyleMarqueeData>()
+ : RefCounted<StyleMarqueeData>()
, increment(o.increment)
, speed(o.speed)
, loops(o.loops)
}
StyleFlexibleBoxData::StyleFlexibleBoxData(const StyleFlexibleBoxData& o)
- : Shared<StyleFlexibleBoxData>()
+ : RefCounted<StyleFlexibleBoxData>()
, flex(o.flex)
, flex_group(o.flex_group)
, ordinal_group(o.ordinal_group)
{}
StyleMultiColData::StyleMultiColData(const StyleMultiColData& o)
- : Shared<StyleMultiColData>()
+ : RefCounted<StyleMultiColData>()
, m_width(o.m_width)
, m_count(o.m_count)
, m_gap(o.m_gap)
{}
StyleTransformData::StyleTransformData(const StyleTransformData& o)
- : Shared<StyleTransformData>()
+ : RefCounted<StyleTransformData>()
, m_operations(o.m_operations)
, m_x(o.m_x)
, m_y(o.m_y)
}
StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInheritedData& o)
- : Shared<StyleRareNonInheritedData>()
+ : RefCounted<StyleRareNonInheritedData>()
, lineClamp(o.lineClamp)
, opacity(o.opacity)
, flexibleBox(o.flexibleBox)
}
StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
- : Shared<StyleRareInheritedData>()
+ : RefCounted<StyleRareInheritedData>()
, textStrokeColor(o.textStrokeColor)
, textStrokeWidth(o.textStrokeWidth)
, textFillColor(o.textFillColor)
}
StyleInheritedData::StyleInheritedData(const StyleInheritedData& o)
- : Shared<StyleInheritedData>(),
+ : RefCounted<StyleInheritedData>(),
indent( o.indent ), line_height( o.line_height ), style_image( o.style_image ),
cursorData(o.cursorData),
font( o.font ), color( o.color ),
#include "IntRect.h"
#include "Length.h"
#include "Pair.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "TextDirection.h"
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
enum EMarginCollapse { MCOLLAPSE, MSEPARATE, MDISCARD };
-class StyleSurroundData : public Shared<StyleSurroundData> {
+class StyleSurroundData : public RefCounted<StyleSurroundData> {
public:
StyleSurroundData();
StyleSurroundData(const StyleSurroundData& o);
enum EBoxSizing { CONTENT_BOX, BORDER_BOX };
-class StyleBoxData : public Shared<StyleBoxData> {
+class StyleBoxData : public RefCounted<StyleBoxData> {
public:
StyleBoxData();
StyleBoxData(const StyleBoxData& o);
UBNormal, Embed, Override
};
-class StyleVisualData : public Shared<StyleVisualData> {
+class StyleVisualData : public RefCounted<StyleVisualData> {
public:
StyleVisualData();
~StyleVisualData();
BackgroundLayer* m_next;
};
-class StyleBackgroundData : public Shared<StyleBackgroundData> {
+class StyleBackgroundData : public RefCounted<StyleBackgroundData> {
public:
StyleBackgroundData();
~StyleBackgroundData() {}
enum EMarqueeBehavior { MNONE, MSCROLL, MSLIDE, MALTERNATE };
enum EMarqueeDirection { MAUTO = 0, MLEFT = 1, MRIGHT = -1, MUP = 2, MDOWN = -2, MFORWARD = 3, MBACKWARD = -3 };
-class StyleMarqueeData : public Shared<StyleMarqueeData> {
+class StyleMarqueeData : public RefCounted<StyleMarqueeData> {
public:
StyleMarqueeData();
StyleMarqueeData(const StyleMarqueeData& o);
// CSS3 Multi Column Layout
-class StyleMultiColData : public Shared<StyleMultiColData> {
+class StyleMultiColData : public RefCounted<StyleMultiColData> {
public:
StyleMultiColData();
StyleMultiColData(const StyleMultiColData& o);
// CSS Transforms (may become part of CSS3)
-class TransformOperation : public Shared<TransformOperation>
+class TransformOperation : public RefCounted<TransformOperation>
{
public:
virtual ~TransformOperation() {}
Vector<RefPtr<TransformOperation> > m_operations;
};
-class StyleTransformData : public Shared<StyleTransformData> {
+class StyleTransformData : public RefCounted<StyleTransformData> {
public:
StyleTransformData();
StyleTransformData(const StyleTransformData&);
enum EBoxLines { SINGLE, MULTIPLE };
enum EBoxDirection { BNORMAL, BREVERSE };
-class StyleFlexibleBoxData : public Shared<StyleFlexibleBoxData> {
+class StyleFlexibleBoxData : public RefCounted<StyleFlexibleBoxData> {
public:
StyleFlexibleBoxData();
StyleFlexibleBoxData(const StyleFlexibleBoxData& o);
// This struct is for rarely used non-inherited CSS3, CSS2, and WebKit-specific properties.
// By grouping them together, we save space, and only allocate this object when someone
// actually uses one of these properties.
-class StyleRareNonInheritedData : public Shared<StyleRareNonInheritedData> {
+class StyleRareNonInheritedData : public RefCounted<StyleRareNonInheritedData> {
public:
StyleRareNonInheritedData();
~StyleRareNonInheritedData();
// This struct is for rarely used inherited CSS3, CSS2, and WebKit-specific properties.
// By grouping them together, we save space, and only allocate this object when someone
// actually uses one of these properties.
-class StyleRareInheritedData : public Shared<StyleRareInheritedData> {
+class StyleRareInheritedData : public RefCounted<StyleRareInheritedData> {
public:
StyleRareInheritedData();
~StyleRareInheritedData();
PBAUTO, PBALWAYS, PBAVOID
};
-class StyleInheritedData : public Shared<StyleInheritedData> {
+class StyleInheritedData : public RefCounted<StyleInheritedData> {
public:
StyleInheritedData();
~StyleInheritedData();
String cursorFragmentId; // only used for SVGCursorElement, a direct pointer would get stale
};
-class CursorList : public Shared<CursorList> {
+class CursorList : public RefCounted<CursorList> {
public:
const CursorData& operator[](int i) const {
return m_vector[i];
#include <wtf/Vector.h>
#include "AffineTransform.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SVGRenderStyle.h"
#include "SVGTextContentElement.h"
};
// Holds extra data, when the character is laid out on a path
-struct SVGCharOnPath : Shared<SVGCharOnPath> {
+struct SVGCharOnPath : RefCounted<SVGCharOnPath> {
SVGCharOnPath()
- : Shared<SVGCharOnPath>()
+ : RefCounted<SVGCharOnPath>()
, xScale(1.0f)
, yScale(1.0f)
, xShift(0.0f)
#define SQLResultSetRowList_h
#include "PlatformString.h"
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "SQLValue.h"
#include <wtf/Vector.h>
namespace WebCore {
-class SQLResultSetRowList : public Shared<SQLResultSetRowList> {
+class SQLResultSetRowList : public RefCounted<SQLResultSetRowList> {
public:
const Vector<String>& columnNames() const { return m_columns; }
const Vector<SQLValue>& values() const { return m_result; }
#ifndef DOMParser_h
#define DOMParser_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "Document.h"
namespace WebCore {
class String;
- class DOMParser : public Shared<DOMParser> {
+ class DOMParser : public RefCounted<DOMParser> {
public:
PassRefPtr<Document> parseFromString(const String& str, const String& contentType);
};
Loaded = 4 // The data transfer has been completed.
};
-class XMLHttpRequest : public Shared<XMLHttpRequest>, public EventTarget, private SubresourceLoaderClient {
+class XMLHttpRequest : public RefCounted<XMLHttpRequest>, public EventTarget, private SubresourceLoaderClient {
public:
XMLHttpRequest(Document*);
~XMLHttpRequest();
Document* document() const { return m_doc; }
- using Shared<XMLHttpRequest>::ref;
- using Shared<XMLHttpRequest>::deref;
+ using RefCounted<XMLHttpRequest>::ref;
+ using RefCounted<XMLHttpRequest>::deref;
private:
virtual void refEventTarget() { ref(); }
#ifndef XMLSerializer_h
#define XMLSerializer_h
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "PlatformString.h"
namespace WebCore {
class Node;
- class XMLSerializer : public Shared<XMLSerializer> {
+ class XMLSerializer : public RefCounted<XMLSerializer> {
public:
String serializeToString(Node*, ExceptionCode&);
};
#if ENABLE(XPATH)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
namespace WebCore {
const int XPathExceptionMax = 499;
enum XPathExceptionCode { INVALID_EXPRESSION_ERR = XPathExceptionOffset + 51, TYPE_ERR };
- class XPathEvaluator : public Shared<XPathEvaluator> {
+ class XPathEvaluator : public RefCounted<XPathEvaluator> {
public:
PassRefPtr<XPathExpression> createExpression(const String& expression, XPathNSResolver*, ExceptionCode&);
PassRefPtr<XPathNSResolver> createNSResolver(Node* nodeResolver);
#if ENABLE(XPATH)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include <wtf/Forward.h>
namespace WebCore {
class Expression;
}
- class XPathExpression : public Shared<XPathExpression> {
+ class XPathExpression : public RefCounted<XPathExpression> {
public:
~XPathExpression();
static PassRefPtr<XPathExpression> createExpression(const String& expression, XPathNSResolver*, ExceptionCode&);
#if ENABLE(XPATH)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class String;
- class XPathNSResolver : public Shared<XPathNSResolver> {
+ class XPathNSResolver : public RefCounted<XPathNSResolver> {
public:
virtual ~XPathNSResolver();
virtual String lookupNamespaceURI(const String& prefix) = 0;
#if ENABLE(XPATH)
-#include <wtf/Shared.h>
+#include <wtf/RefCounted.h>
#include "XPathValue.h"
namespace WebCore {
class Node;
class String;
- class XPathResult : public Shared<XPathResult> {
+ class XPathResult : public RefCounted<XPathResult> {
public:
enum XPathResultType {
ANY_TYPE = 0,
namespace XPath {
- class ValueData : public Shared<ValueData> {
+ class ValueData : public RefCounted<ValueData> {
public:
ValueData() {}
ValueData(const NodeSet& nodeSet) : m_nodeSet(nodeSet) {}
class Document;
class DocumentFragment;
-class XSLTProcessor : public Shared<XSLTProcessor>
+class XSLTProcessor : public RefCounted<XSLTProcessor>
{
public:
void setXSLStylesheet(XSLStyleSheet* styleSheet) { m_stylesheet = styleSheet; }
2007-11-13 Geoffrey Garen <ggaren@apple.com>
+ Reviewed by Anders Carlsson.
+
+ Renamed Shared to RefCounted.
+
+ * ForwardingHeaders/wtf/RefCounted.h: Copied from WebKit/mac/ForwardingHeaders/wtf/Shared.h.
+ * ForwardingHeaders/wtf/Shared.h: Removed.
+ * WebCoreSupport/WebContextMenuClient.h:
+
+2007-11-13 Geoffrey Garen <ggaren@apple.com>
+
Reviewed by Sam Weinig.
Moved Shared.h into wtf so it could be used in more places.
--- /dev/null
+#import <JavaScriptCore/RefCounted.h>
+++ /dev/null
-#import <JavaScriptCore/Shared.h>
*/
#import <WebCore/ContextMenuClient.h>
-#import <wtf/Forward.h>
-#import <wtf/Shared.h>
@class WebView;
git://git.webkit.org / WebKit-https.git / commitdiff