Skip to content

Commit

Permalink
Revert of Add logging for ScriptedAnimationController. (patchset #1 of
Browse files Browse the repository at this point in the history
…https://codereview.chromium.org/484323002/)

Reason for revert:
Broke https://build.chromium.org/p/chromium.webkit/builders/Android%20Builder%20(dbg)/builds/33277/steps/compile/logs/stdio

Original issue's description:
> Add logging for ScriptedAnimationController.
> 
> This is for debugging RAF based WebGL conformance tests random timeouts.
> 
> BUG=393331
> TEST=bots
> NOTRY=true
> [email protected],[email protected]
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=180672

[email protected],[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=393331

Review URL: https://codereview.chromium.org/488863004

git-svn-id: svn://svn.chromium.org/blink/trunk@180682 bbb929c8-8fbe-4397-9dbb-9b2b20218538
  • Loading branch information
[email protected] committed Aug 20, 2014
1 parent b39d699 commit 8c4658f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 16 deletions.
11 changes: 0 additions & 11 deletions Source/core/dom/ScriptedAnimationController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "core/inspector/InspectorInstrumentation.h"
#include "core/inspector/InspectorTraceEvents.h"
#include "core/loader/DocumentLoader.h"
#include "platform/Logging.h"

namespace blink {

Expand Down Expand Up @@ -68,7 +67,6 @@ void ScriptedAnimationController::trace(Visitor* visitor)
void ScriptedAnimationController::suspend()
{
++m_suspendCount;
WTF_LOG(ScriptedAnimationController, "suspend: count = %d", m_suspendCount);
}

void ScriptedAnimationController::resume()
Expand All @@ -77,14 +75,12 @@ void ScriptedAnimationController::resume()
// even when suspend hasn't (if a tab was created in the background).
if (m_suspendCount > 0)
--m_suspendCount;
WTF_LOG(ScriptedAnimationController, "resume: count = %d", m_suspendCount);
scheduleAnimationIfNeeded();
}

ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCallback(PassOwnPtr<RequestAnimationFrameCallback> callback)
{
ScriptedAnimationController::CallbackId id = ++m_nextCallbackId;
WTF_LOG(ScriptedAnimationController, "registerCallback: id = %d", id);
callback->m_cancelled = false;
callback->m_id = id;
m_callbacks.append(callback);
Expand All @@ -100,7 +96,6 @@ ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCal

void ScriptedAnimationController::cancelCallback(CallbackId id)
{
WTF_LOG(ScriptedAnimationController, "cancelCallback: id = %d", id);
for (size_t i = 0; i < m_callbacks.size(); ++i) {
if (m_callbacks[i]->m_id == id) {
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "CancelAnimationFrame", "data", InspectorAnimationFrameEvent::data(m_document, id));
Expand Down Expand Up @@ -189,8 +184,6 @@ void ScriptedAnimationController::callMediaQueryListListeners()

void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTimeNow)
{
WTF_LOG(ScriptedAnimationController, "serviceScriptedAnimations: #callbacks = %lu, #events = %lu, #mediaQueryListListeners =%u, count = %d",
m_callbacks.size(), m_eventQueue.size(), m_mediaQueryListListeners.size(), m_suspendCount);
if (!m_callbacks.size() && !m_eventQueue.size() && !m_mediaQueryListListeners.size())
return;

Expand All @@ -208,7 +201,6 @@ void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTime

void ScriptedAnimationController::enqueueEvent(PassRefPtrWillBeRawPtr<Event> event)
{
WTF_LOG(ScriptedAnimationController, "enqueueEvent");
InspectorInstrumentation::didEnqueueEvent(event->target(), event.get());
m_eventQueue.append(event);
scheduleAnimationIfNeeded();
Expand All @@ -223,7 +215,6 @@ void ScriptedAnimationController::enqueuePerFrameEvent(PassRefPtrWillBeRawPtr<Ev

void ScriptedAnimationController::enqueueMediaQueryChangeListeners(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener> >& listeners)
{
WTF_LOG(ScriptedAnimationController, "enqueueMediaQueryChangeListeners");
for (size_t i = 0; i < listeners.size(); ++i) {
m_mediaQueryListListeners.add(listeners[i]);
}
Expand All @@ -232,8 +223,6 @@ void ScriptedAnimationController::enqueueMediaQueryChangeListeners(WillBeHeapVec

void ScriptedAnimationController::scheduleAnimationIfNeeded()
{
WTF_LOG(ScriptedAnimationController, "scheduleAnimationIfNeeded: document = %d, count = %d, #callbacks = %lu, #events = %lu, #mediaQueryListListeners =%u, frameView = %d",
m_document ? 1 : 0, m_suspendCount, m_callbacks.size(), m_eventQueue.size(), m_mediaQueryListListeners.size(), m_document && m_document->view() ? 1 : 0);
if (!m_document)
return;

Expand Down
4 changes: 0 additions & 4 deletions Source/platform/Logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ WTFLogChannel LogWebAudio = { WTFLogChannelOff };
WTFLogChannel LogCompositing = { WTFLogChannelOff };
WTFLogChannel LogGamepad = { WTFLogChannelOff };

WTFLogChannel LogScriptedAnimationController = { WTFLogChannelOff };

WTFLogChannel* getChannelFromName(const String& channelName)
{
Expand Down Expand Up @@ -149,9 +148,6 @@ WTFLogChannel* getChannelFromName(const String& channelName)
if (equalIgnoringCase(channelName, String("Gamepad")))
return &LogGamepad;

if (equalIgnoringCase(channelName, String("ScriptedAnimationController")))
return &LogScriptedAnimationController;

return 0;
}

Expand Down
1 change: 0 additions & 1 deletion Source/platform/Logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ PLATFORM_EXPORT extern WTFLogChannel LogFileAPI;
PLATFORM_EXPORT extern WTFLogChannel LogWebAudio;
PLATFORM_EXPORT extern WTFLogChannel LogCompositing;
PLATFORM_EXPORT extern WTFLogChannel LogGamepad;
PLATFORM_EXPORT extern WTFLogChannel LogScriptedAnimationController;

PLATFORM_EXPORT WTFLogChannel* getChannelFromName(const String& channelName);

Expand Down

0 comments on commit 8c4658f

Please sign in to comment.