Web Inspector: NMI: move WebCore specific code to separate header
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Sep 2012 15:36:43 +0000 (15:36 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Sep 2012 15:36:43 +0000 (15:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=96101

Reviewed by Yury Semikhatsky.

I extracted WebCore related code from MemoryInstrumentation.h to WebCoreMemoryInstrumentation.h

Source/WebCore:

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/ScriptWrappable.h:
* bindings/v8/DOMDataStore.cpp:
* bindings/v8/IntrusiveDOMWrapperMap.h:
* bindings/v8/ScriptProfiler.cpp:
* bindings/v8/ScriptWrappable.h:
* bindings/v8/V8Binding.cpp:
* bindings/v8/V8DOMMap.h:
* css/CSSAspectRatioValue.cpp:
* css/CSSBorderImageSliceValue.cpp:
* css/CSSCalculationValue.cpp:
* css/CSSCanvasValue.cpp:
* css/CSSCharsetRule.cpp:
* css/CSSComputedStyleDeclaration.cpp:
* css/CSSCrossfadeValue.cpp:
* css/CSSCursorImageValue.cpp:
* css/CSSFontFaceRule.cpp:
* css/CSSFontFaceSrcValue.cpp:
* css/CSSFunctionValue.cpp:
* css/CSSGradientValue.cpp:
* css/CSSImageGeneratorValue.cpp:
* css/CSSImageSetValue.cpp:
* css/CSSImageValue.cpp:
* css/CSSImportRule.cpp:
* css/CSSInheritedValue.cpp:
* css/CSSInitialValue.cpp:
* css/CSSLineBoxContainValue.cpp:
* css/CSSMediaRule.cpp:
* css/CSSPrimitiveValue.cpp:
* css/CSSProperty.cpp:
* css/CSSReflectValue.cpp:
* css/CSSRuleList.h:
* css/CSSSelectorList.cpp:
* css/CSSStyleRule.cpp:
* css/CSSStyleSheet.cpp:
* css/CSSTimingFunctionValue.cpp:
* css/CSSUnicodeRangeValue.cpp:
* css/CSSUnknownRule.h:
* css/CSSValue.cpp:
* css/CSSValueList.cpp:
* css/CSSVariableValue.h:
* css/FontFeatureValue.cpp:
* css/FontValue.cpp:
* css/MediaList.cpp:
* css/MediaQuery.cpp:
* css/MediaQueryExp.cpp:
* css/PropertySetCSSStyleDeclaration.cpp:
* css/ShadowValue.cpp:
* css/StyleResolver.cpp:
* css/StyleRule.cpp:
* css/StyleSheetContents.cpp:
* css/WebKitCSSArrayFunctionValue.cpp:
* css/WebKitCSSFilterValue.cpp:
* css/WebKitCSSKeyframeRule.cpp:
* css/WebKitCSSKeyframesRule.cpp:
* css/WebKitCSSMixFunctionValue.cpp:
* css/WebKitCSSSVGDocumentValue.cpp:
* css/WebKitCSSShaderValue.cpp:
* css/WebKitCSSTransformValue.cpp:
* dom/CharacterData.cpp:
* dom/Document.cpp:
* dom/DocumentEventQueue.cpp:
* dom/ElementAttributeData.cpp:
* dom/Event.cpp:
* dom/MemoryInstrumentation.h:
* dom/Node.cpp:
* dom/QualifiedName.h:
* dom/WebCoreMemoryInstrumentation.cpp: Renamed from Source/WebCore/dom/MemoryInstrumentation.cpp.
(WebCore):
(WebCore::String):
(WebCore::StringImpl):
(WebCore::KURL):
(WebCore::AtomicString):
* dom/WebCoreMemoryInstrumentation.h: Added.
(WebCore):
(WebCoreMemoryTypes):
* loader/DocumentLoader.cpp:
* loader/FrameLoader.cpp:
* loader/SubresourceLoader.cpp:
* loader/SubstituteData.cpp:
* loader/cache/CachedCSSStyleSheet.cpp:
* loader/cache/CachedFont.cpp:
* loader/cache/CachedRawResource.cpp:
* loader/cache/CachedResource.cpp:
* loader/cache/CachedResourceHandle.cpp:
* loader/cache/CachedScript.cpp:
* loader/cache/CachedShader.cpp:
* loader/cache/CachedXSLStyleSheet.cpp:
* loader/cache/MemoryCache.cpp:
* platform/SharedBuffer.cpp:
* platform/graphics/BitmapImage.cpp:
* platform/graphics/CrossfadeGeneratedImage.cpp:
* platform/graphics/GeneratedImage.cpp:
* platform/graphics/GeneratorGeneratedImage.h:
* platform/graphics/Image.cpp:
* platform/network/FormData.cpp:
* platform/network/ResourceRequestBase.cpp:
* platform/network/ResourceResponseBase.cpp:
* rendering/style/RenderStyle.cpp:
* rendering/style/StyleRareInheritedData.cpp:
* rendering/style/StyleRareNonInheritedData.cpp:
* svg/SVGColor.cpp:
* svg/SVGPaint.cpp:

Source/WebKit/chromium:

* tests/MemoryInstrumentationTest.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@127869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

104 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/ScriptWrappable.h
Source/WebCore/bindings/v8/DOMDataStore.cpp
Source/WebCore/bindings/v8/IntrusiveDOMWrapperMap.h
Source/WebCore/bindings/v8/ScriptProfiler.cpp
Source/WebCore/bindings/v8/ScriptWrappable.h
Source/WebCore/bindings/v8/V8Binding.cpp
Source/WebCore/bindings/v8/V8DOMMap.h
Source/WebCore/css/CSSAspectRatioValue.cpp
Source/WebCore/css/CSSBorderImageSliceValue.cpp
Source/WebCore/css/CSSCalculationValue.cpp
Source/WebCore/css/CSSCanvasValue.cpp
Source/WebCore/css/CSSCharsetRule.cpp
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSCrossfadeValue.cpp
Source/WebCore/css/CSSCursorImageValue.cpp
Source/WebCore/css/CSSFontFaceRule.cpp
Source/WebCore/css/CSSFontFaceSrcValue.cpp
Source/WebCore/css/CSSFunctionValue.cpp
Source/WebCore/css/CSSGradientValue.cpp
Source/WebCore/css/CSSImageGeneratorValue.cpp
Source/WebCore/css/CSSImageSetValue.cpp
Source/WebCore/css/CSSImageValue.cpp
Source/WebCore/css/CSSImportRule.cpp
Source/WebCore/css/CSSInheritedValue.cpp
Source/WebCore/css/CSSInitialValue.cpp
Source/WebCore/css/CSSLineBoxContainValue.cpp
Source/WebCore/css/CSSMediaRule.cpp
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSReflectValue.cpp
Source/WebCore/css/CSSRuleList.h
Source/WebCore/css/CSSSelectorList.cpp
Source/WebCore/css/CSSStyleRule.cpp
Source/WebCore/css/CSSStyleSheet.cpp
Source/WebCore/css/CSSTimingFunctionValue.cpp
Source/WebCore/css/CSSUnicodeRangeValue.cpp
Source/WebCore/css/CSSUnknownRule.h
Source/WebCore/css/CSSValue.cpp
Source/WebCore/css/CSSValueList.cpp
Source/WebCore/css/CSSVariableValue.h
Source/WebCore/css/FontFeatureValue.cpp
Source/WebCore/css/FontValue.cpp
Source/WebCore/css/MediaList.cpp
Source/WebCore/css/MediaQuery.cpp
Source/WebCore/css/MediaQueryExp.cpp
Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp
Source/WebCore/css/ShadowValue.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/css/StyleRule.cpp
Source/WebCore/css/StyleSheetContents.cpp
Source/WebCore/css/WebKitCSSArrayFunctionValue.cpp
Source/WebCore/css/WebKitCSSFilterValue.cpp
Source/WebCore/css/WebKitCSSKeyframeRule.cpp
Source/WebCore/css/WebKitCSSKeyframesRule.cpp
Source/WebCore/css/WebKitCSSMixFunctionValue.cpp
Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp
Source/WebCore/css/WebKitCSSShaderValue.cpp
Source/WebCore/css/WebKitCSSTransformValue.cpp
Source/WebCore/dom/CharacterData.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/DocumentEventQueue.cpp
Source/WebCore/dom/ElementAttributeData.cpp
Source/WebCore/dom/Event.cpp
Source/WebCore/dom/MemoryInstrumentation.h
Source/WebCore/dom/Node.cpp
Source/WebCore/dom/QualifiedName.h
Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp [moved from Source/WebCore/dom/MemoryInstrumentation.cpp with 99% similarity]
Source/WebCore/dom/WebCoreMemoryInstrumentation.h [new file with mode: 0644]
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/SubresourceLoader.cpp
Source/WebCore/loader/SubstituteData.cpp
Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
Source/WebCore/loader/cache/CachedFont.cpp
Source/WebCore/loader/cache/CachedRawResource.cpp
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResourceHandle.cpp
Source/WebCore/loader/cache/CachedScript.cpp
Source/WebCore/loader/cache/CachedShader.cpp
Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
Source/WebCore/loader/cache/MemoryCache.cpp
Source/WebCore/platform/SharedBuffer.cpp
Source/WebCore/platform/graphics/BitmapImage.cpp
Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp
Source/WebCore/platform/graphics/GeneratedImage.cpp
Source/WebCore/platform/graphics/GeneratorGeneratedImage.h
Source/WebCore/platform/graphics/Image.cpp
Source/WebCore/platform/network/FormData.cpp
Source/WebCore/platform/network/ResourceRequestBase.cpp
Source/WebCore/platform/network/ResourceResponseBase.cpp
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/StyleRareInheritedData.cpp
Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
Source/WebCore/svg/SVGColor.cpp
Source/WebCore/svg/SVGPaint.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp

index 0a9e948..08c54a2 100644 (file)
@@ -1149,7 +1149,6 @@ SET(WebCore_SOURCES
     dom/IdTargetObserver.cpp
     dom/IdTargetObserverRegistry.cpp
     dom/KeyboardEvent.cpp
-    dom/MemoryInstrumentation.cpp
     dom/MessageChannel.cpp
     dom/MessageEvent.cpp
     dom/MessagePortChannel.cpp
@@ -1215,6 +1214,7 @@ SET(WebCore_SOURCES
     dom/UserGestureIndicator.cpp
     dom/UserTypingGestureIndicator.cpp
     dom/ViewportArguments.cpp
+    dom/WebCoreMemoryInstrumentation.cpp
     dom/WebKitAnimationEvent.cpp
     dom/WebKitNamedFlow.cpp
     dom/WebKitTransitionEvent.cpp
index a4f3522..8b4dc8c 100644 (file)
@@ -1,3 +1,121 @@
+2012-09-07  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: NMI: move WebCore specific code to separate header
+        https://bugs.webkit.org/show_bug.cgi?id=96101
+
+        Reviewed by Yury Semikhatsky.
+
+        I extracted WebCore related code from MemoryInstrumentation.h to WebCoreMemoryInstrumentation.h
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/ScriptWrappable.h:
+        * bindings/v8/DOMDataStore.cpp:
+        * bindings/v8/IntrusiveDOMWrapperMap.h:
+        * bindings/v8/ScriptProfiler.cpp:
+        * bindings/v8/ScriptWrappable.h:
+        * bindings/v8/V8Binding.cpp:
+        * bindings/v8/V8DOMMap.h:
+        * css/CSSAspectRatioValue.cpp:
+        * css/CSSBorderImageSliceValue.cpp:
+        * css/CSSCalculationValue.cpp:
+        * css/CSSCanvasValue.cpp:
+        * css/CSSCharsetRule.cpp:
+        * css/CSSComputedStyleDeclaration.cpp:
+        * css/CSSCrossfadeValue.cpp:
+        * css/CSSCursorImageValue.cpp:
+        * css/CSSFontFaceRule.cpp:
+        * css/CSSFontFaceSrcValue.cpp:
+        * css/CSSFunctionValue.cpp:
+        * css/CSSGradientValue.cpp:
+        * css/CSSImageGeneratorValue.cpp:
+        * css/CSSImageSetValue.cpp:
+        * css/CSSImageValue.cpp:
+        * css/CSSImportRule.cpp:
+        * css/CSSInheritedValue.cpp:
+        * css/CSSInitialValue.cpp:
+        * css/CSSLineBoxContainValue.cpp:
+        * css/CSSMediaRule.cpp:
+        * css/CSSPrimitiveValue.cpp:
+        * css/CSSProperty.cpp:
+        * css/CSSReflectValue.cpp:
+        * css/CSSRuleList.h:
+        * css/CSSSelectorList.cpp:
+        * css/CSSStyleRule.cpp:
+        * css/CSSStyleSheet.cpp:
+        * css/CSSTimingFunctionValue.cpp:
+        * css/CSSUnicodeRangeValue.cpp:
+        * css/CSSUnknownRule.h:
+        * css/CSSValue.cpp:
+        * css/CSSValueList.cpp:
+        * css/CSSVariableValue.h:
+        * css/FontFeatureValue.cpp:
+        * css/FontValue.cpp:
+        * css/MediaList.cpp:
+        * css/MediaQuery.cpp:
+        * css/MediaQueryExp.cpp:
+        * css/PropertySetCSSStyleDeclaration.cpp:
+        * css/ShadowValue.cpp:
+        * css/StyleResolver.cpp:
+        * css/StyleRule.cpp:
+        * css/StyleSheetContents.cpp:
+        * css/WebKitCSSArrayFunctionValue.cpp:
+        * css/WebKitCSSFilterValue.cpp:
+        * css/WebKitCSSKeyframeRule.cpp:
+        * css/WebKitCSSKeyframesRule.cpp:
+        * css/WebKitCSSMixFunctionValue.cpp:
+        * css/WebKitCSSSVGDocumentValue.cpp:
+        * css/WebKitCSSShaderValue.cpp:
+        * css/WebKitCSSTransformValue.cpp:
+        * dom/CharacterData.cpp:
+        * dom/Document.cpp:
+        * dom/DocumentEventQueue.cpp:
+        * dom/ElementAttributeData.cpp:
+        * dom/Event.cpp:
+        * dom/MemoryInstrumentation.h:
+        * dom/Node.cpp:
+        * dom/QualifiedName.h:
+        * dom/WebCoreMemoryInstrumentation.cpp: Renamed from Source/WebCore/dom/MemoryInstrumentation.cpp.
+        (WebCore):
+        (WebCore::String):
+        (WebCore::StringImpl):
+        (WebCore::KURL):
+        (WebCore::AtomicString):
+        * dom/WebCoreMemoryInstrumentation.h: Added.
+        (WebCore):
+        (WebCoreMemoryTypes):
+        * loader/DocumentLoader.cpp:
+        * loader/FrameLoader.cpp:
+        * loader/SubresourceLoader.cpp:
+        * loader/SubstituteData.cpp:
+        * loader/cache/CachedCSSStyleSheet.cpp:
+        * loader/cache/CachedFont.cpp:
+        * loader/cache/CachedRawResource.cpp:
+        * loader/cache/CachedResource.cpp:
+        * loader/cache/CachedResourceHandle.cpp:
+        * loader/cache/CachedScript.cpp:
+        * loader/cache/CachedShader.cpp:
+        * loader/cache/CachedXSLStyleSheet.cpp:
+        * loader/cache/MemoryCache.cpp:
+        * platform/SharedBuffer.cpp:
+        * platform/graphics/BitmapImage.cpp:
+        * platform/graphics/CrossfadeGeneratedImage.cpp:
+        * platform/graphics/GeneratedImage.cpp:
+        * platform/graphics/GeneratorGeneratedImage.h:
+        * platform/graphics/Image.cpp:
+        * platform/network/FormData.cpp:
+        * platform/network/ResourceRequestBase.cpp:
+        * platform/network/ResourceResponseBase.cpp:
+        * rendering/style/RenderStyle.cpp:
+        * rendering/style/StyleRareInheritedData.cpp:
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        * svg/SVGColor.cpp:
+        * svg/SVGPaint.cpp:
+
 2012-09-07  Ian Vollick  <vollick@chromium.org>
 
         [chromium] We should accelerate all transformations, except when we must blend matrices that cannot be decomposed.
index efa00b7..56e9856 100644 (file)
@@ -2807,7 +2807,6 @@ webcore_sources += \
        Source/WebCore/dom/HashChangeEvent.h \
        Source/WebCore/dom/KeyboardEvent.cpp \
        Source/WebCore/dom/KeyboardEvent.h \
-       Source/WebCore/dom/MemoryInstrumentation.cpp \
        Source/WebCore/dom/MemoryInstrumentation.h \
        Source/WebCore/dom/MessageChannel.cpp \
        Source/WebCore/dom/MessageChannel.h \
@@ -2945,6 +2944,8 @@ webcore_sources += \
        Source/WebCore/dom/UserTypingGestureIndicator.h \
        Source/WebCore/dom/ViewportArguments.cpp \
        Source/WebCore/dom/ViewportArguments.h \
+       Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp \
+       Source/WebCore/dom/WebCoreMemoryInstrumentation.h \
        Source/WebCore/dom/WebKitAnimationEvent.cpp \
        Source/WebCore/dom/WebKitAnimationEvent.h \
        Source/WebCore/dom/WebKitNamedFlow.cpp \
index 830539e..e1efda1 100644 (file)
@@ -404,7 +404,6 @@ SOURCES += \
     dom/IdTargetObserver.cpp \
     dom/IdTargetObserverRegistry.cpp \
     dom/KeyboardEvent.cpp \
-    dom/MemoryInstrumentation.cpp \
     dom/MessageChannel.cpp \
     dom/MessageEvent.cpp \
     dom/MessagePort.cpp \
@@ -470,6 +469,7 @@ SOURCES += \
     dom/UserGestureIndicator.cpp \
     dom/UserTypingGestureIndicator.cpp \
     dom/ViewportArguments.cpp \
+    dom/WebCoreMemoryInstrumentation.cpp \
     dom/WebKitAnimationEvent.cpp \
     dom/WebKitTransitionEvent.cpp \
     dom/WheelEvent.cpp \
@@ -1612,6 +1612,7 @@ HEADERS += \
     dom/UIEventWithKeyState.h \
     dom/UserGestureIndicator.h \
     dom/ViewportArguments.h \
+    dom/WebCoreMemoryInstrumentation.h \
     dom/WebKitAnimationEvent.h \
     dom/WebKitNamedFlow.h \
     dom/WebKitTransitionEvent.h \
index e3b9f36..3359df8 100644 (file)
             'dom/IdTargetObserverRegistry.cpp',
             'dom/IdTargetObserverRegistry.h',
             'dom/KeyboardEvent.cpp',
-            'dom/MemoryInstrumentation.cpp',
             'dom/MemoryInstrumentation.h',
             'dom/MessageChannel.cpp',
             'dom/MessageChannel.h',
             'dom/UserGestureIndicator.cpp',
             'dom/UserTypingGestureIndicator.cpp',
             'dom/ViewportArguments.cpp',
+            'dom/WebCoreMemoryInstrumentation.cpp',
+            'dom/WebCoreMemoryInstrumentation.h',
             'dom/WebKitAnimationEvent.cpp',
             'dom/WebKitAnimationEvent.h',
             'dom/WebKitNamedFlow.cpp',
index 8cf08cc..fd2b562 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\dom\MemoryInstrumentation.cpp"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\dom\MemoryInstrumentation.h"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\dom\WebCoreMemoryInstrumentation.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\dom\WebCoreMemoryInstrumentation.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\dom\WebKitTransitionEvent.cpp"
                                >
                                <FileConfiguration
index aa787ee..e4dcf50 100644 (file)
                4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */; };
                4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3289B411A42AAB005ABE7E /* InspectorValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4F32BB1B14FA85E800F6C1A3 /* MemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4F377FF515FA356A00E5D60D /* WebCoreMemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F377FF415FA356A00E5D60D /* WebCoreMemoryInstrumentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */; };
                4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */; };
                4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F6FDD631341DEDD001F8EE3 /* InspectorPageAgent.h */; };
                F39BE95B12673BF400E0A674 /* ScriptArguments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F39BE95912673BF400E0A674 /* ScriptArguments.cpp */; };
                F39BE95C12673BF400E0A674 /* ScriptArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = F39BE95A12673BF400E0A674 /* ScriptArguments.h */; };
                F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
