Attachment 135497 Details for Bug 83112 – Patch

[patch] Patch

bug-83112-20120403232307.patch (text/plain), 9.46 KB, created by Mark Pilgrim (Google) on 2012-04-03 20:23:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-03 20:23:17 PDT

Size: 9.46 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 113132)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2012-04-03  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        Call histogramCustomCounts directly
>+        https://bugs.webkit.org/show_bug.cgi?id=83112
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+        * platform/graphics/chromium/ContentLayerChromium.cpp:
>+        (WebCore::ContentLayerPainter::paint):
>+        * platform/graphics/chromium/cc/CCOverdrawMetrics.cpp:
>+        (WebCore::CCOverdrawMetrics::recordMetricsInternal):
>+
> 2012-04-03  Kenichi Ishibashi  <bashi@chromium.org>
> 
>         [Chromium] Out-of-process font loading garbles text
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 113129)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -260,7 +260,6 @@ public:
>     static void stopSharedTimer();
> 
>     // StatsCounters ------------------------------------------------------
>-    static void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount);
>     static void histogramEnumeration(const char* name, int sample, int boundaryValue);
> 
>     // Sudden Termination
>Index: Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp	(revision 113129)
>+++ Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp	(working copy)
>@@ -41,6 +41,7 @@
> #include "LayerRendererChromium.h"
> #include "PlatformSupport.h"
> #include "cc/CCLayerTreeHost.h"
>+#include <public/Platform.h>
> #include <wtf/CurrentTime.h>
> 
> namespace WebCore {
>@@ -61,8 +62,8 @@ public:
>         m_delegate->paintContents(context, contentRect);
>         double paintEnd = currentTime();
>         double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
>-        PlatformSupport::histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>-        PlatformSupport::histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
>     }
> private:
>     explicit ContentLayerPainter(ContentLayerDelegate* delegate)
>Index: Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp	(revision 113129)
>+++ Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp	(working copy)
>@@ -34,6 +34,7 @@
> #include "TransformationMatrix.h"
> #include "cc/CCLayerTreeHost.h"
> #include "cc/CCLayerTreeHostImpl.h"
>+#include <public/Platform.h>
> 
> namespace WebCore {
> 
>@@ -137,11 +138,11 @@ void CCOverdrawMetrics::recordMetricsInt
>     ASSERT(histogramOpaqueName);
> 
>     float normalization = 1000.f / (layerTreeHost->viewportSize().width() * layerTreeHost->viewportSize().height());
>-    PlatformSupport::histogramCustomCounts(histogramOpaqueName, static_cast<int>(normalization * m_pixelsDrawnOpaque), 100, 1000000, 50);
>-    PlatformSupport::histogramCustomCounts(histogramTranslucentName, static_cast<int>(normalization * m_pixelsDrawnTranslucent), 100, 1000000, 50);
>-    PlatformSupport::histogramCustomCounts(histogramCulledName, static_cast<int>(normalization * m_pixelsCulled), 100, 1000000, 50);
>+    WebKit::Platform::current()->histogramCustomCounts(histogramOpaqueName, static_cast<int>(normalization * m_pixelsDrawnOpaque), 100, 1000000, 50);
>+    WebKit::Platform::current()->histogramCustomCounts(histogramTranslucentName, static_cast<int>(normalization * m_pixelsDrawnTranslucent), 100, 1000000, 50);
>+    WebKit::Platform::current()->histogramCustomCounts(histogramCulledName, static_cast<int>(normalization * m_pixelsCulled), 100, 1000000, 50);
>     if (paintedCounterName)
>-        PlatformSupport::histogramCustomCounts(histogramPaintedName, static_cast<int>(normalization * m_pixelsPainted), 100, 1000000, 50);
>+        WebKit::Platform::current()->histogramCustomCounts(histogramPaintedName, static_cast<int>(normalization * m_pixelsPainted), 100, 1000000, 50);
> 
>     TRACE_COUNTER_ID1("webkit", cullCounterName, layerTreeHost, m_pixelsCulled);
>     TRACE_EVENT2("webkit", "CCOverdrawMetrics", opaqueCounterName, m_pixelsDrawnOpaque, translucentCounterName, m_pixelsDrawnTranslucent);
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 113132)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2012-04-03  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        Call histogramCustomCounts directly
>+        https://bugs.webkit.org/show_bug.cgi?id=83112
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+        * src/WebViewImpl.cpp:
>+        (WebKit::WebViewImpl::paint):
>+        (WebKit::WebViewImplContentPainter::paint):
>+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
>+        * src/painting/PaintAggregator.cpp:
>+
> 2012-04-03  Ian Vollick  <vollick@chromium.org>
> 
>         [chromium] Include Image.h in TextFieldDecoratorImpl.cpp
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 113129)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -713,11 +713,6 @@ void PlatformSupport::stopSharedTimer()
> 
> // StatsCounters --------------------------------------------------------------
> 
>-void PlatformSupport::histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount)
>-{
>-    webKitPlatformSupport()->histogramCustomCounts(name, sample, min, max, bucketCount);
>-}
>-
> void PlatformSupport::histogramEnumeration(const char* name, int sample, int boundaryValue)
> {
>     webKitPlatformSupport()->histogramEnumeration(name, sample, boundaryValue);
>Index: Source/WebKit/chromium/src/WebViewImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebViewImpl.cpp	(revision 113129)
>+++ Source/WebKit/chromium/src/WebViewImpl.cpp	(working copy)
>@@ -144,6 +144,7 @@
> #include "platform/WebKitPlatformSupport.h"
> #include "platform/WebString.h"
> #include "platform/WebVector.h"
>+#include <public/Platform.h>
> #include <public/WebFloatPoint.h>
> #include <public/WebGraphicsContext3D.h>
> #include <public/WebLayer.h>
>@@ -1494,8 +1495,8 @@ void WebViewImpl::paint(WebCanvas* canva
>             webframe->paint(canvas, rect);
>         double paintEnd = currentTime();
>         double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
>-        PlatformSupport::histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>-        PlatformSupport::histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
>     }
> }
> 
>@@ -3272,8 +3273,8 @@ public:
>         view->paintContents(&context, contentRect);
>         double paintEnd = currentTime();
>         double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
>-        PlatformSupport::histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>-        PlatformSupport::histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
>+        WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
> 
>         m_webViewImpl->nonCompositedContentHost()->setBackgroundColor(view->documentBackgroundColor());
> 
>@@ -3290,7 +3291,7 @@ private:
> 
> void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
> {
>-    PlatformSupport::histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
>+    WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
> 
>     if (m_isAcceleratedCompositingActive == active)
>         return;
>Index: Source/WebKit/chromium/src/painting/PaintAggregator.cpp
>===================================================================
>--- Source/WebKit/chromium/src/painting/PaintAggregator.cpp	(revision 113129)
>+++ Source/WebKit/chromium/src/painting/PaintAggregator.cpp	(working copy)
>@@ -33,6 +33,7 @@
> 
> #include "WebKit.h"
> #include "platform/WebKitPlatformSupport.h"
>+#include <public/Platform.h>
> 
> using namespace WebCore;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 83112: 135497 | 135581