From 7068f1b88f868feed04f815b78e53542ade245ba Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 3 Apr 2012 15:03:29 +0000 Subject: [PATCH] Call incrementStatsCounter directly https://bugs.webkit.org/show_bug.cgi?id=83023 Patch by Mark Pilgrim on 2012-04-03 Reviewed by Kentaro Hara. Source/WebCore: * bindings/v8/V8Proxy.h: * platform/chromium/PlatformSupport.h: (PlatformSupport): Source/WebKit/chromium: * src/PlatformSupport.cpp: (WebCore): * src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::WebFrameImpl): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113034 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 11 +++++++++++ Source/WebCore/bindings/v8/V8Proxy.h | 2 +- Source/WebCore/platform/chromium/PlatformSupport.h | 1 - Source/WebKit/chromium/ChangeLog | 12 ++++++++++++ Source/WebKit/chromium/src/PlatformSupport.cpp | 5 ----- Source/WebKit/chromium/src/WebFrameImpl.cpp | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7f5801d..4541ba6 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2012-04-03 Mark Pilgrim + + Call incrementStatsCounter directly + https://bugs.webkit.org/show_bug.cgi?id=83023 + + Reviewed by Kentaro Hara. + + * bindings/v8/V8Proxy.h: + * platform/chromium/PlatformSupport.h: + (PlatformSupport): + 2012-04-03 Sami Kyostila [chromium] Canvas2DLayerChromium::updateCompositorResources should flush after copying diff --git a/Source/WebCore/bindings/v8/V8Proxy.h b/Source/WebCore/bindings/v8/V8Proxy.h index 9d15ba5..8b269e41 100644 --- a/Source/WebCore/bindings/v8/V8Proxy.h +++ b/Source/WebCore/bindings/v8/V8Proxy.h @@ -46,7 +46,7 @@ #include #if defined(ENABLE_DOM_STATS_COUNTERS) && PLATFORM(CHROMIUM) -#define INC_STATS(name) PlatformSupport::incrementStatsCounter(name) +#define INC_STATS(name) webkitPlatformSupport()->incrementStatsCounter(name) #else #define INC_STATS(name) #endif diff --git a/Source/WebCore/platform/chromium/PlatformSupport.h b/Source/WebCore/platform/chromium/PlatformSupport.h index 26a1423..7784695 100644 --- a/Source/WebCore/platform/chromium/PlatformSupport.h +++ b/Source/WebCore/platform/chromium/PlatformSupport.h @@ -260,7 +260,6 @@ public: static void stopSharedTimer(); // StatsCounters ------------------------------------------------------ - static void incrementStatsCounter(const char* name); static void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount); static void histogramEnumeration(const char* name, int sample, int boundaryValue); diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index ea20a92..8a44329 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,15 @@ +2012-04-03 Mark Pilgrim + + Call incrementStatsCounter directly + https://bugs.webkit.org/show_bug.cgi?id=83023 + + Reviewed by Kentaro Hara. + + * src/PlatformSupport.cpp: + (WebCore): + * src/WebFrameImpl.cpp: + (WebKit::WebFrameImpl::WebFrameImpl): + 2012-04-03 Sami Kyostila [chromium] Canvas2DLayerChromium::updateCompositorResources should flush after copying diff --git a/Source/WebKit/chromium/src/PlatformSupport.cpp b/Source/WebKit/chromium/src/PlatformSupport.cpp index 26f5e93..a795d95 100644 --- a/Source/WebKit/chromium/src/PlatformSupport.cpp +++ b/Source/WebKit/chromium/src/PlatformSupport.cpp @@ -713,11 +713,6 @@ void PlatformSupport::stopSharedTimer() // StatsCounters -------------------------------------------------------------- -void PlatformSupport::incrementStatsCounter(const char* name) -{ - webKitPlatformSupport()->incrementStatsCounter(name); -} - void PlatformSupport::histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount) { webKitPlatformSupport()->histogramCustomCounts(name, sample, min, max, bucketCount); diff --git a/Source/WebKit/chromium/src/WebFrameImpl.cpp b/Source/WebKit/chromium/src/WebFrameImpl.cpp index b7a31ff..0e58aa1 100644 --- a/Source/WebKit/chromium/src/WebFrameImpl.cpp +++ b/Source/WebKit/chromium/src/WebFrameImpl.cpp @@ -1976,7 +1976,7 @@ WebFrameImpl::WebFrameImpl(WebFrameClient* client) , m_identifier(generateFrameIdentifier()) , m_inSameDocumentHistoryLoad(false) { - PlatformSupport::incrementStatsCounter(webFrameActiveCount); + WebKit::Platform::current()->incrementStatsCounter(webFrameActiveCount); frameCount++; } -- 2.7.4