Changeset 128153 in webkit


Ignore:
Timestamp:
Sep 11, 2012 12:33:58 AM (12 years ago)
Author:
loislo@chromium.org
Message:

Web Inspector: NMI: move MemoryInstrumentation.h to wtf
​https://bugs.webkit.org/show_bug.cgi?id=96356

Reviewed by Yury Semikhatsky.

It is necessary step because it helps us to remove dependency between platform and WebCore.

Source/WebCore:

  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/WebCoreMemoryInstrumentation.h:
  • inspector/MemoryInstrumentationImpl.h:

Source/WTF:

  • GNUmakefile.list.am:
  • WTF.gypi:
  • WTF.pro:
  • WTF.vcproj/WTF.vcproj:
  • WTF.xcodeproj/project.pbxproj:
  • wtf/MemoryInstrumentation.h: Renamed from Source/WebCore/dom/MemoryInstrumentation.h.

(WebCore):
(GenericMemoryTypes):
(MemoryInstrumentationTraits):
(MemoryInstrumentation):
(WebCore::MemoryInstrumentation::~MemoryInstrumentation):
(WebCore::MemoryInstrumentation::addRootObject):
(InstrumentedPointerBase):
(WebCore::MemoryInstrumentation::InstrumentedPointerBase::~InstrumentedPointerBase):
(InstrumentedPointer):
(WebCore::MemoryInstrumentation::InstrumentedPointer::InstrumentedPointer):
(WebCore::MemoryInstrumentation::addObject):
(WebCore::MemoryInstrumentation::addInstrumentedObject):
(WebCore::MemoryInstrumentation::addRawBuffer):
(WebCore::MemoryInstrumentation::OwningTraits::addInstrumentedObject):
(WebCore::MemoryInstrumentation::OwningTraits::addObject):
(WebCore::MemoryInstrumentationTraits::addInstrumentedObject):
(WebCore::MemoryInstrumentationTraits::addObject):
(MemoryObjectInfo):
(WebCore::MemoryObjectInfo::MemoryObjectInfo):
(WebCore::MemoryObjectInfo::objectType):
(WebCore::MemoryObjectInfo::objectSize):
(WebCore::MemoryObjectInfo::memoryInstrumentation):
(WebCore::MemoryObjectInfo::reportObjectInfo):
(MemoryClassInfo):
(WebCore::MemoryClassInfo::MemoryClassInfo):
(WebCore::MemoryClassInfo::addInstrumentedMember):
(WebCore::MemoryClassInfo::addMember):
(WebCore::MemoryClassInfo::addHashMap):
(WebCore::MemoryClassInfo::addHashSet):
(WebCore::MemoryClassInfo::addHashCountedSet):
(WebCore::MemoryClassInfo::addInstrumentedHashSet):
(WebCore::MemoryClassInfo::addInstrumentedVector):
(WebCore::MemoryClassInfo::addInstrumentedVectorPtr):
(WebCore::MemoryClassInfo::addInstrumentedMapEntries):
(WebCore::MemoryClassInfo::addInstrumentedMapValues):
(WebCore::MemoryClassInfo::addListHashSet):
(WebCore::MemoryClassInfo::addVector):
(WebCore::MemoryClassInfo::addVectorPtr):
(WebCore::MemoryClassInfo::addRawBuffer):
(WebCore::MemoryInstrumentation::addInstrumentedObjectImpl):
(WebCore::MemoryInstrumentation::addObjectImpl):
(WebCore::MemoryInstrumentation::addHashMap):
(WebCore::MemoryInstrumentation::addHashSet):
(WebCore::MemoryInstrumentation::addInstrumentedCollection):
(WebCore::MemoryInstrumentation::addInstrumentedMapEntries):
(WebCore::MemoryInstrumentation::addInstrumentedMapValues):
(WebCore::MemoryInstrumentation::addListHashSet):
(WebCore::MemoryInstrumentation::addVector):
(WebCore::MemoryInstrumentation::calculateContainerSize):
(WebCore::::process):

