Attachment #101470 for bug #64871

View Details Raw Unified Return to Bug 64871



2011-07-20  David Levin  <levin@chromium.org>

        gtk shouldn't have global variables for timers.
        https://bugs.webkit.org/show_bug.cgi?id=64871

        Reviewed by NOBODY (OOPS!).

        No new functionality exposed so no new tests.

        * platform/graphics/cairo/ContextShadowCairo.cpp:
        (WebCore::scheduleScratchBufferPurge): Changed global variable to DEFINE_STATIC_LOCAL.
        * platform/gtk/WidgetRenderingContext.cpp:
        (WebCore::scheduleScratchBufferPurge): Ditto.

2011-07-20  Steve Block  <steveblock@google.com>

        [V8] JavaMethodJobject::signature() incorrectly encodes arguments of type JavaTypeString



#include "PlatformContextCairo.h"
#include "Timer.h"
#include <cairo.h>
#include <wtf/StdLibExtras.h>

using WTF::max;


private:
    virtual void fired() { purgeScratchBuffer(); }
};

static void scheduleScratchBufferPurge()
{
    DEFINE_STATIC_LOCAL(PurgeScratchBufferTimer, purgeScratchBufferTimer, ());
    if (purgeScratchBufferTimer.isActive())
        purgeScratchBufferTimer.stop();
    purgeScratchBufferTimer.startOneShot(2);



#include "Timer.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <wtf/StdLibExtras.h>

namespace WebCore {


private:
    virtual void fired() { purgeScratchBuffer(); }
};

static void scheduleScratchBufferPurge()
{
    DEFINE_STATIC_LOCAL(PurgeScratchBufferTimer, purgeScratchBufferTimer, ());
    if (purgeScratchBufferTimer.isActive())
        purgeScratchBufferTimer.stop();
    purgeScratchBufferTimer.startOneShot(2);

Return to Bug 64871

Lines 37-42 a/Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp_sec1
- a/Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp -1 / +3 lines
37	#include "PlatformContextCairo.h"	37	#include "PlatformContextCairo.h"
38	#include "Timer.h"	38	#include "Timer.h"
39	#include <cairo.h>	39	#include <cairo.h>
		40	#include <wtf/StdLibExtras.h>
40		41
41	using WTF::max;	42	using WTF::max;
42		43
Lines 55-63 class PurgeScratchBufferTimer : public TimerBase { a/Source/WebCore/platform/graphics/cairo/ContextShadowCairo.cpp_sec2
55	private:	56	private:
56	virtual void fired() { purgeScratchBuffer(); }	57	virtual void fired() { purgeScratchBuffer(); }
57	};	58	};
58	static PurgeScratchBufferTimer purgeScratchBufferTimer;	59
59	static void scheduleScratchBufferPurge()	60	static void scheduleScratchBufferPurge()
60	{	61	{
		62	DEFINE_STATIC_LOCAL(PurgeScratchBufferTimer, purgeScratchBufferTimer, ());
61	if (purgeScratchBufferTimer.isActive())	63	if (purgeScratchBufferTimer.isActive())
62	purgeScratchBufferTimer.stop();	64	purgeScratchBufferTimer.stop();
63	purgeScratchBufferTimer.startOneShot(2);	65	purgeScratchBufferTimer.startOneShot(2);

Lines 39-44 a/Source/WebCore/platform/gtk/WidgetRenderingContext.cpp_sec1
- a/Source/WebCore/platform/gtk/WidgetRenderingContext.cpp -1 / +3 lines
39	#include "Timer.h"	39	#include "Timer.h"
40	#include <gdk/gdk.h>	40	#include <gdk/gdk.h>
41	#include <gtk/gtk.h>	41	#include <gtk/gtk.h>
		42	#include <wtf/StdLibExtras.h>
42		43
43	namespace WebCore {	44	namespace WebCore {
44		45
Lines 58-66 class PurgeScratchBufferTimer : public TimerBase { a/Source/WebCore/platform/gtk/WidgetRenderingContext.cpp_sec2
58	private:	59	private:
59	virtual void fired() { purgeScratchBuffer(); }	60	virtual void fired() { purgeScratchBuffer(); }
60	};	61	};
61	static PurgeScratchBufferTimer purgeScratchBufferTimer;	62
62	static void scheduleScratchBufferPurge()	63	static void scheduleScratchBufferPurge()
63	{	64	{
		65	DEFINE_STATIC_LOCAL(PurgeScratchBufferTimer, purgeScratchBufferTimer, ());
64	if (purgeScratchBufferTimer.isActive())	66	if (purgeScratchBufferTimer.isActive())
65	purgeScratchBufferTimer.stop();	67	purgeScratchBufferTimer.stop();
66	purgeScratchBufferTimer.startOneShot(2);	68	purgeScratchBufferTimer.startOneShot(2);

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
		1	2011-07-20 David Levin <levin@chromium.org>
		2
		3	gtk shouldn't have global variables for timers.
		4	https://bugs.webkit.org/show_bug.cgi?id=64871
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new functionality exposed so no new tests.
		9
		10	* platform/graphics/cairo/ContextShadowCairo.cpp:
		11	(WebCore::scheduleScratchBufferPurge): Changed global variable to DEFINE_STATIC_LOCAL.
		12	* platform/gtk/WidgetRenderingContext.cpp:
		13	(WebCore::scheduleScratchBufferPurge): Ditto.
		14
1	2011-07-20 Steve Block <steveblock@google.com>	15	2011-07-20 Steve Block <steveblock@google.com>
2		16
3	[V8] JavaMethodJobject::signature() incorrectly encodes arguments of type JavaTypeString	17	[V8] JavaMethodJobject::signature() incorrectly encodes arguments of type JavaTypeString