Changeset 128451 in webkit


Ignore:
Timestamp:
Sep 13, 2012 6:22:40 AM (12 years ago)
Author:
loislo@chromium.org
Message:

Web Inspector: NMI: remove the dependency of platform sources from WebCore header introduced by NMI instrumentation.
​https://bugs.webkit.org/show_bug.cgi?id=96367

Reviewed by Yury Semikhatsky.

the target is to move 'platform' specific instrumentation code
from WebCoreMemoryInstrumentation into the new PlatformMemoryInstrumentation.

Drive by fix: New type DOM.Image was introduced.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/WebCoreMemoryInstrumentation.cpp:

(WebCore):

  • dom/WebCoreMemoryInstrumentation.h:

(WebCoreMemoryTypes):

  • inspector/InspectorMemoryAgent.cpp:

(WebCore):

  • platform/KURL.cpp:
  • platform/KURLGoogle.cpp:
  • platform/PlatformMemoryInstrumentation.cpp: Copied from Source/WebCore/platform/graphics/GeneratedImage.cpp.

(WebCore):

  • platform/PlatformMemoryInstrumentation.h: Copied from Source/WebCore/platform/graphics/GeneratedImage.cpp.

(WebCore):
(PlatformMemoryTypes):

  • platform/SharedBuffer.cpp:
  • platform/TreeShared.h:

(WebCore::TreeShared::reportMemoryUsage):

  • platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::reportMemoryUsage):

  • platform/graphics/CrossfadeGeneratedImage.cpp:

(WebCore::CrossfadeGeneratedImage::reportMemoryUsage):

  • platform/graphics/GeneratedImage.cpp:

(WebCore::GeneratedImage::reportMemoryUsage):

  • platform/graphics/GeneratorGeneratedImage.cpp:

(WebCore::GeneratorGeneratedImage::reportMemoryUsage):

  • platform/graphics/GeneratorGeneratedImage.h:
  • platform/graphics/Image.cpp:

(WebCore::Image::reportMemoryUsage):

  • platform/network/FormData.cpp:

(WebCore::FormData::reportMemoryUsage):

  • platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::reportMemoryUsage):

  • platform/network/ResourceResponseBase.cpp:

(WebCore::ResourceResponseBase::reportMemoryUsage):