-               F3BFC9D315C177EC004244E5 /* MemoryInstrumentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3BFC9D215C177EC004244E5 /* MemoryInstrumentation.cpp */; };
+               F3BFC9D315C177EC004244E5 /* WebCoreMemoryInstrumentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3BFC9D215C177EC004244E5 /* WebCoreMemoryInstrumentation.cpp */; };
                F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */; };
                F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
                F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3D4C47612E07663003DA150 /* InspectorDOMDebuggerAgent.cpp */; };
                4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorValues.cpp; sourceTree = "<group>"; };
                4F3289B411A42AAB005ABE7E /* InspectorValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorValues.h; sourceTree = "<group>"; };
                4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryInstrumentation.h; sourceTree = "<group>"; };
+               4F377FF415FA356A00E5D60D /* WebCoreMemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreMemoryInstrumentation.h; sourceTree = "<group>"; };
                4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
                4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
                4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorPageAgent.cpp; sourceTree = "<group>"; };
                F39BE95912673BF400E0A674 /* ScriptArguments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArguments.cpp; sourceTree = "<group>"; };
                F39BE95A12673BF400E0A674 /* ScriptArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArguments.h; sourceTree = "<group>"; };
                F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstrumentingAgents.h; sourceTree = "<group>"; };
-               F3BFC9D215C177EC004244E5 /* MemoryInstrumentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryInstrumentation.cpp; sourceTree = "<group>"; };
+               F3BFC9D215C177EC004244E5 /* WebCoreMemoryInstrumentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreMemoryInstrumentation.cpp; sourceTree = "<group>"; };
                F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorHandler.cpp; sourceTree = "<group>"; };
                F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
                F3D4C47612E07663003DA150 /* InspectorDOMDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMDebuggerAgent.cpp; sourceTree = "<group>"; };
                                BC9A6144146859D9006057FD /* make_dom_exceptions.pl */,
                                BC9A6145146859D9006057FD /* make_event_factory.pl */,
                                BC9A6146146859D9006057FD /* make_names.pl */,
