Attachment #168617 for bug #99288

View Details Raw Unified Return to Bug 99288

| Differences between



2012-10-14  Zoltan Horvath  <zoltan@webkit.org>

        [chromium] Provide used JSHeap size in chromium's DRT for pageloadtest memory measurements 
        https://bugs.webkit.org/show_bug.cgi?id=99288

        Reviewed by NOBODY (OOPS!).

        Provide used JSHeap size as we did it for the Apple port.

        * DumpRenderTree/chromium/TestEventPrinter.cpp:
        (TestEventPrinter::handleDumpMemoryHeader): Add new function to print the JSHeap memory result.
        * DumpRenderTree/chromium/TestEventPrinter.h:
        (TestEventPrinter): handleDumpMemoryHeader declaration.
        * DumpRenderTree/chromium/TestShell.cpp:
        (TestShell::dump): Dump JSHeap value.

2012-10-14  Jon Lee  <jonlee@apple.com>

        Allow notification origin permission request when no js callback is provided

Lines 30-35 a/Tools/DumpRenderTree/chromium/TestEventPrinter.cpp_sec1
- a/Tools/DumpRenderTree/chromium/TestEventPrinter.cpp +7 lines
30		30
31	#include "config.h"	31	#include "config.h"
32	#include "TestEventPrinter.h"	32	#include "TestEventPrinter.h"
		33	#include "v8.h"
33		34
34	#include <stdio.h>	35	#include <stdio.h>
35	#include <stdlib.h>	36	#include <stdlib.h>
Lines 57-62 void TestEventPrinter::handleTimedOut() const a/Tools/DumpRenderTree/chromium/TestEventPrinter.cpp_sec2
57	fprintf(stdout, "FAIL: Timed out waiting for notifyDone to be called\n");	58	fprintf(stdout, "FAIL: Timed out waiting for notifyDone to be called\n");
58	}	59	}
59		60
		61	void TestEventPrinter::handleDumpMemoryHeader() const
		62	{
		63	v8::HeapStatistics heapStatistics;
		64	printf("DumpJSHeap: %li\n", heapStatistics.used_heap_size());
		65	}
		66
60	void TestEventPrinter::handleTextHeader() const	67	void TestEventPrinter::handleTextHeader() const
61	{	68	{
62	printf("Content-Type: text/plain\n");	69	printf("Content-Type: text/plain\n");

Lines 39-44 public: a/Tools/DumpRenderTree/chromium/TestEventPrinter.h_sec1
- a/Tools/DumpRenderTree/chromium/TestEventPrinter.h +1 lines
39	~TestEventPrinter();	39	~TestEventPrinter();
40	void handleTestHeader(const char* url) const;	40	void handleTestHeader(const char* url) const;
41	void handleTimedOut() const;	41	void handleTimedOut() const;
		42	void handleDumpMemoryHeader() const;
42	void handleTextHeader() const;	43	void handleTextHeader() const;
43	void handleTextFooter() const;	44	void handleTextFooter() const;
44	void handleAudio(const void* audioData, size_t audioSize) const;	45	void handleAudio(const void* audioData, size_t audioSize) const;

Lines 575-580 void TestShell::dump() a/Tools/DumpRenderTree/chromium/TestShell.cpp_sec1
- a/Tools/DumpRenderTree/chromium/TestShell.cpp +1 lines
575	if (m_params.dumpTree) {	575	if (m_params.dumpTree) {
576	dumpedAnything = true;	576	dumpedAnything = true;
577	m_printer.handleTextHeader();	577	m_printer.handleTextHeader();
		578	m_printer.handleDumpMemoryHeader();
578	// Text output: the test page can request different types of output	579	// Text output: the test page can request different types of output
579	// which we handle here.	580	// which we handle here.
580	if (!shouldDumpAsText) {	581	if (!shouldDumpAsText) {

Return to Bug 99288

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +16 lines
		1	2012-10-14 Zoltan Horvath <zoltan@webkit.org>
		2
		3	[chromium] Provide used JSHeap size in chromium's DRT for pageloadtest memory measurements
		4	https://bugs.webkit.org/show_bug.cgi?id=99288
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Provide used JSHeap size as we did it for the Apple port.
		9
		10	* DumpRenderTree/chromium/TestEventPrinter.cpp:
		11	(TestEventPrinter::handleDumpMemoryHeader): Add new function to print the JSHeap memory result.
		12	* DumpRenderTree/chromium/TestEventPrinter.h:
		13	(TestEventPrinter): handleDumpMemoryHeader declaration.
		14	* DumpRenderTree/chromium/TestShell.cpp:
		15	(TestShell::dump): Dump JSHeap value.
		16
1	2012-10-14 Jon Lee <jonlee@apple.com>	17	2012-10-14 Jon Lee <jonlee@apple.com>
2		18
3	Allow notification origin permission request when no js callback is provided	19	Allow notification origin permission request when no js callback is provided