Location:
trunk/Source/WebCore
Files:
23 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r128261 r128451  
    17691769    platform/PlatformEvent.cpp
    17701770    platform/PlatformInstrumentation.cpp
     1771    platform/PlatformMemoryInstrumentation.cpp
    17711772    platform/RunLoop.cpp
    17721773    platform/RuntimeApplicationChecks.cpp

  • trunk/Source/WebCore/ChangeLog

    r128448 r128451  
     12012-09-13  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Web Inspector: NMI: remove the dependency of platform sources from WebCore header introduced by NMI instrumentation.
     4        https://bugs.webkit.org/show_bug.cgi?id=96367
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        the target is to move 'platform' specific instrumentation code
     9        from WebCoreMemoryInstrumentation into the new PlatformMemoryInstrumentation.
     10
     11        Drive by fix: New type DOM.Image was introduced.
     12
     13        * CMakeLists.txt:
     14        * GNUmakefile.list.am:
     15        * Target.pri:
     16        * WebCore.gypi:
     17        * WebCore.vcproj/WebCore.vcproj:
     18        * WebCore.xcodeproj/project.pbxproj:
     19        * dom/WebCoreMemoryInstrumentation.cpp:
     20        (WebCore):
     21        * dom/WebCoreMemoryInstrumentation.h:
     22        (WebCoreMemoryTypes):
     23        * inspector/InspectorMemoryAgent.cpp:
     24        (WebCore):
     25        * platform/KURL.cpp:
     26        * platform/KURLGoogle.cpp:
     27        * platform/PlatformMemoryInstrumentation.cpp: Copied from Source/WebCore/platform/graphics/GeneratedImage.cpp.
     28        (WebCore):
     29        * platform/PlatformMemoryInstrumentation.h: Copied from Source/WebCore/platform/graphics/GeneratedImage.cpp.
     30        (WebCore):
     31        (PlatformMemoryTypes):
     32        * platform/SharedBuffer.cpp:
     33        * platform/TreeShared.h:
     34        (WebCore::TreeShared::reportMemoryUsage):
     35        * platform/graphics/BitmapImage.cpp:
     36        (WebCore::BitmapImage::reportMemoryUsage):
     37        * platform/graphics/CrossfadeGeneratedImage.cpp:
     38        (WebCore::CrossfadeGeneratedImage::reportMemoryUsage):
     39        * platform/graphics/GeneratedImage.cpp:
     40        (WebCore::GeneratedImage::reportMemoryUsage):
     41        * platform/graphics/GeneratorGeneratedImage.cpp:
     42        (WebCore::GeneratorGeneratedImage::reportMemoryUsage):
     43        * platform/graphics/GeneratorGeneratedImage.h:
     44        * platform/graphics/Image.cpp:
     45        (WebCore::Image::reportMemoryUsage):
     46        * platform/network/FormData.cpp:
     47        (WebCore::FormData::reportMemoryUsage):
     48        * platform/network/ResourceRequestBase.cpp:
     49        (WebCore::ResourceRequestBase::reportMemoryUsage):
     50        * platform/network/ResourceResponseBase.cpp:
     51        (WebCore::ResourceResponseBase::reportMemoryUsage):
     52
    1532012-09-13  Ilya Tikhonovsky  <loislo@chromium.org>
    254

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

    r128394 r128451  
    46904690        Source/WebCore/platform/PlatformGestureEvent.h \
    46914691        Source/WebCore/platform/PlatformKeyboardEvent.h \
     4692        Source/WebCore/platform/PlatformMemoryInstrumentation.cpp \
     4693        Source/WebCore/platform/PlatformMemoryInstrumentation.h \
    46924694        Source/WebCore/platform/PlatformMenuDescription.h \
    46934695        Source/WebCore/platform/PlatformMouseEvent.h \

  • trunk/Source/WebCore/Target.pri

    r128394 r128451  
    10471047    platform/PlatformEvent.cpp \
    10481048    platform/PlatformInstrumentation.cpp \
     1049    platform/PlatformMemoryInstrumentation.cpp \
    10491050    platform/RuntimeApplicationChecks.cpp \
    10501051    platform/RunLoop.cpp \
    … …  
    22172218    platform/network/qt/NetworkStateNotifierPrivate.h \
    22182219    platform/PlatformExportMacros.h \
     2220    platform/PlatformMemoryInstrumentation.h \
    22192221    platform/PlatformTouchEvent.h \
    22202222    platform/PlatformTouchPoint.h \

  • trunk/Source/WebCore/WebCore.gypi

    r128394 r128451  
    44954495            'platform/Pasteboard.h',
    44964496            'platform/PlatformGestureCurve.h',
     4497            'platform/PlatformMemoryInstrumentation.cpp',
     4498            'platform/PlatformMemoryInstrumentation.h',
    44974499            'platform/PlatformStrategies.cpp',
    44984500            'platform/PlatformTouchEvent.h',

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

    r128249 r128451  
    2861228612                        </File>
    2861328613                        <File
     28614                                RelativePath="..\platform\PlatformMemoryInstrumentation.cpp"
     28615                                >
     28616                        </File>
     28617                        <File
     28618                                RelativePath="..\platform\PlatformMemoryInstrumentation.h"
     28619                                >
     28620                        </File>
     28621                        <File
    2861428622                                RelativePath="..\platform\PlatformMenuDescription.h"
    2861528623                                >

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

    r128394 r128451  
    14521452                4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14531453                4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1454                4F1D11BF15FF37200026E908 /* PlatformMemoryInstrumentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F1D118915FF361B0026E908 /* PlatformMemoryInstrumentation.cpp */; };
    14541455                4F2D205412EAE7B3005C2874 /* InspectorAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2D205212EAE7B3005C2874 /* InspectorAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14551456                4F2D205512EAE7B3005C2874 /* InspectorAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2D205312EAE7B3005C2874 /* InspectorAgent.cpp */; };
    … …  
    14621463                4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */; };
    14631464                4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1465                4F7B4A6615FF6D6A006B5F22 /* PlatformMemoryInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1D118A15FF361B0026E908 /* PlatformMemoryInstrumentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14641466                4F8565E91530356E00FAE776 /* MemoryInstrumentationImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8565E71530356E00FAE776 /* MemoryInstrumentationImpl.cpp */; };
    14651467                4F8565EA1530356E00FAE776 /* MemoryInstrumentationImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8565E81530356E00FAE776 /* MemoryInstrumentationImpl.h */; };
    … …  
    86238625                4F1534DD11B532EC0021FD86 /* EditingBehavior.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehavior.h; sourceTree = "<group>"; };
    86248626                4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; };
     8627                4F1D118915FF361B0026E908 /* PlatformMemoryInstrumentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMemoryInstrumentation.cpp; sourceTree = "<group>"; };
     8628                4F1D118A15FF361B0026E908 /* PlatformMemoryInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMemoryInstrumentation.h; sourceTree = "<group>"; };
    86258629                4F2D205212EAE7B3005C2874 /* InspectorAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorAgent.h; sourceTree = "<group>"; };
    86268630                4F2D205312EAE7B3005C2874 /* InspectorAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorAgent.cpp; sourceTree = "<group>"; };
    … …  
    2083920843                                49182B5115DCE6F000548418 /* PlatformInstrumentation.h */,
    2084020844                                935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */,
     20845                                4F1D118915FF361B0026E908 /* PlatformMemoryInstrumentation.cpp */,
     20846                                4F1D118A15FF361B0026E908 /* PlatformMemoryInstrumentation.h */,
    2084120847                                932871BF0B20DEB70049035A /* PlatformMenuDescription.h */,
    2084220848                                935C476709AC4D4300A6AAB4 /* PlatformMouseEvent.h */,
    … …  
    2555525561                                977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
    2555625562                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
     25563                                4F7B4A6615FF6D6A006B5F22 /* PlatformMemoryInstrumentation.h in Headers */,
    2555725564                        );
    2555825565                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2865228659                                977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
    2865328660                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
     28661                                4F1D11BF15FF37200026E908 /* PlatformMemoryInstrumentation.cpp in Sources */,
    2865428662                        );
    2865528663                        runOnlyForDeploymentPostprocessing = 0;

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

    r128448 r128451  
    3838MemoryObjectType WebCoreMemoryTypes::CSS = "Page.CSS";
    3939MemoryObjectType WebCoreMemoryTypes::Binding = "Page.Binding";
    40 MemoryObjectType WebCoreMemoryTypes::Loader = "Page.Loader";
    4140
    4241MemoryObjectType WebCoreMemoryTypes::MemoryCache = "MemoryCache";

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

    r128448 r128451  
    3232#define WebCoreMemoryInstrumentation_h
    3333
    34 #include <wtf/MemoryInstrumentation.h>
     34#include "PlatformMemoryInstrumentation.h"
    3535
    3636namespace WebCore {
    … …  
    3939using WTF::MemoryObjectType;
    4040
    41 class WebCoreMemoryTypes {
     41class WebCoreMemoryTypes : public PlatformMemoryTypes {
    4242public:
    4343    static MemoryObjectType Page;
    … …  
    4545    static MemoryObjectType CSS;
    4646    static MemoryObjectType Binding;
    47     static MemoryObjectType Loader;
    4847
    4948    static MemoryObjectType MemoryCache;

  • trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

    r127738 r128451  
    482482        RefPtr<TypeBuilder::Array<InspectorMemoryBlock> > domChildren = TypeBuilder::Array<InspectorMemoryBlock>::create();
    483483        totalSize += addMemoryBlockFor(domChildren.get(), WebCoreMemoryTypes::DOM);
     484        totalSize += addMemoryBlockFor(domChildren.get(), WebCoreMemoryTypes::Image);
    484485        totalSize += addMemoryBlockFor(domChildren.get(), WebCoreMemoryTypes::CSS);
    485486        totalSize += addMemoryBlockFor(domChildren.get(), WebCoreMemoryTypes::Binding);

  • trunk/Source/WebCore/platform/KURL.cpp

    r128448 r128451  
    2929
    3030#include "DecodeEscapeSequences.h"
     31#include "PlatformMemoryInstrumentation.h"
    3132#include "TextEncoding.h"
    32 #include "WebCoreMemoryInstrumentation.h"
    3333#include <stdio.h>
    3434#include <wtf/HashMap.h>

  • trunk/Source/WebCore/platform/KURLGoogle.cpp

    r128448 r128451  
    4242
    4343#include "NotImplemented.h"
     44#include "PlatformMemoryInstrumentation.h"
    4445#include "TextEncoding.h"
    45 #include "WebCoreMemoryInstrumentation.h"
    4646#include <wtf/HashMap.h>
    4747#include <wtf/Vector.h>

  • trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp

    r128450 r128451  
    3030
    3131#include "config.h"
    32 #include "GeneratedImage.h"
    33 
    34 #include "FloatSize.h"
    35 #include "WebCoreMemoryInstrumentation.h"
    36 
     32#include "PlatformMemoryInstrumentation.h"
    3733
    3834namespace WebCore {
    3935
    40 void GeneratedImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
    41 {
    42     Image::computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
    43     intrinsicRatio = FloatSize();
    44 }
     36MemoryObjectType PlatformMemoryTypes::Image = "Page.Image";
     37MemoryObjectType PlatformMemoryTypes::Loader = "Page.Loader";
    4538
    46 void GeneratedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    47 {
    48     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
    49     Image::reportMemoryUsage(memoryObjectInfo);
    50 }
    51 
    52 }
     39} // namespace WebCore

  • trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.h

    r128450 r128451  
    2929 */
    3030
    31 #include "config.h"
    32 #include "GeneratedImage.h"
     31#ifndef PlatformMemoryInstrumentation_h
     32#define PlatformMemoryInstrumentation_h
    3333
    34 #include "FloatSize.h"
    35 #include "WebCoreMemoryInstrumentation.h"
    36 
     34#include <wtf/MemoryInstrumentation.h>
    3735
    3836namespace WebCore {
    3937
    40 void GeneratedImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
    41 {
    42     Image::computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
    43     intrinsicRatio = FloatSize();
    44 }
     38using WTF::MemoryClassInfo;
     39using WTF::MemoryObjectType;
    4540
    46 void GeneratedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    47 {
    48     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
    49     Image::reportMemoryUsage(memoryObjectInfo);
    50 }
     41class PlatformMemoryTypes {
     42public:
     43    static MemoryObjectType Image;
     44    static MemoryObjectType Loader;
     45};
    5146
    52 }
     47} // namespace WebCore
     48
     49#endif // !defined(PlatformMemoryInstrumentation_h)

  • trunk/Source/WebCore/platform/SharedBuffer.cpp

    r128300 r128451  
    2828#include "SharedBuffer.h"
    2929
     30#include "PlatformMemoryInstrumentation.h"
    3031#include "PurgeableBuffer.h"
    31 #include "WebCoreMemoryInstrumentation.h"
    3232#include <wtf/PassOwnPtr.h>
    3333#include <wtf/unicode/UTF8.h>

  • trunk/Source/WebCore/platform/TreeShared.h

    r127593 r128451  
    114114    void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    115115    {
    116         MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
     116        MemoryClassInfo info(memoryObjectInfo, this);
    117117        info.addInstrumentedMember(m_parent);
    118118    }

  • trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

    r127869 r128451  
    3232#include "IntRect.h"
    3333#include "MIMETypeRegistry.h"
     34#include "PlatformMemoryInstrumentation.h"
    3435#include "Timer.h"
    35 #include "WebCoreMemoryInstrumentation.h"
    3636#include <wtf/CurrentTime.h>
    3737#include <wtf/Vector.h>
    … …  
    575575void BitmapImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    576576{
    577     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
     577    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
    578578    Image::reportMemoryUsage(memoryObjectInfo);
    579579    info.addMember(m_source);

  • trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp

    r127869 r128451  
    3030#include "GraphicsContext.h"
    3131#include "ImageBuffer.h"
    32 #include "WebCoreMemoryInstrumentation.h"
     32#include "PlatformMemoryInstrumentation.h"
    3333
    3434using namespace std;
    … …  
    111111void CrossfadeGeneratedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    112112{
    113     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
     113    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
    114114    GeneratedImage::reportMemoryUsage(memoryObjectInfo);
    115115    info.addInstrumentedMember(m_fromImage);

  • trunk/Source/WebCore/platform/graphics/GeneratedImage.cpp

    r127869 r128451  
    3333
    3434#include "FloatSize.h"
    35 #include "WebCoreMemoryInstrumentation.h"
     35#include "PlatformMemoryInstrumentation.h"
    3636
    3737
    … …  
    4646void GeneratedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    4747{
    48     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
     48    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
    4949    Image::reportMemoryUsage(memoryObjectInfo);
    5050}

  • trunk/Source/WebCore/platform/graphics/GeneratorGeneratedImage.cpp

    r127593 r128451  
    3030#include "GraphicsContext.h"
    3131#include "Length.h"
     32#include "PlatformMemoryInstrumentation.h"
    3233
    3334namespace WebCore {
    … …  
    8889void GeneratorGeneratedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    8990{
    90     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
     91    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
    9192    GeneratedImage::reportMemoryUsage(memoryObjectInfo);
    9293    info.addMember(m_generator);

  • trunk/Source/WebCore/platform/graphics/GeneratorGeneratedImage.h

    r127869 r128451  
    3333#include "IntSize.h"
    3434#include "Timer.h"
    35 #include "WebCoreMemoryInstrumentation.h"
    3635#include <wtf/RefPtr.h>
    3736

  • trunk/Source/WebCore/platform/graphics/Image.cpp

    r127869 r128451  
    3535#include "Length.h"
    3636#include "MIMETypeRegistry.h"
     37#include "PlatformMemoryInstrumentation.h"
    3738#include "SharedBuffer.h"
    38 #include "WebCoreMemoryInstrumentation.h"
    3939#include <math.h>
    4040#include <wtf/MainThread.h>
    … …  
    201201void Image::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    202202{
    203     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
     203    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
    204204    info.addInstrumentedMember(m_data);
    205205    info.addMember(m_imageObserver);

  • trunk/Source/WebCore/platform/network/FormData.cpp

    r127869 r128451  
    3434#include "MIMETypeRegistry.h"
    3535#include "Page.h"
     36#include "PlatformMemoryInstrumentation.h"
    3637#include "TextEncoding.h"
    37 #include "WebCoreMemoryInstrumentation.h"
    3838#include <wtf/Decoder.h>
    3939#include <wtf/Encoder.h>
    … …  
    360360void FormData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    361361{
    362     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     362    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
    363363    info.addVector(m_boundary);
    364364}

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r127869 r128451  
    2727#include "ResourceRequestBase.h"
    2828
     29#include "PlatformMemoryInstrumentation.h"
    2930#include "ResourceRequest.h"
    30 #include "WebCoreMemoryInstrumentation.h"
    3131
    3232using namespace std;
    … …  
    447447void ResourceRequestBase::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    448448{
    449     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     449    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
    450450    info.addInstrumentedMember(m_url);
    451451    info.addInstrumentedMember(m_firstPartyForCookies);

  • trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

    r127869 r128451  
    2929
    3030#include "HTTPParsers.h"
     31#include "PlatformMemoryInstrumentation.h"
    3132#include "ResourceResponse.h"
    32 #include "WebCoreMemoryInstrumentation.h"
    3333#include <wtf/CurrentTime.h>
    3434#include <wtf/MathExtras.h>
    … …  
    571571void ResourceResponseBase::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    572572{
    573     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     573    MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Loader);
    574574    info.addInstrumentedMember(m_url);
    575575    info.addInstrumentedMember(m_mimeType);
Note: See TracChangeset for help on using the changeset viewer.