-                               F3BFC9D215C177EC004244E5 /* MemoryInstrumentation.cpp */,
                                4F32BB1A14FA85AA00F6C1A3 /* MemoryInstrumentation.h */,
                                E1ADECCD0E76AD8B004A1A5E /* MessageChannel.cpp */,
                                E1ADECCC0E76AD8B004A1A5E /* MessageChannel.h */,
                                BCDF317A11F8D683003C5BF8 /* UserTypingGestureIndicator.h */,
                                CEF418CC1179678C009D112C /* ViewportArguments.cpp */,
                                CEF418CD1179678C009D112C /* ViewportArguments.h */,
+                               F3BFC9D215C177EC004244E5 /* WebCoreMemoryInstrumentation.cpp */,
+                               4F377FF415FA356A00E5D60D /* WebCoreMemoryInstrumentation.h */,
                                31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */,
                                31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */,
                                31C0FF1D0E4CEB6E007D6FE5 /* WebKitAnimationEvent.idl */,
                                FBD6AF8C15EF2604008B7110 /* BasicShapes.h in Headers */,
                                76F2E2EC15F74CEF005FF664 /* RenderDialog.h in Headers */,
                                0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */,
+                               4F377FF515FA356A00E5D60D /* WebCoreMemoryInstrumentation.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */,
                                BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */,
                                9FFE3E7A11B59C5D0037874E /* MemoryInfo.cpp in Sources */,
