Attachment 135687 Details for Bug 83106 – Patch

[patch] Patch

bug-83106-20120404173839.patch (text/plain), 6.14 KB, created by Mark Pilgrim (Google) on 2012-04-04 14:38:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-04 14:38:50 PDT

Size: 6.14 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 113242)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2012-04-04  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        Call histogramEnumeration directly
>+        https://bugs.webkit.org/show_bug.cgi?id=83106
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring project to remove the PlatformSupport
>+        abstraction from some functions. See bug 82948.
>+
>+        * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
>+        (WebCore::histogramEnumeration):
>+        * platform/chromium/HistogramSupportChromium.cpp:
>+        (WebCore::HistogramSupport::histogramEnumeration):
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+
> 2012-04-04  Daniel Sievers  <sievers@chromium.org>
> 
>         [Chromium] Always skip draw and readback if there is nothing
>Index: Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
>===================================================================
>--- Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp	(revision 113240)
>+++ Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp	(working copy)
>@@ -32,12 +32,10 @@
> #if ENABLE(INSPECTOR)
> #include "V8InspectorFrontendHost.h"
> 
>+#include "HistogramSupport.h"
> #include "InspectorController.h"
> #include "InspectorFrontendClient.h"
> #include "InspectorFrontendHost.h"
>-#if !PLATFORM(QT)
>-#include "PlatformSupport.h"
>-#endif
> #include "PlatformString.h"
> 
> #include "V8Binding.h"
>@@ -125,7 +123,7 @@ static v8::Handle<v8::Value> histogramEn
> 
>     int sample = args[0]->ToInt32()->Value();
>     if (sample < boundaryValue)
>-        PlatformSupport::histogramEnumeration(name, sample, boundaryValue);
>+        HistogramSupport::histogramEnumeration(name, sample, boundaryValue);
> 
>     return v8::Undefined();
> }
>Index: Source/WebCore/platform/chromium/HistogramSupportChromium.cpp
>===================================================================
>--- Source/WebCore/platform/chromium/HistogramSupportChromium.cpp	(revision 113240)
>+++ Source/WebCore/platform/chromium/HistogramSupportChromium.cpp	(working copy)
>@@ -31,13 +31,13 @@
> #include "config.h"
> #include "HistogramSupport.h"
> 
>-#include "PlatformSupport.h"
>+#include <public/Platform.h>
> 
> namespace WebCore {
> 
> void HistogramSupport::histogramEnumeration(const char* name, int sample, int boundaryValue)
> {
>-    PlatformSupport::histogramEnumeration(name, sample, boundaryValue);
>+    WebKit::Platform::current()->histogramEnumeration(name, sample, boundaryValue);
> }
> 
> } // namespace WebCore
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 113240)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -256,9 +256,6 @@ public:
>     static void setSharedTimerFireInterval(double);
>     static void stopSharedTimer();
> 
>-    // StatsCounters ------------------------------------------------------
>-    static void histogramEnumeration(const char* name, int sample, int boundaryValue);
>-
>     // Theming ------------------------------------------------------------
> #if OS(WINDOWS)
>     static void paintButton(
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 113242)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2012-04-04  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        Call histogramEnumeration directly
>+        https://bugs.webkit.org/show_bug.cgi?id=83106
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring project to remove the PlatformSupport
>+        abstraction from some functions. See bug 82948.
>+
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::shouldRunModalDialogDuringPageDismissal):
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-04-04  Daniel Sievers  <sievers@chromium.org>
> 
>         [Chromium] Always skip draw and readback if there is nothing
>Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/ChromeClientImpl.cpp	(revision 113240)
>+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp	(working copy)
>@@ -101,6 +101,7 @@
> #include "WebWindowFeatures.h"
> #include "WindowFeatures.h"
> #include "WrappedResourceRequest.h"
>+#include <public/Platform.h>
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/StringConcatenate.h>
> #include <wtf/unicode/CharacterNames.h>
>@@ -1020,7 +1021,7 @@ bool ChromeClientImpl::shouldRunModalDia
>     int dismissal = static_cast<int>(dismissalType) - 1; // Exclude NoDismissal.
>     ASSERT(0 <= dismissal && dismissal < static_cast<int>(arraysize(kDismissals)));
> 
>-    PlatformSupport::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals));
>+    WebKit::Platform::current()->histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals));
> 
>     m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMessage::LevelError, makeString("Blocked ", kDialogs[dialog], "('", dialogMessage, "') during ", kDismissals[dismissal], ".")));
> 
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 113240)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -704,13 +704,6 @@ void PlatformSupport::stopSharedTimer()
>     webKitPlatformSupport()->stopSharedTimer();
> }
> 
>-// StatsCounters --------------------------------------------------------------
>-
>-void PlatformSupport::histogramEnumeration(const char* name, int sample, int boundaryValue)
>-{
>-    webKitPlatformSupport()->histogramEnumeration(name, sample, boundaryValue);
>-}
>-
> // Theming --------------------------------------------------------------------
> 
> #if OS(WINDOWS)

Actions: View | Formatted Diff | Diff

Attachments on bug 83106: 135488 | 135587 | 135687