Location:
trunk/Source
Files:
14 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r128015 r128153  
     12012-09-10  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Web Inspector: NMI: move MemoryInstrumentation.h to wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=96356
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        It is necessary step because it helps us to remove dependency between platform and WebCore.
     9
     10        * GNUmakefile.list.am:
     11        * WTF.gypi:
     12        * WTF.pro:
     13        * WTF.vcproj/WTF.vcproj:
     14        * WTF.xcodeproj/project.pbxproj:
     15        * wtf/MemoryInstrumentation.h: Renamed from Source/WebCore/dom/MemoryInstrumentation.h.
     16        (WebCore):
     17        (GenericMemoryTypes):
     18        (MemoryInstrumentationTraits):
     19        (MemoryInstrumentation):
     20        (WebCore::MemoryInstrumentation::~MemoryInstrumentation):
     21        (WebCore::MemoryInstrumentation::addRootObject):
     22        (InstrumentedPointerBase):
     23        (WebCore::MemoryInstrumentation::InstrumentedPointerBase::~InstrumentedPointerBase):
     24        (InstrumentedPointer):
     25        (WebCore::MemoryInstrumentation::InstrumentedPointer::InstrumentedPointer):
     26        (WebCore::MemoryInstrumentation::addObject):
     27        (WebCore::MemoryInstrumentation::addInstrumentedObject):
     28        (WebCore::MemoryInstrumentation::addRawBuffer):
     29        (WebCore::MemoryInstrumentation::OwningTraits::addInstrumentedObject):
     30        (WebCore::MemoryInstrumentation::OwningTraits::addObject):
     31        (WebCore::MemoryInstrumentationTraits::addInstrumentedObject):
     32        (WebCore::MemoryInstrumentationTraits::addObject):
     33        (MemoryObjectInfo):
     34        (WebCore::MemoryObjectInfo::MemoryObjectInfo):
     35        (WebCore::MemoryObjectInfo::objectType):
     36        (WebCore::MemoryObjectInfo::objectSize):
     37        (WebCore::MemoryObjectInfo::memoryInstrumentation):
     38        (WebCore::MemoryObjectInfo::reportObjectInfo):
     39        (MemoryClassInfo):
     40        (WebCore::MemoryClassInfo::MemoryClassInfo):
     41        (WebCore::MemoryClassInfo::addInstrumentedMember):
     42        (WebCore::MemoryClassInfo::addMember):
     43        (WebCore::MemoryClassInfo::addHashMap):
     44        (WebCore::MemoryClassInfo::addHashSet):
     45        (WebCore::MemoryClassInfo::addHashCountedSet):
     46        (WebCore::MemoryClassInfo::addInstrumentedHashSet):
     47        (WebCore::MemoryClassInfo::addInstrumentedVector):
     48        (WebCore::MemoryClassInfo::addInstrumentedVectorPtr):
     49        (WebCore::MemoryClassInfo::addInstrumentedMapEntries):
     50        (WebCore::MemoryClassInfo::addInstrumentedMapValues):
     51        (WebCore::MemoryClassInfo::addListHashSet):
     52        (WebCore::MemoryClassInfo::addVector):
     53        (WebCore::MemoryClassInfo::addVectorPtr):
     54        (WebCore::MemoryClassInfo::addRawBuffer):
     55        (WebCore::MemoryInstrumentation::addInstrumentedObjectImpl):
     56        (WebCore::MemoryInstrumentation::addObjectImpl):
     57        (WebCore::MemoryInstrumentation::addHashMap):
     58        (WebCore::MemoryInstrumentation::addHashSet):
     59        (WebCore::MemoryInstrumentation::addInstrumentedCollection):
     60        (WebCore::MemoryInstrumentation::addInstrumentedMapEntries):
     61        (WebCore::MemoryInstrumentation::addInstrumentedMapValues):
     62        (WebCore::MemoryInstrumentation::addListHashSet):
     63        (WebCore::MemoryInstrumentation::addVector):
     64        (WebCore::MemoryInstrumentation::calculateContainerSize):
     65        (WebCore::::process):
     66
    1672012-09-09  Mark Lam  <mark.lam@apple.com>
    268

  • trunk/Source/WTF/GNUmakefile.list.am

    r127991 r128153  
    8080    Source/WTF/wtf/MediaTime.h \
    8181    Source/WTF/wtf/MediaTime.cpp \
     82    Source/WTF/wtf/MemoryInstrumentation.h \
    8283    Source/WTF/wtf/MessageQueue.h \
    8384    Source/WTF/wtf/MetaAllocator.cpp \

  • trunk/Source/WTF/WTF.gypi

    r127991 r128153  
    5050            'wtf/MainThread.h',
    5151            'wtf/MathExtras.h',
     52            'wtf/MemoryInstrumentation.h',
    5253            'wtf/MessageQueue.h',
    5354            'wtf/NonCopyingSort.h',

  • trunk/Source/WTF/WTF.pro

    r127991 r128153  
    8282    MD5.h \
    8383    MediaTime.h \
     84    MemoryInstrumentation.h \
    8485    MessageQueue.h \
    8586    MetaAllocator.h \

  • trunk/Source/WTF/WTF.vcproj/WTF.vcproj

    r127991 r128153  
    902902                </File>
    903903                <File
     904                        RelativePath="..\wtf\MemoryInstrumentation.h"
     905                        >
     906                </File>
     907                <File
    904908                        RelativePath="..\wtf\MessageQueue.h"
    905909                        >

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r127991 r128153  
    1717                4330F38F15745B0500AAFA8F /* URLString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4330F38E15745B0500AAFA8F /* URLString.cpp */; };
    1818                4F0321BC156AA8D1006EBAF6 /* BitArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F0321BB156AA8D1006EBAF6 /* BitArray.h */; };
     19                4F1D115415FF11BE0026E908 /* MemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1D115315FF11BE0026E908 /* MemoryInstrumentation.h */; };
    1920                8134013815B092FD001FF0B8 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8134013615B092FD001FF0B8 /* Base64.cpp */; };
    2021                8134013915B092FD001FF0B8 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134013715B092FD001FF0B8 /* Base64.h */; };
    … …  
    263264                4330F38E15745B0500AAFA8F /* URLString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLString.cpp; sourceTree = "<group>"; };
    264265                4F0321BB156AA8D1006EBAF6 /* BitArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitArray.h; sourceTree = "<group>"; };
     266                4F1D115315FF11BE0026E908 /* MemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentation.h; sourceTree = "<group>"; };
    265267                5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
    266268                5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    … …  
    648650                                CD5497AA15857D0300B5BC30 /* MediaTime.cpp */,
    649651                                CD5497AB15857D0300B5BC30 /* MediaTime.h */,
     652                                4F1D115315FF11BE0026E908 /* MemoryInstrumentation.h */,
    650653                                A8A472CC151A825B004123FF /* MessageQueue.h */,
    651654                                A8A472CD151A825B004123FF /* MetaAllocator.cpp */,
    … …  
    10711074                                A8A47446151A825B004123FF /* WTFString.h in Headers */,
    10721075                                A8A47487151A825B004123FF /* WTFThreadData.h in Headers */,
     1076                                4F1D115415FF11BE0026E908 /* MemoryInstrumentation.h in Headers */,
    10731077                        );
    10741078                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/ChangeLog

    r128149 r128153  
     12012-09-10  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Web Inspector: NMI: move MemoryInstrumentation.h to wtf
     4        https://bugs.webkit.org/show_bug.cgi?id=96356
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        It is necessary step because it helps us to remove dependency between platform and WebCore.
     9
     10        * GNUmakefile.list.am:
     11        * Target.pri:
     12        * WebCore.gypi:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * dom/WebCoreMemoryInstrumentation.h:
     16        * inspector/MemoryInstrumentationImpl.h:
     17
    1182012-09-10  Keishi Hattori  <keishi@webkit.org>
    219

  • trunk/Source/WebCore/GNUmakefile.list.am

    r128149 r128153  
    28092809        Source/WebCore/dom/KeyboardEvent.cpp \
    28102810        Source/WebCore/dom/KeyboardEvent.h \
    2811         Source/WebCore/dom/MemoryInstrumentation.h \
    28122811        Source/WebCore/dom/MessageChannel.cpp \
    28132812        Source/WebCore/dom/MessageChannel.h \

  • trunk/Source/WebCore/Target.pri

    r128149 r128153  
    15571557    dom/IdTargetObserverRegistry.h \
    15581558    dom/KeyboardEvent.h \
    1559     dom/MemoryInstrumentation.h \
    15601559    dom/MessageChannel.h \
    15611560    dom/MessageEvent.h \

  • trunk/Source/WebCore/WebCore.gypi

    r128149 r128153  
    38613861            'dom/IdTargetObserverRegistry.h',
    38623862            'dom/KeyboardEvent.cpp',
    3863             'dom/MemoryInstrumentation.h',
    38643863            'dom/MessageChannel.cpp',
    38653864            'dom/MessageChannel.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r128149 r128153  
    5191651916                        </File>
    5191751917                        <File
    51918                                 RelativePath="..\dom\MemoryInstrumentation.h"
    51919                                 >
    51920                         </File>
    51921                         <File
    5192251918                                RelativePath="..\dom\MessageChannel.cpp"
    5192351919                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r128149 r128153  
    14561456                4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */; };
    14571457                4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3289B411A42AAB005ABE7E /* InspectorValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1458                 4F32BB1B14FA85E800F6C1A3 /* MemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14591458                4F377FF515FA356A00E5D60D /* WebCoreMemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F377FF415FA356A00E5D60D /* WebCoreMemoryInstrumentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14601459                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */; };
    … …  
    86268625                4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorValues.cpp; sourceTree = "<group>"; };
    86278626                4F3289B411A42AAB005ABE7E /* InspectorValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorValues.h; sourceTree = "<group>"; };
    8628                 4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentation.h; sourceTree = "<group>"; };
    86298627                4F377FF415FA356A00E5D60D /* WebCoreMemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreMemoryInstrumentation.h; sourceTree = "<group>"; };
    86308628                4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
    … …  
    2175121749                                BC9A6145146859D9006057FD /* make_event_factory.pl */,
    2175221750                                BC9A6146146859D9006057FD /* make_names.pl */,
    21753                                 4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */,
    2175421751                                E1ADECCD0E76AD8B004A1A5E /* MessageChannel.cpp */,
    2175521752                                E1ADECCC0E76AD8B004A1A5E /* MessageChannel.h */,
    … …  
    2443924436                                BCB16C180979C3BD00467741 /* MemoryCache.h in Headers */,
    2444024437                                9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */,
    24441                                 4F32BB1B14FA85E800F6C1A3 /* MemoryInstrumentation.h in Headers */,
    2444224438                                4F8565EA1530356E00FAE776 /* MemoryInstrumentationImpl.h in Headers */,
    2444324439                                6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */,

  • trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.h

    r127869 r128153  
    3232#define WebCoreMemoryInstrumentation_h
    3333
    34 #include "MemoryInstrumentation.h"
    35 
    3634#include <wtf/Forward.h>
     35#include <wtf/MemoryInstrumentation.h>
    3736
    3837namespace WebCore {

  • trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.h

    r127592 r128153  
    3232#define MemoryInstrumentationImpl_h
    3333
    34 #include "MemoryInstrumentation.h"
    3534
    3635#include <wtf/HashMap.h>
    3736#include <wtf/HashSet.h>
     37#include <wtf/MemoryInstrumentation.h>
    3838#include <wtf/Vector.h>
    3939
Note: See TracChangeset for help on using the changeset viewer.