diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/JavaScriptCore/profiler | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/JavaScriptCore/profiler')
-rw-r--r-- | Source/JavaScriptCore/profiler/CallIdentifier.h | 5 | ||||
-rw-r--r-- | Source/JavaScriptCore/profiler/Profiler.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/profiler/CallIdentifier.h b/Source/JavaScriptCore/profiler/CallIdentifier.h index 76c1470..a9827c0 100644 --- a/Source/JavaScriptCore/profiler/CallIdentifier.h +++ b/Source/JavaScriptCore/profiler/CallIdentifier.h @@ -28,13 +28,14 @@ #define CallIdentifier_h #include <runtime/UString.h> -#include "FastAllocBase.h" #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> namespace JSC { - struct CallIdentifier : public FastAllocBase { + struct CallIdentifier { + WTF_MAKE_FAST_ALLOCATED; + public: UString m_name; UString m_url; unsigned m_lineNumber; diff --git a/Source/JavaScriptCore/profiler/Profiler.h b/Source/JavaScriptCore/profiler/Profiler.h index f9c2ccb..f88746d 100644 --- a/Source/JavaScriptCore/profiler/Profiler.h +++ b/Source/JavaScriptCore/profiler/Profiler.h @@ -44,7 +44,8 @@ namespace JSC { class UString; struct CallIdentifier; - class Profiler : public FastAllocBase { + class Profiler { + WTF_MAKE_FAST_ALLOCATED; public: static Profiler** enabledProfilerReference() { |