-                               F3BFC9D315C177EC004244E5 /* MemoryInstrumentation.cpp in Sources */,
                                4F8565E91530356E00FAE776 /* MemoryInstrumentationImpl.cpp in Sources */,
                                657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */,
                                657EDA0B1385CBD8004E0645 /* MemoryPressureHandlerMac.mm in Sources */,
                                FD581FB41520F93B003A7A75 /* WaveTable.cpp in Sources */,
                                29A8124A0FBB9CA900510293 /* WebAccessibilityObjectWrapper.mm in Sources */,
                                CD127DED14F3097D00E84779 /* WebCoreFullScreenWindow.mm in Sources */,
+                               F3BFC9D315C177EC004244E5 /* WebCoreMemoryInstrumentation.cpp in Sources */,
                                371941961566B37200A276D8 /* WebCoreNSCellExtras.m in Sources */,
                                934D9BA50B8C116B007B42A9 /* WebCoreNSStringExtras.mm in Sources */,
                                C5B4C24E1509236C00A6EF37 /* WebCoreNSURLExtras.mm in Sources */,
index da108ed..43f4eec 100644 (file)
@@ -32,7 +32,7 @@
 #define ScriptWrappable_h
 
 #include "JSDOMWrapper.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <heap/Weak.h>
 
 namespace WebCore {
index 6373943..5c70cf8 100644 (file)
@@ -32,8 +32,8 @@
 #include "DOMDataStore.h"
 
 #include "DOMData.h"
-#include "MemoryInstrumentation.h"
 #include "V8Binding.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/MainThread.h>
 
 namespace WebCore {
index e1c1a4b..8f06920 100644 (file)
@@ -32,8 +32,8 @@
 #define IntrusiveDOMWrapperMap_h
 
 #include "DOMDataStore.h"
-#include "MemoryInstrumentation.h"
 #include "V8Node.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 9858ce3..0186839 100644 (file)
 #include "ScriptProfiler.h"
 
 #include "BindingVisitors.h"
-#include "MemoryInstrumentation.h"
 #include "RetainedDOMInfo.h"
 #include "ScriptObject.h"
 #include "V8ArrayBufferView.h"
 #include "V8Binding.h"
 #include "V8DOMMap.h"
 #include "V8Node.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WrapperTypeInfo.h"
 
 #include <v8-profiler.h>
index 6356f00..c020180 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef ScriptWrappable_h
 #define ScriptWrappable_h
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <v8.h>
 
 namespace WebCore {
index 479bb6c..c13e49f 100644 (file)
@@ -35,7 +35,6 @@
 #include "DOMStringList.h"
 #include "Element.h"
 #include "Frame.h"
-#include "MemoryInstrumentation.h"
 #include "PlatformSupport.h"
 #include "QualifiedName.h"
 #include "Settings.h"
@@ -45,6 +44,7 @@
 #include "V8ObjectConstructor.h"
 #include "V8WorkerContext.h"
 #include "V8XPathNSResolver.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WorkerContext.h"
 #include "WorkerContextExecutionProxy.h"
 #include "WorldContextHandle.h"
index d0bcb29..ce2aee2 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef V8DOMMap_h
 #define V8DOMMap_h
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
 #include <v8.h>
index 246dbf7..15292be 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "CSSAspectRatioValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 1d16433..02343f9 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "CSSBorderImageSliceValue.h"
 
-#include "MemoryInstrumentation.h"
 #include "Rect.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 5fcc7ea..76b8509 100755 (executable)
@@ -33,8 +33,8 @@
 
 #include "CSSValueList.h"
 #include "Length.h"
-#include "MemoryInstrumentation.h"
 #include "StyleResolver.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
index 5324164..8ecc80c 100644 (file)
@@ -27,8 +27,8 @@
 #include "CSSCanvasValue.h"
 
 #include "ImageBuffer.h"
-#include "MemoryInstrumentation.h"
 #include "RenderObject.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 63ee178..97bfc05 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "CSSCharsetRule.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index aab500f..ebc27aa 100644 (file)
@@ -49,7 +49,6 @@
 #include "FontFeatureSettings.h"
 #include "FontFeatureValue.h"
 #include "FontValue.h"
-#include "MemoryInstrumentation.h"
 #include "Pair.h"
 #include "Rect.h"
 #include "RenderBox.h"
@@ -59,6 +58,7 @@
 #include "StyleInheritedData.h"
 #include "StylePropertySet.h"
 #include "StylePropertyShorthand.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSTransformValue.h"
 #include "WebKitFontFamilyNames.h"
 #include <wtf/text/StringBuilder.h>
index 3bee433..e347ebd 100644 (file)
 #include "CachedResourceLoader.h"
 #include "CrossfadeGeneratedImage.h"
 #include "ImageBuffer.h"
-#include "MemoryInstrumentation.h"
 #include "RenderObject.h"
 #include "StyleCachedImage.h"
 #include "StyleGeneratedImage.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index a44bb8f..68ffa9c 100644 (file)
@@ -23,8 +23,8 @@
 #include "CSSCursorImageValue.h"
 
 #include "CachedResourceLoader.h"
-#include "MemoryInstrumentation.h"
 #include "TreeScope.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/MathExtras.h>
 #include <wtf/UnusedParam.h>
 #include <wtf/text/WTFString.h>
index 8820c2d..0dceb8a 100644 (file)
@@ -22,9 +22,9 @@
 #include "config.h"
 #include "CSSFontFaceRule.h"
 
-#include "MemoryInstrumentation.h"
 #include "StylePropertySet.h"
 #include "StyleRule.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 42fb74c..0505f60 100644 (file)
 #include "CachedResourceLoader.h"
 #include "Document.h"
 #include "FontCustomPlatformData.h"
-#include "MemoryInstrumentation.h"
 #include "Node.h"
 #include "SVGFontFaceElement.h"
 #include "StyleSheetContents.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index ac8dd41..46a98f9 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "CSSParserValues.h"
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringBuilder.h>
 
index 8d50157..fc485f9 100644 (file)
 #include "Image.h"
 #include "IntSize.h"
 #include "IntSizeHash.h"
-#include "MemoryInstrumentation.h"
 #include "NodeRenderStyle.h"
 #include "RenderObject.h"
 #include "StyleResolver.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
index c9632b7..63cb422 100644 (file)
@@ -30,8 +30,8 @@
 #include "CSSCrossfadeValue.h"
 #include "CSSGradientValue.h"
 #include "Image.h"
-#include "MemoryInstrumentation.h"
 #include "RenderObject.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 4a374ea..568d756 100644 (file)
 #include "CachedImage.h"
 #include "CachedResourceLoader.h"
 #include "Document.h"
-#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "StyleCachedImageSet.h"
 #include "StylePendingImage.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 74b28a7..c370bdc 100644 (file)
@@ -28,9 +28,9 @@
 #include "CachedResourceLoader.h"
 #include "Document.h"
 #include "MemoryCache.h"
-#include "MemoryInstrumentation.h"
 #include "StyleCachedImage.h"
 #include "StylePendingImage.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 27278e6..772f365 100644 (file)
 #include "CachedResourceLoader.h"
 #include "Document.h"
 #include "MediaList.h"
-#include "MemoryInstrumentation.h"
 #include "SecurityOrigin.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 8bbbf80..8bcef18 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "CSSInheritedValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 32e72eb..d5776f1 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "CSSInitialValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 0c55930..24c08b4 100644 (file)
@@ -27,7 +27,7 @@
 #include "CSSLineBoxContainValue.h"
 
 #include "CSSPrimitiveValue.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
index 7123161..4542d3e 100644 (file)
@@ -27,8 +27,8 @@
 #include "CSSRuleList.h"
 #include "CSSStyleSheet.h"
 #include "ExceptionCode.h"
-#include "MemoryInstrumentation.h"
 #include "StyleRule.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 449c10f..6eaeb1c 100644 (file)
 #include "Counter.h"
 #include "ExceptionCode.h"
 #include "Font.h"
-#include "MemoryInstrumentation.h"
 #include "Node.h"
 #include "Pair.h"
 #include "RGBColor.h"
 #include "Rect.h"
 #include "RenderStyle.h"
 #include "StyleSheetContents.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/ASCIICType.h>
 #include <wtf/DecimalNumber.h>
 #include <wtf/StdLibExtras.h>
index 7ec018d..a556b6c 100644 (file)
@@ -22,9 +22,9 @@
 #include "CSSProperty.h"
 
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
 #include "RenderStyleConstants.h"
 #include "StylePropertyShorthand.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #if ENABLE(CSS_VARIABLES)
 #include "CSSVariableValue.h"
index 022c4a0..7ccb76e 100644 (file)
@@ -27,7 +27,7 @@
 #include "CSSReflectValue.h"
 
 #include "CSSPrimitiveValue.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 using namespace std;
index ed3fddb..cacf151 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef CSSRuleList_h
 #define CSSRuleList_h
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
index 5adbaaf..56d2859 100644 (file)
@@ -28,7 +28,7 @@
 #include "CSSSelectorList.h"
 
 #include "CSSParserValues.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 8cc610b..365d8d9 100644 (file)
 #include "CSSSelector.h"
 #include "CSSStyleSheet.h"
 #include "Document.h"
-#include "MemoryInstrumentation.h"
 #include "PropertySetCSSStyleDeclaration.h"
 #include "StylePropertySet.h"
 #include "StyleRule.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 4535431..90a2ff9 100644 (file)
 #include "ExceptionCode.h"
 #include "HTMLNames.h"
 #include "MediaList.h"
-#include "MemoryInstrumentation.h"
 #include "Node.h"
 #include "SVGNames.h"
 #include "SecurityOrigin.h"
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index b7e3566..e1bb1d1 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CSSTimingFunctionValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 650b326..34d63b6 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CSSUnicodeRangeValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 5aa7464..30d4c5a 100644 (file)
@@ -23,7 +23,7 @@
 #define CSSUnknownRule_h
 
 #include "CSSRule.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 16768a7..f5ef1ef 100644 (file)
 #endif
 #include "FontValue.h"
 #include "FontFeatureValue.h"
-#include "MemoryInstrumentation.h"
 #include "ShadowValue.h"
 #include "SVGColor.h"
 #include "SVGPaint.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSArrayFunctionValue.h"
 #include "WebKitCSSFilterValue.h"
 #include "WebKitCSSMixFunctionValue.h"
index e0e6485..21e4fa7 100644 (file)
@@ -22,7 +22,7 @@
 #include "CSSValueList.h"
 
 #include "CSSParserValues.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringBuilder.h>
 
index f470b39..e32e48f 100644 (file)
@@ -34,7 +34,7 @@
 #include "CSSParserValues.h"
 #include "CSSPropertyNames.h"
 #include "CSSValue.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 1206d94..2e7b4f5 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "CSSParser.h"
 #include "CSSValueKeywords.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 23604ae..acb25d2 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "CSSValueList.h"
 #include "CSSPrimitiveValue.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 926b309..773ceeb 100644 (file)
@@ -26,7 +26,7 @@
 #include "ExceptionCode.h"
 #include "MediaQuery.h"
 #include "MediaQueryExp.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index ec40e43..dda150f 100644 (file)
@@ -30,7 +30,7 @@
 #include "MediaQuery.h"
 
 #include "MediaQueryExp.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/NonCopyingSort.h>
 #include <wtf/text/StringBuilder.h>
 
index 3aa6626..695ce0b 100644 (file)
@@ -32,7 +32,7 @@
 #include "CSSParser.h"
 #include "CSSPrimitiveValue.h"
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 3458091..6093cf8 100644 (file)
 #include "CSSStyleSheet.h"
 #include "HTMLNames.h"
 #include "InspectorInstrumentation.h"
-#include "MemoryInstrumentation.h"
 #include "MutationObserverInterestGroup.h"
 #include "MutationRecord.h"
 #include "StylePropertySet.h"
 #include "StyledElement.h"
 #include "UndoManager.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 using namespace std;
 
index a59e753..90ae152 100644 (file)
@@ -21,7 +21,7 @@
 #include "ShadowValue.h"
 
 #include "CSSPrimitiveValue.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
index 4e3065a..b551616 100644 (file)
@@ -82,7 +82,6 @@
 #include "MatrixTransformOperation.h"
 #include "MediaList.h"
 #include "MediaQueryEvaluator.h"
-#include "MemoryInstrumentation.h"
 #include "NodeRenderStyle.h"
 #include "NodeRenderingContext.h"
 #include "Page.h"
 #include "TransformationMatrix.h"
 #include "TranslateTransformOperation.h"
 #include "UserAgentStyleSheets.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSKeyframeRule.h"
 #include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
index da4f2f4..6847c16 100644 (file)
@@ -28,8 +28,8 @@
 #include "CSSMediaRule.h"
 #include "CSSPageRule.h"
 #include "CSSStyleRule.h"
-#include "MemoryInstrumentation.h"
 #include "StyleRuleImport.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSKeyframeRule.h"
 #include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
index 37f2770..ba00e2b 100644 (file)
 #include "CSSStyleSheet.h"
 #include "CachedCSSStyleSheet.h"
 #include "Document.h"
-#include "MemoryInstrumentation.h"
 #include "Node.h"
 #include "SecurityOrigin.h"
 #include "StylePropertySet.h"
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Deque.h>
 
 namespace WebCore {
index a2cb981..2a17a44 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "WebKitCSSArrayFunctionValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #if ENABLE(CSS_SHADERS)
 
index c1ecf33..f1a1e0e 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(CSS_FILTERS)
 
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
index 1acbb77..bf3b869 100644 (file)
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "WebKitCSSKeyframeRule.h"
 
-#include "MemoryInstrumentation.h"
 #include "PropertySetCSSStyleDeclaration.h"
 #include "StylePropertySet.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSKeyframesRule.h"
 #include <wtf/text/StringBuilder.h>
 
index a026021..f8d0807 100644 (file)
@@ -29,9 +29,9 @@
 #include "CSSParser.h"
 #include "CSSRuleList.h"
 #include "CSSStyleSheet.h"
-#include "MemoryInstrumentation.h"
 #include "StylePropertySet.h"
 #include "StyleSheet.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitCSSKeyframeRule.h"
 #include <wtf/text/StringBuilder.h>
 
index 6de71dd..3af687e 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "WebKitCSSMixFunctionValue.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #if ENABLE(CSS_SHADERS)
 
index 93dbecf..e133c92 100644 (file)
@@ -30,7 +30,7 @@
 #include "CSSParser.h"
 #include "CachedResourceLoader.h"
 #include "Document.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index c0ffb31..2326999 100644 (file)
@@ -35,9 +35,9 @@
 #include "CachedResourceLoader.h"
 #include "CSSParser.h"
 #include "Document.h"
-#include "MemoryInstrumentation.h"
 #include "StyleCachedShader.h"
 #include "StylePendingShader.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 1254c7b..2f86ad9 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebKitCSSTransformValue.h"
 
 #include "CSSValueList.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
index be45a55..390de18 100644 (file)
@@ -26,7 +26,6 @@
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "InspectorInstrumentation.h"
-#include "MemoryInstrumentation.h"
 #include "MutationEvent.h"
 #include "MutationObserverInterestGroup.h"
 #include "MutationRecord.h"
@@ -35,6 +34,7 @@
 #include "StyleInheritedData.h"
 #include "TextBreakIterator.h"
 #include "UndoManager.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 using namespace std;
 
index 49d00c5..6e328a5 100644 (file)
 #include "Logging.h"
 #include "MediaQueryList.h"
 #include "MediaQueryMatcher.h"
-#include "MemoryInstrumentation.h"
 #include "MouseEventWithHitTestResults.h"
 #include "NameNodeList.h"
 #include "NamedFlowCollection.h"
 #include "TreeWalker.h"
 #include "UndoManager.h"
 #include "UserContentURLPattern.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WebKitNamedFlow.h"
 #include "XMLDocumentParser.h"
 #include "XMLHttpRequest.h"
index 2d42994..6396f01 100644 (file)
 #include "Document.h"
 #include "Event.h"
 #include "EventNames.h"
-#include "MemoryInstrumentation.h"
 #include "RuntimeApplicationChecks.h"
 #include "ScriptExecutionContext.h"
 #include "SuspendableTimer.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
     
index 95a024b..1db20f9 100644 (file)
@@ -29,8 +29,8 @@
 #include "Attr.h"
 #include "CSSParser.h"
 #include "CSSStyleSheet.h"
-#include "MemoryInstrumentation.h"
 #include "StyledElement.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 161acfe..a0bf439 100644 (file)
@@ -26,8 +26,8 @@
 #include "EventDispatcher.h"
 #include "EventNames.h"
 #include "EventTarget.h"
-#include "MemoryInstrumentation.h"
 #include "UserGestureIndicator.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/text/AtomicString.h>
 
index 175d544..ac67fff 100644 (file)
 #ifndef MemoryInstrumentation_h
 #define MemoryInstrumentation_h
 
-#include <wtf/Assertions.h>
-#include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-class KURL;
 class MemoryClassInfo;
 class MemoryObjectInfo;
 class MemoryInstrumentation;
@@ -362,54 +359,6 @@ void MemoryInstrumentation::InstrumentedPointer<T>::process(MemoryInstrumentatio
     memoryInstrumentation->countObjectSize(memoryObjectInfo.objectType(), memoryObjectInfo.objectSize());
 }
 
-// Explicit specializations for some types.
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<const KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<const String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<const StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addInstrumentedObject<const AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
-
-
-// Link time guards with no body.
-template<> void MemoryInstrumentationTraits::addObject<KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addObject<const KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addObject<String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addObject<const String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addObject<StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addObject<const StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
-
-template<> void MemoryInstrumentationTraits::addObject<AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
-template<> void MemoryInstrumentationTraits::addObject<const AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
-
-class WebCoreMemoryTypes {
-public:
-    static MemoryObjectType Page;
-    static MemoryObjectType DOM;
-    static MemoryObjectType CSS;
-    static MemoryObjectType Binding;
-    static MemoryObjectType Loader;
-
-    static MemoryObjectType MemoryCache;
-    static MemoryObjectType MemoryCacheStructures;
-    static MemoryObjectType CachedResource;
-    static MemoryObjectType CachedResourceRaw;
-    static MemoryObjectType CachedResourceCSS;
-    static MemoryObjectType CachedResourceFont;
-    static MemoryObjectType CachedResourceImage;
-    static MemoryObjectType CachedResourceScript;
-    static MemoryObjectType CachedResourceSVG;
-    static MemoryObjectType CachedResourceShader;
-    static MemoryObjectType CachedResourceXSLT;
-};
-
 } // namespace WebCore
 
 #endif // !defined(MemoryInstrumentation_h)
index d0e3ab9..537d439 100644 (file)
@@ -68,7 +68,6 @@
 #include "KeyboardEvent.h"
 #include "LabelsNodeList.h"
 #include "Logging.h"
-#include "MemoryInstrumentation.h"
 #include "MouseEvent.h"
 #include "MutationEvent.h"
 #include "NameNodeList.h"
@@ -99,6 +98,7 @@
 #include "TreeScopeAdopter.h"
 #include "UIEvent.h"
 #include "UIEventWithKeyState.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WheelEvent.h"
 #include "WindowEventContext.h"
 #include "XMLNames.h"
index 4cd47ea..12b782a 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef QualifiedName_h
 #define QualifiedName_h
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #include <wtf/HashTraits.h>
 #include <wtf/RefCounted.h>
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #include "KURL.h"
 #include <wtf/text/StringImpl.h>
diff --git a/Source/WebCore/dom/WebCoreMemoryInstrumentation.h b/Source/WebCore/dom/WebCoreMemoryInstrumentation.h
new file mode 100644 (file)
index 0000000..c8684bb
--- /dev/null
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCoreMemoryInstrumentation_h
+#define WebCoreMemoryInstrumentation_h
+
+#include "MemoryInstrumentation.h"
+
+#include <wtf/Forward.h>
+
+namespace WebCore {
+
+class KURL;
+
+// Explicit specializations for some types.
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<const KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<const String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<const StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addInstrumentedObject<const AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
+
+
+// Link time guards with no body.
+template<> void MemoryInstrumentationTraits::addObject<KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addObject<const KURL>(MemoryInstrumentation*, const KURL* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addObject<String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addObject<const String>(MemoryInstrumentation*, const String* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addObject<StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addObject<const StringImpl>(MemoryInstrumentation*, const StringImpl* const&, MemoryObjectType, MemoryOwningType);
+
+template<> void MemoryInstrumentationTraits::addObject<AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
+template<> void MemoryInstrumentationTraits::addObject<const AtomicString>(MemoryInstrumentation*, const AtomicString* const&, MemoryObjectType, MemoryOwningType);
+
+class WebCoreMemoryTypes {
+public:
+    static MemoryObjectType Page;
+    static MemoryObjectType DOM;
+    static MemoryObjectType CSS;
+    static MemoryObjectType Binding;
+    static MemoryObjectType Loader;
+
+    static MemoryObjectType MemoryCache;
+    static MemoryObjectType MemoryCacheStructures;
+    static MemoryObjectType CachedResource;
+    static MemoryObjectType CachedResourceRaw;
+    static MemoryObjectType CachedResourceCSS;
+    static MemoryObjectType CachedResourceFont;
+    static MemoryObjectType CachedResourceImage;
+    static MemoryObjectType CachedResourceScript;
+    static MemoryObjectType CachedResourceSVG;
+    static MemoryObjectType CachedResourceShader;
+    static MemoryObjectType CachedResourceXSLT;
+};
+
+} // namespace WebCore
+
+#endif // !defined(WebCoreMemoryInstrumentation_h)
index 23805d0..5ca9d68 100644 (file)
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "MainResourceLoader.h"
-#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Assertions.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
index 8e5742e..ff9a173 100644 (file)
@@ -77,7 +77,6 @@
 #include "Logging.h"
 #include "MIMETypeRegistry.h"
 #include "MainResourceLoader.h"
-#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "PageCache.h"
 #include "PageTransitionEvent.h"
@@ -99,6 +98,7 @@
 #include "SerializedScriptValue.h"
 #include "Settings.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WindowFeatures.h"
 #include "XMLDocumentParser.h"
 #include <wtf/CurrentTime.h>
index 3f9a614..6273a8d 100644 (file)
@@ -36,9 +36,9 @@
 #include "FrameLoader.h"
 #include "Logging.h"
 #include "MemoryCache.h"
-#include "MemoryInstrumentation.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
index 2313ba5..72b535f 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SubstituteData.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 0d75239..96432af 100644 (file)
 #include "CachedStyleSheetClient.h"
 #include "HTTPParsers.h"
 #include "MemoryCache.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "StyleSheetContents.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
 
index 272e43d..4c4569c 100644 (file)
@@ -36,9 +36,9 @@
 #include "CachedResourceLoader.h"
 #include "FontPlatformData.h"
 #include "MemoryCache.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Vector.h>
 
 #ifdef STORE_FONT_CUSTOM_PLATFORM_DATA
index cd7a11d..7298893 100644 (file)
@@ -29,9 +29,9 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "SubresourceLoader.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
index a1b2bda..83bc8ee 100755 (executable)
 #include "InspectorInstrumentation.h"
 #include "KURL.h"
 #include "Logging.h"
-#include "MemoryInstrumentation.h"
 #include "PurgeableBuffer.h"
 #include "ResourceHandle.h"
 #include "ResourceLoadScheduler.h"
 #include "SharedBuffer.h"
 #include "SubresourceLoader.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RefCountedLeakCounter.h>
index 6eac6b4..d95459f 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CachedResourceHandle.h"
 
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index c6c8ae6..5c49339 100644 (file)
@@ -30,9 +30,9 @@
 #include "MemoryCache.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Vector.h>
 
 #if USE(JSC)  
index 6124c5b..8dc381c 100644 (file)
@@ -32,9 +32,9 @@
 #if ENABLE(CSS_SHADERS)
 
 #include "CachedShader.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 3a9635d..81e17d8 100644 (file)
@@ -29,9 +29,9 @@
 
 #include "CachedResourceClientWalker.h"
 #include "CachedStyleSheetClient.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 7f16b55..aaf852a 100644 (file)
 #include "FrameView.h"
 #include "Image.h"
 #include "Logging.h"
-#include "MemoryInstrumentation.h"
 #include "ResourceHandle.h"
 #include "SecurityOrigin.h"
 #include "SecurityOriginHash.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include "WorkerContext.h"
 #include "WorkerLoaderProxy.h"
 #include "WorkerThread.h"
index 6ae831c..d674ea8 100644 (file)
@@ -27,8 +27,8 @@
 #include "config.h"
 #include "SharedBuffer.h"
 
-#include "MemoryInstrumentation.h"
 #include "PurgeableBuffer.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/unicode/UTF8.h>
 #include <wtf/unicode/Unicode.h>
index dd9a6e4..448a282 100644 (file)
@@ -31,8 +31,8 @@
 #include "ImageObserver.h"
 #include "IntRect.h"
 #include "MIMETypeRegistry.h"
-#include "MemoryInstrumentation.h"
 #include "Timer.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
index 6b51947..178e424 100644 (file)
@@ -29,7 +29,7 @@
 #include "FloatRect.h"
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 using namespace std;
 
index 7dd4c15..2d504a3 100644 (file)
@@ -32,7 +32,7 @@
 #include "GeneratedImage.h"
 
 #include "FloatSize.h"
-#include "MemoryInstrumentation.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 
 namespace WebCore {
index b803129..96a315d 100644 (file)
@@ -31,8 +31,8 @@
 #include "Image.h"
 #include "ImageBuffer.h"
 #include "IntSize.h"
-#include "MemoryInstrumentation.h"
 #include "Timer.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index c596208..8e743ba 100644 (file)
@@ -34,8 +34,8 @@
 #include "IntRect.h"
 #include "Length.h"
 #include "MIMETypeRegistry.h"
-#include "MemoryInstrumentation.h"
 #include "SharedBuffer.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <math.h>
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
index e079a0f..ab25e87 100644 (file)
@@ -32,9 +32,9 @@
 #include "FormDataBuilder.h"
 #include "FormDataList.h"
 #include "MIMETypeRegistry.h"
-#include "MemoryInstrumentation.h"
 #include "Page.h"
 #include "TextEncoding.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/Decoder.h>
 #include <wtf/Encoder.h>
 
index 3c791ad..cbb74d4 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "ResourceRequestBase.h"
 
-#include "MemoryInstrumentation.h"
 #include "ResourceRequest.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 using namespace std;
 
index 9329df4..c22cf65 100644 (file)
@@ -28,8 +28,8 @@
 #include "ResourceResponseBase.h"
 
 #include "HTTPParsers.h"
-#include "MemoryInstrumentation.h"
 #include "ResourceResponse.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/StdLibExtras.h>
index 753cec8..f160d9e 100644 (file)
@@ -28,7 +28,6 @@
 #include "CSSPropertyNames.h"
 #include "Font.h"
 #include "FontSelector.h"
-#include "MemoryInstrumentation.h"
 #include "QuotesData.h"
 #include "RenderArena.h"
 #include "RenderObject.h"
@@ -40,6 +39,7 @@
 #if ENABLE(TOUCH_EVENTS)
 #include "RenderTheme.h"
 #endif
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/StdLibExtras.h>
 #include <algorithm>
 
index 2465acc..ea666d5 100644 (file)
 #include "StyleRareInheritedData.h"
 
 #include "CursorList.h"
-#include "MemoryInstrumentation.h"
 #include "QuotesData.h"
 #include "RenderStyle.h"
 #include "RenderStyleConstants.h"
 #include "ShadowData.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 336c2eb..811bfa1 100644 (file)
@@ -23,7 +23,6 @@
 #include "StyleRareNonInheritedData.h"
 
 #include "ContentData.h"
-#include "MemoryInstrumentation.h"
 #include "RenderCounter.h"
 #include "RenderStyle.h"
 #include "ShadowData.h"
@@ -31,6 +30,7 @@
 #include "StyleTransformData.h"
 #include "StyleImage.h"
 #include "StyleResolver.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index 3cff43d..a34ad18 100644 (file)
@@ -25,9 +25,9 @@
 #include "SVGColor.h"
 
 #include "CSSParser.h"
-#include "MemoryInstrumentation.h"
 #include "RGBColor.h"
 #include "SVGException.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
index d4590d6..241266b 100644 (file)
@@ -24,9 +24,9 @@
 #if ENABLE(SVG)
 #include "SVGPaint.h"
 
-#include "MemoryInstrumentation.h"
 #include "SVGException.h"
 #include "SVGURIReference.h"
+#include "WebCoreMemoryInstrumentation.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index 9ff872b..66c18a7 100644 (file)
@@ -1,3 +1,14 @@
+2012-09-07  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: NMI: move WebCore specific code to separate header
+        https://bugs.webkit.org/show_bug.cgi?id=96101
+
+        Reviewed by Yury Semikhatsky.
+
+        I extracted WebCore related code from MemoryInstrumentation.h to WebCoreMemoryInstrumentation.h
+
+        * tests/MemoryInstrumentationTest.cpp:
+
 2012-09-07  Ian Vollick  <vollick@chromium.org>
 
         [chromium] We should accelerate all transformations, except when we must blend matrices that cannot be decomposed.
index 922a6ec..51b200a 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "DataRef.h"
 #include "MemoryInstrumentationImpl.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #include <gtest/gtest.h>