Attachment #64186 for bug #42612

View Details Raw Unified Return to Bug 42612

| Differences between



2010-08-03  MORITA Hajime  <morrita@google.com>

        Reviewed by NOBODY (OOPS!).

        DRT should allow test scripts to access WebCore internal states for setup/verification
        https://bugs.webkit.org/show_bug.cgi?id=42612

        * fast/dom/Window/script-tests/window-layout-test-controller-webcore.js: Added.
        * fast/dom/Window/window-layout-test-controller-webcore-expected.txt: Added.
        * fast/dom/Window/window-layout-test-controller-webcore.html: Added.
        * platform/chromium/test_expectations.txt:
        * platform/gtk/Skipped:
        * platform/qt/Skipped:
        * platform/win/Skipped:

2010-08-11  Sam Weinig  <sam@webkit.org>

        Rubber-stamped by Jon Honeycutt.

Line 0 a/LayoutTests/fast/dom/Window/script-tests/window-layout-test-controller-webcore.js_sec1
- a/LayoutTests/fast/dom/Window/script-tests/window-layout-test-controller-webcore.js +7 lines
	1	description("window.layoutTestController should have functions defined in LayoutTestController.idl");
	2	window.node = document.createTextNode("");
	3	shouldBeTrue("undefined != window.layoutTestController");
	4	shouldBeTrue("undefined != window.layoutTestController.documentMarkerSizeForNode");
	5	shouldBeTrue("0 == window.layoutTestController.documentMarkerSizeForNode(window.node)");
	6
	7	var successfullyParsed = true;



window.layoutTestController should have functions defined in LayoutTestController.idl

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


PASS undefined != window.layoutTestController is true
PASS undefined != window.layoutTestController.documentMarkerSizeForNode is true
PASS 0 == window.layoutTestController.documentMarkerSizeForNode(window.node) is true
PASS successfullyParsed is true

TEST COMPLETE




<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
<link rel="stylesheet" href="../../js/resources/js-test-style.css">
<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
<div id="console"></div>
<script src="script-tests/window-layout-test-controller-webcore.js"></script>
<script src="../../js/resources/js-test-post.js"></script>
</body>
</html>

Lines 3111-3116 BUGWK42845 : html5lib/runner.html = TEXT a/LayoutTests/platform/chromium/test_expectations.txt_sec1
- a/LayoutTests/platform/chromium/test_expectations.txt +2 lines
3111	BUGWK42769 : http/tests/xmlhttprequest/remember-bad-password.html = TEXT	3111	BUGWK42769 : http/tests/xmlhttprequest/remember-bad-password.html = TEXT
3112	BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT	3112	BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT
3113		3113
		3114	BUGWK42612 : fast/dom/Window/window-layout-test-controller-webcore.html = FAIL
		3115
3114	// Flaky since at least chromium r52834, WebKit r63615.	3116	// Flaky since at least chromium r52834, WebKit r63615.
3115	BUG49970 : platform/chromium/plugins/call-as-function.html = PASS TEXT	3117	BUG49970 : platform/chromium/plugins/call-as-function.html = PASS TEXT
3116		3118

Lines 5850-5855 editing/selection/drag-start-event-client-x-y.html a/LayoutTests/platform/gtk/Skipped_sec1
- a/LayoutTests/platform/gtk/Skipped +3 lines
5850	# Tests that require editing delegate dumps.	5850	# Tests that require editing delegate dumps.
5851	editing/pasteboard/drop-link.html	5851	editing/pasteboard/drop-link.html
5852		5852
		5853	# currently LayoutTestControllerCore is not supported http://webkit.org/b/42612
		5854	fast/dom/Window/window-layout-test-controller-webcore.html
		5855
5853	# Flaky due to JSC debugger issue.	5856	# Flaky due to JSC debugger issue.
5854	# https://bugs.webkit.org/show_bug.cgi?id=43034	5857	# https://bugs.webkit.org/show_bug.cgi?id=43034
5855	inspector/debugger-breakpoints-not-activated-on-reload.html	5858	inspector/debugger-breakpoints-not-activated-on-reload.html

Lines 5459-5464 html5lib/runner.html a/LayoutTests/platform/qt/Skipped_sec1
- a/LayoutTests/platform/qt/Skipped +3 lines
5459	fast/forms/interactive-validation-lost-focusable.html	5459	fast/forms/interactive-validation-lost-focusable.html
5460	fast/forms/interactive-validation-prevented.html	5460	fast/forms/interactive-validation-prevented.html
5461		5461
		5462	# currently LayoutTestControllerCore is not supported http://webkit.org/b/42612
		5463	fast/dom/Window/window-layout-test-controller-webcore.html
		5464
5462	# [Qt] REGRESSION(63862): animations/play-state.html fails intermittently	5465	# [Qt] REGRESSION(63862): animations/play-state.html fails intermittently
5463	# https://bugs.webkit.org/show_bug.cgi?id=42821	5466	# https://bugs.webkit.org/show_bug.cgi?id=42821
5464	animations/play-state.html	5467	animations/play-state.html

Lines 947-952 printing/setPrinting.html a/LayoutTests/platform/win/Skipped_sec1
- a/LayoutTests/platform/win/Skipped +3 lines
947	fast/forms/interactive-validation-lost-focusable.html	947	fast/forms/interactive-validation-lost-focusable.html
948	fast/forms/interactive-validation-prevented.html	948	fast/forms/interactive-validation-prevented.html
949		949
		950	# currently LayoutTestControllerCore is not supported http://webkit.org/b/42612
		951	fast/dom/Window/window-layout-test-controller-webcore.html
		952
950	# Web Timing is not enabled.	953	# Web Timing is not enabled.
951	# https://bugs.webkit.org/show_bug.cgi?id=42435	954	# https://bugs.webkit.org/show_bug.cgi?id=42435
952	fast/dom/Window/window-properties-performance.html	955	fast/dom/Window/window-properties-performance.html



    page/Geoposition.idl
    page/History.idl
    page/Location.idl
    page/LayoutTestController.idl
    page/MemoryInfo.idl
    page/Navigation.idl
    page/Navigator.idl

    page/GeolocationPositionCache.cpp
    page/History.cpp
    page/Location.cpp
    page/LayoutTestController.cpp
    page/MemoryInfo.cpp
    page/MouseEventWithHitTestResults.cpp
    page/Navigation.cpp



2010-08-03  MORITA Hajime  <morrita@google.com>

        Reviewed by NOBODY (OOPS!).

        DRT should allow test scripts to access WebCore internal states for setup/verification
        https://bugs.webkit.org/show_bug.cgi?id=42612

        Introduced:
        
        - WebCore::Testing namespace for testing-specific code.
          Implementation files are located under testing/ directory.
        - WebCore::LayoutTestController interface, that defines
          LayoutTestController API that will be implemented inside
          WebCore::Testing.
        - WebCore::Testing::LayoutTestControllerImpl that implements
          WebCore::LayoutTestController.
        - (Mac): WebKitTesting.framework to have code under testing/.
        
        Note that files under WebCore::Testing will be built separately
        from WebCore.framework for a security reason. So WebCore doesn't
        depend on WebCore:Testing though provides interfaces for it.
        
        Test: fast/dom/Window/window-layout-test-controller-webcore.html

        * CMakeLists.txt:
        * Configurations/WebCore.xcconfig:
        * Configurations/WebCoreTesting.xcconfig: Added.
        * DerivedSources.cpp:
        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.exp.in:
        * WebCore.gypi:
        * WebCore.pri:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreTesting-Info.plist: Added.
        * WebCoreTesting.exp: Added.
        * bindings/js/JSDOMWindowShell.cpp:
        * bindings/js/ScriptController.h:
        * page/DOMWindow.cpp:
        (WebCore::DOMWindow::clear):
        (WebCore::DOMWindow::layoutTestController):
        (WebCore::DOMWindow::setLayoutTestController):
        * page/DOMWindow.h:
        * page/LayoutTestController.cpp: Added.
        (WebCore::LayoutTestController::LayoutTestController):
        (WebCore::LayoutTestController::~LayoutTestController):
        * page/LayoutTestController.h: Added.
        * page/LayoutTestController.idl: Added.
        * testing/LayoutTestControllerImpl.cpp: Added.
        (WebCore::Testing::LayoutTestControllerImpl::frame):
        (WebCore::Testing::LayoutTestControllerImpl::disconnectFrame):
        (WebCore::Testing::LayoutTestControllerImpl::documentMarkerSizeForNode):
        (WebCore::Testing::LayoutTestControllerImpl::documentMarkerStringForNodeAt):
        (WebCore::Testing::LayoutTestControllerImpl::LayoutTestControllerImpl):
        (WebCore::Testing::LayoutTestControllerImpl::verifyConnected):
        * testing/LayoutTestControllerImpl.h: Added.
        (WebCore::Testing::LayoutTestControllerImpl::create):
        * testing/WebCoreTesting.cpp: Added.
        (WebCore::Testing::createLayoutTestControllerFor):
        (WebCore::Testing::createJSLayoutTestControllerFor):
        * testing/WebCoreTesting.h: Added.

2010-08-11  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

Lines 43-49 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR); a/WebCore/Configurations/WebCore.xcconfig_sec1
- a/WebCore/Configurations/WebCore.xcconfig -1 / +3 lines
43	FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));	43	FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
44	FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);	44	FRAMEWORK_SEARCH_PATHS_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS);
45		45
46	HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" $(HEADER_SEARCH_PATHS);	46	WEBCORE_HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" $(HEADER_SEARCH_PATHS);
		47	HEADER_SEARCH_PATHS = $(WEBCORE_HEADER_SEARCH_PATHS)
		48
47	INFOPLIST_FILE = Info.plist;	49	INFOPLIST_FILE = Info.plist;
48	INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));	50	INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
49	INSTALL_PATH_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;	51	INSTALL_PATH_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;



// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
// 1. Redistributions of source code must retain the above copyright
//    notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
//    notice, this list of conditions and the following disclaimer in the
//    documentation and/or other materials provided with the distribution.
//
// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

#include "WebCore.xcconfig"

EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
EXPORTED_SYMBOLS_FILE_armv5 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
EXPORTED_SYMBOLS_FILE_i386 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
EXPORTED_SYMBOLS_FILE_ppc = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;

HEADER_SEARCH_PATHS = $(WEBCORE_HEADER_SEARCH_PATHS) $(CONFIGURATION_TEMP_DIR)/WebCore.build/WebCore.hmap

PRODUCT_NAME = WebCoreTesting;


Lines 195-200 a/WebCore/DerivedSources.cpp_sec1
- a/WebCore/DerivedSources.cpp +1 lines
195	#include "JSInspectorFrontendHost.cpp"	195	#include "JSInspectorFrontendHost.cpp"
196	#include "JSJavaScriptCallFrame.cpp"	196	#include "JSJavaScriptCallFrame.cpp"
197	#include "JSKeyboardEvent.cpp"	197	#include "JSKeyboardEvent.cpp"
		198	#include "JSLayoutTestController.cpp"
198	#include "JSLocation.cpp"	199	#include "JSLocation.cpp"
199	#include "JSMediaError.cpp"	200	#include "JSMediaError.cpp"
200	#include "JSMediaList.cpp"	201	#include "JSMediaList.cpp"

Lines 246-251 DOM_CLASSES = \ a/WebCore/DerivedSources.make_sec1
- a/WebCore/DerivedSources.make -1 / +5 lines
246	InspectorFrontendHost \	246	InspectorFrontendHost \
247	KeyboardEvent \	247	KeyboardEvent \
248	Location \	248	Location \
		249	LayoutTestController \
249	MediaError \	250	MediaError \
250	MediaList \	251	MediaList \
251	MemoryInfo \	252	MemoryInfo \
Lines 852-858 CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/char a/WebCore/DerivedSources.make_sec2
852		853
853	ifneq ($(ACTION),installhdrs)	854	ifneq ($(ACTION),installhdrs)
854		855
855	all : WebCore.exp WebCore.LP64.exp	856	all : WebCore.exp WebCore.LP64.exp WebCoreTesting.LP64.exp
856		857
857	WebCore.exp : $(BUILT_PRODUCTS_DIR)/WebCoreExportFileGenerator	858	WebCore.exp : $(BUILT_PRODUCTS_DIR)/WebCoreExportFileGenerator
858	$^ > $@	859	$^ > $@
Lines 861-866 WebCore.exp : $(BUILT_PRODUCTS_DIR)/WebCoreExportFileGenerator a/WebCore/DerivedSources.make_sec3
861	WebCore.LP64.exp : WebCore.exp	862	WebCore.LP64.exp : WebCore.exp
862	cat $^ \| sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ > $@	863	cat $^ \| sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ > $@
863		864
		865	WebCoreTesting.LP64.exp : WebCoreTesting.exp
		866	cat $^ \| sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ > $@
		867
864	endif # installhdrs	868	endif # installhdrs
865		869
866	# --------	870	# --------

Lines 406-411 webcore_built_sources += \ a/WebCore/GNUmakefile.am_sec1
- a/WebCore/GNUmakefile.am +4 lines
406	DerivedSources/WebCore/JSJavaScriptCallFrame.h \	406	DerivedSources/WebCore/JSJavaScriptCallFrame.h \
407	DerivedSources/WebCore/JSKeyboardEvent.cpp \	407	DerivedSources/WebCore/JSKeyboardEvent.cpp \
408	DerivedSources/WebCore/JSKeyboardEvent.h \	408	DerivedSources/WebCore/JSKeyboardEvent.h \
		409	DerivedSources/WebCore/JSLayoutTestController.cpp \
		410	DerivedSources/WebCore/JSLayoutTestController.h \
409	DerivedSources/WebCore/JSLocation.cpp \	411	DerivedSources/WebCore/JSLocation.cpp \
410	DerivedSources/WebCore/JSLocation.h \	412	DerivedSources/WebCore/JSLocation.h \
411	DerivedSources/WebCore/JSMediaError.cpp \	413	DerivedSources/WebCore/JSMediaError.cpp \
Lines 1801-1806 webcore_sources += \ a/WebCore/GNUmakefile.am_sec2
1801	WebCore/page/HaltablePlugin.h \	1803	WebCore/page/HaltablePlugin.h \
1802	WebCore/page/History.cpp \	1804	WebCore/page/History.cpp \
1803	WebCore/page/History.h \	1805	WebCore/page/History.h \
		1806	WebCore/page/LayoutTestController.cpp \
		1807	WebCore/page/LayoutTestController.h \
1804	WebCore/page/Location.cpp \	1808	WebCore/page/Location.cpp \
1805	WebCore/page/Location.h \	1809	WebCore/page/Location.h \
1806	WebCore/page/MediaCanStartListener.h \	1810	WebCore/page/MediaCanStartListener.h \

Lines 1484-1486 __ZN7WebCore23ApplicationCacheStorage36remainingSizeForOriginExcludingCacheEPKNS a/WebCore/WebCore.exp.in_sec1
- a/WebCore/WebCore.exp.in +5 lines
1484	__ZN7WebCore23ApplicationCacheStorage5emptyEv	1484	__ZN7WebCore23ApplicationCacheStorage5emptyEv
1485	__ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv	1485	__ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
1486	#endif	1486	#endif
		1487
		1488	__ZN7WebCore20LayoutTestControllerD2Ev
		1489	__ZN7WebCore20LayoutTestControllerC2Ev
		1490	__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_20LayoutTestControllerE
		1491	__ZN7WebCore9DOMWindow23setLayoutTestControllerEPNS_20LayoutTestControllerE

Lines 215-220 a/WebCore/WebCore.gypi_sec1
- a/WebCore/WebCore.gypi +3 lines
215	'page/Geoposition.idl',	215	'page/Geoposition.idl',
216	'page/History.idl',	216	'page/History.idl',
217	'page/Location.idl',	217	'page/Location.idl',
		218	'page/LayoutTestController.idl',
218	'page/MemoryInfo.idl',	219	'page/MemoryInfo.idl',
219	'page/Navigation.idl',	220	'page/Navigation.idl',
220	'page/Navigator.idl',	221	'page/Navigator.idl',
Lines 2021-2026 a/WebCore/WebCore.gypi_sec2
2021	'page/History.h',	2022	'page/History.h',
2022	'page/Location.cpp',	2023	'page/Location.cpp',
2023	'page/Location.h',	2024	'page/Location.h',
		2025	'page/LayoutTestController.cpp',
		2026	'page/LayoutTestController.h',
2024	'page/MemoryInfo.cpp',	2027	'page/MemoryInfo.cpp',
2025	'page/MemoryInfo.h',	2028	'page/MemoryInfo.h',
2026	'page/MouseEventWithHitTestResults.cpp',	2029	'page/MouseEventWithHitTestResults.cpp',

Lines 274-279 IDL_BINDINGS += \ a/WebCore/WebCore.pri_sec1
- a/WebCore/WebCore.pri +1 lines
274	page/Geolocation.idl \	274	page/Geolocation.idl \
275	page/Geoposition.idl \	275	page/Geoposition.idl \
276	page/History.idl \	276	page/History.idl \
		277	page/LayoutTestController.idl \
277	page/Location.idl \	278	page/Location.idl \
278	page/MemoryInfo.idl \	279	page/MemoryInfo.idl \
279	page/Navigation.idl \	280	page/Navigation.idl \



    page/GeolocationController.cpp \
    page/GeolocationPositionCache.cpp \
    page/History.cpp \
    page/LayoutTestController.cpp \
    page/Location.cpp \
    page/MemoryInfo.cpp \
    page/MouseEventWithHitTestResults.cpp \

    page/Geoposition.h \
    page/HaltablePlugin.h \
    page/History.h \
    page/LayoutTestController.h \
    page/Location.h \
    page/MouseEventWithHitTestResults.h \
    page/NavigatorBase.h \



				>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug_Internal|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug_Cairo|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release_Cairo|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug_All|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.h"
				>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.cpp"
				>
				<FileConfiguration

				>
			</File>
			<File
				RelativePath="..\page\LayoutTestController.cpp"
				>
			</File>
			<File
				RelativePath="..\page\LayoutTestController.h"
				>
			</File>
			<File
				RelativePath="..\page\MouseEventWithHitTestResults.cpp"
				>
			</File>

Lines 18-23 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/WebCore/WebCore.xcodeproj/project.pbxproj +209 lines
18	name = "WebCoreExportFileGenerator Generator";	18	name = "WebCoreExportFileGenerator Generator";
19	productName = "WebCoreExportFileGenerator Generator";	19	productName = "WebCoreExportFileGenerator Generator";
20	};	20	};
		21	A764F30E1207C7F2008D05B5 /* WebCoreAndWebCoreTesting */ = {
		22	isa = PBXAggregateTarget;
		23	buildConfigurationList = A764F3161207C833008D05B5 /* Build configuration list for PBXAggregateTarget "WebCoreAndWebCoreTesting" */;
		24	buildPhases = (
		25	);
		26	dependencies = (
		27	A764F3131207C7F8008D05B5 /* PBXTargetDependency */,
		28	A7A24D8B1207F67000BEC9ED /* PBXTargetDependency */,
		29	);
		30	name = WebCoreAndWebCoreTesting;
		31	productName = WebCoreAndWebCoreTesting;
		32	};
21	DD041FBE09D9DDBE0010AF2A /* Derived Sources */ = {	33	DD041FBE09D9DDBE0010AF2A /* Derived Sources */ = {
22	isa = PBXAggregateTarget;	34	isa = PBXAggregateTarget;
23	buildConfigurationList = DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */;	35	buildConfigurationList = DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
Lines 2736-2741 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
2736	A71878900B2D04AC00A16ECE /* DragControllerMac.mm in Sources / = {isa = PBXBuildFile; fileRef = A718788F0B2D04AC00A16ECE / DragControllerMac.mm */; };	2748	A71878900B2D04AC00A16ECE /* DragControllerMac.mm in Sources / = {isa = PBXBuildFile; fileRef = A718788F0B2D04AC00A16ECE / DragControllerMac.mm */; };
2737	A7352C190B1BB89D00A986D0 /* RenderSVGBlock.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7352C170B1BB89D00A986D0 / RenderSVGBlock.cpp */; };	2749	A7352C190B1BB89D00A986D0 /* RenderSVGBlock.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7352C170B1BB89D00A986D0 / RenderSVGBlock.cpp */; };
2738	A7352C1A0B1BB89D00A986D0 /* RenderSVGBlock.h in Headers / = {isa = PBXBuildFile; fileRef = A7352C180B1BB89D00A986D0 / RenderSVGBlock.h */; };	2750	A7352C1A0B1BB89D00A986D0 /* RenderSVGBlock.h in Headers / = {isa = PBXBuildFile; fileRef = A7352C180B1BB89D00A986D0 / RenderSVGBlock.h */; };
		2751	A745D2E611F5B37900ACD023 /* LayoutTestController.cpp in Sources / = {isa = PBXBuildFile; fileRef = A745D2E311F5B37900ACD023 / LayoutTestController.cpp */; };
		2752	A745D2E711F5B37900ACD023 /* LayoutTestController.h in Headers / = {isa = PBXBuildFile; fileRef = A745D2E411F5B37900ACD023 / LayoutTestController.h */; };
		2753	A747FDE01207F8B300FA14BC /* LayoutTestControllerImpl.h in Headers / = {isa = PBXBuildFile; fileRef = A7CD317A1207A6AC004B4B4A / LayoutTestControllerImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
2739	A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers / = {isa = PBXBuildFile; fileRef = A75E497410752ACB00C9B896 / SerializedScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };	2754	A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers / = {isa = PBXBuildFile; fileRef = A75E497410752ACB00C9B896 / SerializedScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
2740	A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E497510752ACB00C9B896 / SerializedScriptValue.cpp */; };	2755	A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E497510752ACB00C9B896 / SerializedScriptValue.cpp */; };
2741	A75E8B880E1DE2D6007F2481 /* FEBlend.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E8B800E1DE2D6007F2481 / FEBlend.cpp */; };	2756	A75E8B880E1DE2D6007F2481 /* FEBlend.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E8B800E1DE2D6007F2481 / FEBlend.cpp */; };
Lines 2746-2751 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
2746	A75E8B8D0E1DE2D6007F2481 /* FEComponentTransfer.h in Headers / = {isa = PBXBuildFile; fileRef = A75E8B850E1DE2D6007F2481 / FEComponentTransfer.h */; };	2761	A75E8B8D0E1DE2D6007F2481 /* FEComponentTransfer.h in Headers / = {isa = PBXBuildFile; fileRef = A75E8B850E1DE2D6007F2481 / FEComponentTransfer.h */; };
2747	A75E8B8E0E1DE2D6007F2481 /* FEComposite.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E8B860E1DE2D6007F2481 / FEComposite.cpp */; };	2762	A75E8B8E0E1DE2D6007F2481 /* FEComposite.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75E8B860E1DE2D6007F2481 / FEComposite.cpp */; };
2748	A75E8B8F0E1DE2D6007F2481 /* FEComposite.h in Headers / = {isa = PBXBuildFile; fileRef = A75E8B870E1DE2D6007F2481 / FEComposite.h */; };	2763	A75E8B8F0E1DE2D6007F2481 /* FEComposite.h in Headers / = {isa = PBXBuildFile; fileRef = A75E8B870E1DE2D6007F2481 / FEComposite.h */; };
		2764	A75FCB901207F64A0019E22D /* WebCore.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC / WebCore.framework */; };
		2765	A77558E311F5B60200B43AC1 /* JSLayoutTestController.cpp in Sources / = {isa = PBXBuildFile; fileRef = A77558E111F5B60200B43AC1 / JSLayoutTestController.cpp */; };
		2766	A77558E411F5B60200B43AC1 /* JSLayoutTestController.h in Headers / = {isa = PBXBuildFile; fileRef = A77558E211F5B60200B43AC1 / JSLayoutTestController.h */; };
2749	A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A77979130D6B9D0C003851B9 / ImageData.cpp */; };	2767	A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A77979130D6B9D0C003851B9 / ImageData.cpp */; };
2750	A779791A0D6B9D0C003851B9 /* ImageData.h in Headers / = {isa = PBXBuildFile; fileRef = A77979140D6B9D0C003851B9 / ImageData.h */; };	2768	A779791A0D6B9D0C003851B9 /* ImageData.h in Headers / = {isa = PBXBuildFile; fileRef = A77979140D6B9D0C003851B9 / ImageData.h */; };
2751	A77979280D6B9E64003851B9 /* JSImageData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A77979240D6B9E64003851B9 / JSImageData.cpp */; };	2769	A77979280D6B9E64003851B9 /* JSImageData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A77979240D6B9E64003851B9 / JSImageData.cpp */; };
Lines 2753-2758 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
2753	A784941B0B5FE507001E237A /* Clipboard.cpp in Sources / = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A / Clipboard.cpp */; };	2771	A784941B0B5FE507001E237A /* Clipboard.cpp in Sources / = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A / Clipboard.cpp */; };
2754	A795463E0B5C4C80007B438F /* DragDataMac.mm in Sources / = {isa = PBXBuildFile; fileRef = A795463D0B5C4C80007B438F / DragDataMac.mm */; };	2772	A795463E0B5C4C80007B438F /* DragDataMac.mm in Sources / = {isa = PBXBuildFile; fileRef = A795463D0B5C4C80007B438F / DragDataMac.mm */; };
2755	A79546430B5C4CB4007B438F /* DragData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A79546420B5C4CB4007B438F / DragData.cpp */; };	2773	A79546430B5C4CB4007B438F /* DragData.cpp in Sources / = {isa = PBXBuildFile; fileRef = A79546420B5C4CB4007B438F / DragData.cpp */; };
		2774	A79FAE6A12081FEB001203FE /* WebCoreTesting.cpp in Sources / = {isa = PBXBuildFile; fileRef = A75644C912081FA400804FDB / WebCoreTesting.cpp */; };
		2775	A79FAE6C12081FFA001203FE /* WebCoreTesting.h in Headers / = {isa = PBXBuildFile; fileRef = A75644CA12081FAC00804FDB / WebCoreTesting.h */; settings = {ATTRIBUTES = (Public, ); }; };
		2776	A79FAE6D12082001001203FE /* LayoutTestControllerImpl.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7CD31791207A6AC004B4B4A / LayoutTestControllerImpl.cpp */; };
2756	A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7AA66D411C5ED6A001D8C8C / RenderIndicator.cpp */; };	2777	A7AA66D611C5ED6A001D8C8C /* RenderIndicator.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7AA66D411C5ED6A001D8C8C / RenderIndicator.cpp */; };
2757	A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers / = {isa = PBXBuildFile; fileRef = A7AA66D511C5ED6A001D8C8C / RenderIndicator.h */; };	2778	A7AA66D711C5ED6A001D8C8C /* RenderIndicator.h in Headers / = {isa = PBXBuildFile; fileRef = A7AA66D511C5ED6A001D8C8C / RenderIndicator.h */; };
2758	A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7AD2F850EC89D07008AB002 / LinkHash.cpp */; };	2779	A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources / = {isa = PBXBuildFile; fileRef = A7AD2F850EC89D07008AB002 / LinkHash.cpp */; };
Lines 5317-5322 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec5
5317	remoteGlobalIDString = 5D87BB4E11E3EAEB00702B6F;	5338	remoteGlobalIDString = 5D87BB4E11E3EAEB00702B6F;
5318	remoteInfo = WebCoreExportFileGenerator;	5339	remoteInfo = WebCoreExportFileGenerator;
5319	};	5340	};
		5341	A764F3121207C7F8008D05B5 /* PBXContainerItemProxy */ = {
		5342	isa = PBXContainerItemProxy;
		5343	containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
		5344	proxyType = 1;
		5345	remoteGlobalIDString = 93F198A508245E59001E9ABC;
		5346	remoteInfo = WebCore;
		5347	};
		5348	A7A24D8A1207F67000BEC9ED /* PBXContainerItemProxy */ = {
		5349	isa = PBXContainerItemProxy;
		5350	containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
		5351	proxyType = 1;
		5352	remoteGlobalIDString = A75FCB891207F63B0019E22D;
		5353	remoteInfo = WebCoreTesting;
		5354	};
5320	DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {	5355	DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
5321	isa = PBXContainerItemProxy;	5356	isa = PBXContainerItemProxy;
5322	containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;	5357	containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
Lines 8546-8551 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec6
8546	A71A70C911AFB02000989D6D /* HTMLMeterElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMeterElement.idl; sourceTree = "<group>"; };	8581	A71A70C911AFB02000989D6D /* HTMLMeterElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMeterElement.idl; sourceTree = "<group>"; };
8547	A7352C170B1BB89D00A986D0 /* RenderSVGBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGBlock.cpp; sourceTree = "<group>"; };	8582	A7352C170B1BB89D00A986D0 /* RenderSVGBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGBlock.cpp; sourceTree = "<group>"; };
8548	A7352C180B1BB89D00A986D0 /* RenderSVGBlock.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGBlock.h; sourceTree = "<group>"; };	8583	A7352C180B1BB89D00A986D0 /* RenderSVGBlock.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGBlock.h; sourceTree = "<group>"; };
		8584	A7421C1B1207AE0600D93779 /* WebCoreTesting.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebCoreTesting.xcconfig; sourceTree = "<group>"; };
		8585	A745D2E311F5B37900ACD023 /* LayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutTestController.cpp; sourceTree = "<group>"; };
		8586	A745D2E411F5B37900ACD023 /* LayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTestController.h; sourceTree = "<group>"; };
		8587	A745D2E511F5B37900ACD023 /* LayoutTestController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LayoutTestController.idl; sourceTree = "<group>"; };
		8588	A75644C912081FA400804FDB /* WebCoreTesting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebCoreTesting.cpp; path = testing/WebCoreTesting.cpp; sourceTree = "<group>"; };
		8589	A75644CA12081FAC00804FDB /* WebCoreTesting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTesting.h; path = testing/WebCoreTesting.h; sourceTree = "<group>"; };
8549	A75E497410752ACB00C9B896 /* SerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedScriptValue.h; sourceTree = "<group>"; };	8590	A75E497410752ACB00C9B896 /* SerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedScriptValue.h; sourceTree = "<group>"; };
8550	A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SerializedScriptValue.cpp; sourceTree = "<group>"; };	8591	A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SerializedScriptValue.cpp; sourceTree = "<group>"; };
8551	A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEBlend.cpp; path = filters/FEBlend.cpp; sourceTree = "<group>"; };	8592	A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEBlend.cpp; path = filters/FEBlend.cpp; sourceTree = "<group>"; };
Lines 8556-8561 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec7
8556	A75E8B850E1DE2D6007F2481 /* FEComponentTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEComponentTransfer.h; path = filters/FEComponentTransfer.h; sourceTree = "<group>"; };	8597	A75E8B850E1DE2D6007F2481 /* FEComponentTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEComponentTransfer.h; path = filters/FEComponentTransfer.h; sourceTree = "<group>"; };
8557	A75E8B860E1DE2D6007F2481 /* FEComposite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEComposite.cpp; path = filters/FEComposite.cpp; sourceTree = "<group>"; };	8598	A75E8B860E1DE2D6007F2481 /* FEComposite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEComposite.cpp; path = filters/FEComposite.cpp; sourceTree = "<group>"; };
8558	A75E8B870E1DE2D6007F2481 /* FEComposite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEComposite.h; path = filters/FEComposite.h; sourceTree = "<group>"; };	8599	A75E8B870E1DE2D6007F2481 /* FEComposite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEComposite.h; path = filters/FEComposite.h; sourceTree = "<group>"; };
		8600	A75FCB8A1207F63B0019E22D /* WebCoreTesting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebCoreTesting.framework; sourceTree = BUILT_PRODUCTS_DIR; };
		8601	A75FCB8B1207F63B0019E22D /* WebCoreTesting-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebCoreTesting-Info.plist"; sourceTree = "<group>"; };
		8602	A77558E111F5B60200B43AC1 /* JSLayoutTestController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSLayoutTestController.cpp; sourceTree = "<group>"; };
		8603	A77558E211F5B60200B43AC1 /* JSLayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSLayoutTestController.h; sourceTree = "<group>"; };
8559	A77979130D6B9D0C003851B9 /* ImageData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageData.cpp; sourceTree = "<group>"; };	8604	A77979130D6B9D0C003851B9 /* ImageData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageData.cpp; sourceTree = "<group>"; };
8560	A77979140D6B9D0C003851B9 /* ImageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageData.h; sourceTree = "<group>"; };	8605	A77979140D6B9D0C003851B9 /* ImageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageData.h; sourceTree = "<group>"; };
8561	A77979150D6B9D0C003851B9 /* ImageData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ImageData.idl; sourceTree = "<group>"; };	8606	A77979150D6B9D0C003851B9 /* ImageData.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ImageData.idl; sourceTree = "<group>"; };
Lines 8574-8579 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec8
8574	A7CA595B0B27BD9E00FA021D /* DragController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragController.h; sourceTree = "<group>"; };	8619	A7CA595B0B27BD9E00FA021D /* DragController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragController.h; sourceTree = "<group>"; };
8575	A7CA595C0B27BD9E00FA021D /* DragController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragController.cpp; sourceTree = "<group>"; };	8620	A7CA595C0B27BD9E00FA021D /* DragController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragController.cpp; sourceTree = "<group>"; };
8576	A7CA59620B27C1F200FA021D /* DragClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragClient.h; sourceTree = "<group>"; };	8621	A7CA59620B27C1F200FA021D /* DragClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragClient.h; sourceTree = "<group>"; };
		8622	A7CD31791207A6AC004B4B4A /* LayoutTestControllerImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayoutTestControllerImpl.cpp; path = testing/LayoutTestControllerImpl.cpp; sourceTree = "<group>"; };
		8623	A7CD317A1207A6AC004B4B4A /* LayoutTestControllerImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayoutTestControllerImpl.h; path = testing/LayoutTestControllerImpl.h; sourceTree = "<group>"; };
8577	A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DragImage.cpp; sourceTree = "<group>"; };	8624	A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DragImage.cpp; sourceTree = "<group>"; };
8578	A7CFB3D00B7ED10A0070C32D /* DragImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragImage.h; sourceTree = "<group>"; };	8625	A7CFB3D00B7ED10A0070C32D /* DragImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragImage.h; sourceTree = "<group>"; };
8579	A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageMac.mm; sourceTree = "<group>"; };	8626	A7CFB3D40B7ED1180070C32D /* DragImageMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageMac.mm; sourceTree = "<group>"; };
Lines 11147-11152 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec9
11147	);	11194	);
11148	runOnlyForDeploymentPostprocessing = 0;	11195	runOnlyForDeploymentPostprocessing = 0;
11149	};	11196	};
		11197	A75FCB881207F63B0019E22D /* Frameworks */ = {
		11198	isa = PBXFrameworksBuildPhase;
		11199	buildActionMask = 2147483647;
		11200	files = (
		11201	A75FCB901207F64A0019E22D /* WebCore.framework in Frameworks */,
		11202	93F19B1608245E59001E9ABC /* JavaScriptCore.framework in Frameworks */,
		11203	);
		11204	runOnlyForDeploymentPostprocessing = 0;
		11205	};
11150	/* End PBXFrameworksBuildPhase section */	11206	/* End PBXFrameworksBuildPhase section */
11151		11207
11152	/* Begin PBXGroup section */	11208	/* Begin PBXGroup section */
Lines 11155-11160 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec10
11155	children = (	11211	children = (
11156	5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,	11212	5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
11157	93F19B1A08245E5A001E9ABC /* WebCore.framework */,	11213	93F19B1A08245E5A001E9ABC /* WebCore.framework */,
		11214	A75FCB8A1207F63B0019E22D /* WebCoreTesting.framework */,
11158	);	11215	);
11159	name = Products;	11216	name = Products;
11160	sourceTree = SOURCE_ROOT;	11217	sourceTree = SOURCE_ROOT;
Lines 11186-11191 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec11
11186	F523D2F302DE443B018635CA /* rendering */,	11243	F523D2F302DE443B018635CA /* rendering */,
11187	1AE82EC90CAAE177002237AE /* storage */,	11244	1AE82EC90CAAE177002237AE /* storage */,
11188	B22277CA0D00BF1E0071B782 /* svg */,	11245	B22277CA0D00BF1E0071B782 /* svg */,
		11246	A7CD303E1207A07D004B4B4A /* testing */,
11189	518A34BD1026C831001B6896 /* websockets */,	11247	518A34BD1026C831001B6896 /* websockets */,
11190	4C6B99150E52E37300487BB7 /* wml */,	11248	4C6B99150E52E37300487BB7 /* wml */,
11191	2E4346310F546A6800B0F1BA /* workers */,	11249	2E4346310F546A6800B0F1BA /* workers */,
Lines 11196-11201 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec12
11196	034768DFFF38A50411DB9C8B /* Products */,	11254	034768DFFF38A50411DB9C8B /* Products */,
11197	1CDD44660BA9C80000F90147 /* Configurations */,	11255	1CDD44660BA9C80000F90147 /* Configurations */,
11198	449195900FBE175B00D9F824 /* Exports */,	11256	449195900FBE175B00D9F824 /* Exports */,
		11257	A75FCB8B1207F63B0019E22D /* WebCoreTesting-Info.plist */,
11199	);	11258	);
11200	name = WebKit;	11259	name = WebKit;
11201	sourceTree = "<group>";	11260	sourceTree = "<group>";
Lines 11693-11698 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec13
11693	1CDD44660BA9C80000F90147 /* Configurations */ = {	11752	1CDD44660BA9C80000F90147 /* Configurations */ = {
11694	isa = PBXGroup;	11753	isa = PBXGroup;
11695	children = (	11754	children = (
		11755	A7421C1B1207AE0600D93779 /* WebCoreTesting.xcconfig */,
11696	1CDD45E60BA9C84600F90147 /* Base.xcconfig */,	11756	1CDD45E60BA9C84600F90147 /* Base.xcconfig */,
11697	1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */,	11757	1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */,
11698	449098B10F8F82520076A327 /* FeatureDefines.xcconfig */,	11758	449098B10F8F82520076A327 /* FeatureDefines.xcconfig */,
Lines 12458-12463 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec14
12458	65BF02180974806300C43196 /* page */ = {	12518	65BF02180974806300C43196 /* page */ = {
12459	isa = PBXGroup;	12519	isa = PBXGroup;
12460	children = (	12520	children = (
		12521	A745D2E311F5B37900ACD023 /* LayoutTestController.cpp */,
		12522	A745D2E411F5B37900ACD023 /* LayoutTestController.h */,
		12523	A745D2E511F5B37900ACD023 /* LayoutTestController.idl */,
12461	316FE1060E6E1D8400BF6088 /* animation */,	12524	316FE1060E6E1D8400BF6088 /* animation */,
12462	93C09A820B064F05005ABD4D /* mac */,	12525	93C09A820B064F05005ABD4D /* mac */,
12463	8538F0000AD71770006A81D1 /* AbstractView.idl */,	12526	8538F0000AD71770006A81D1 /* AbstractView.idl */,
Lines 14240-14245 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec15
14240	name = filters;	14303	name = filters;
14241	sourceTree = "<group>";	14304	sourceTree = "<group>";
14242	};	14305	};
		14306	A7CD303E1207A07D004B4B4A /* testing */ = {
		14307	isa = PBXGroup;
		14308	children = (
		14309	A75644C912081FA400804FDB /* WebCoreTesting.cpp */,
		14310	A75644CA12081FAC00804FDB /* WebCoreTesting.h */,
		14311	A7CD31791207A6AC004B4B4A /* LayoutTestControllerImpl.cpp */,
		14312	A7CD317A1207A6AC004B4B4A /* LayoutTestControllerImpl.h */,
		14313	);
		14314	name = testing;
		14315	sourceTree = "<group>";
		14316	};
14243	A83B79080CCAFF2B000B0825 /* HTML */ = {	14317	A83B79080CCAFF2B000B0825 /* HTML */ = {
14244	isa = PBXGroup;	14318	isa = PBXGroup;
14245	children = (	14319	children = (
Lines 16187-16192 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec16
16187	BC9854430CD3D9D000069BC1 /* Window */ = {	16261	BC9854430CD3D9D000069BC1 /* Window */ = {
16188	isa = PBXGroup;	16262	isa = PBXGroup;
16189	children = (	16263	children = (
		16264	A77558E111F5B60200B43AC1 /* JSLayoutTestController.cpp */,
		16265	A77558E211F5B60200B43AC1 /* JSLayoutTestController.h */,
16190	BC124EFD0C26447A009E2349 /* JSBarInfo.cpp */,	16266	BC124EFD0C26447A009E2349 /* JSBarInfo.cpp */,
16191	BC124EFE0C26447A009E2349 /* JSBarInfo.h */,	16267	BC124EFE0C26447A009E2349 /* JSBarInfo.h */,
16192	BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */,	16268	BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */,
Lines 19010-19015 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec17
19010	49C7B9961042D2D30009D447 /* JSInt8Array.h in Headers */,	19086	49C7B9961042D2D30009D447 /* JSInt8Array.h in Headers */,
19011	1C5FAED20DCFD90100D58F78 /* JSJavaScriptCallFrame.h in Headers */,	19087	1C5FAED20DCFD90100D58F78 /* JSJavaScriptCallFrame.h in Headers */,
19012	A86629D309DA2B48009633A5 /* JSKeyboardEvent.h in Headers */,	19088	A86629D309DA2B48009633A5 /* JSKeyboardEvent.h in Headers */,
		19089	A77558E411F5B60200B43AC1 /* JSLayoutTestController.h in Headers */,
19013	935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */,	19090	935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */,
19014	BCE1C43C0D9830D3003B02F2 /* JSLocation.h in Headers */,	19091	BCE1C43C0D9830D3003B02F2 /* JSLocation.h in Headers */,
19015	E44614190CD6826900FADA75 /* JSMediaError.h in Headers */,	19092	E44614190CD6826900FADA75 /* JSMediaError.h in Headers */,
Lines 19262-19267 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec18
19262	A456FA2711AD4A830020B420 /* LabelsNodeList.h in Headers */,	19339	A456FA2711AD4A830020B420 /* LabelsNodeList.h in Headers */,
19263	85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,	19340	85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
19264	2D9066070BE141D400956998 /* LayoutState.h in Headers */,	19341	2D9066070BE141D400956998 /* LayoutState.h in Headers */,
		19342	A745D2E711F5B37900ACD023 /* LayoutTestController.h in Headers */,
		19343	93F198F008245E59001E9ABC /* LegacyHTMLDocumentParser.h in Headers */,
19265	93F198EF08245E59001E9ABC /* LegacyHTMLTreeBuilder.h in Headers */,	19344	93F198EF08245E59001E9ABC /* LegacyHTMLTreeBuilder.h in Headers */,
19266	512DD8F50D91E6AF000F89EE /* LegacyWebArchive.h in Headers */,	19345	512DD8F50D91E6AF000F89EE /* LegacyWebArchive.h in Headers */,
19267	BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,	19346	BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
Lines 20145-20150 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec19
20145	);	20224	);
20146	runOnlyForDeploymentPostprocessing = 0;	20225	runOnlyForDeploymentPostprocessing = 0;
20147	};	20226	};
		20227	A75FCB851207F63B0019E22D /* Headers */ = {
		20228	isa = PBXHeadersBuildPhase;
		20229	buildActionMask = 2147483647;
		20230	files = (
		20231	A747FDE01207F8B300FA14BC /* LayoutTestControllerImpl.h in Headers */,
		20232	A79FAE6C12081FFA001203FE /* WebCoreTesting.h in Headers */,
		20233	);
		20234	runOnlyForDeploymentPostprocessing = 0;
		20235	};
20148	/* End PBXHeadersBuildPhase section */	20236	/* End PBXHeadersBuildPhase section */
20149		20237
20150	/* Begin PBXNativeTarget section */	20238	/* Begin PBXNativeTarget section */
Lines 20194-20199 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec20
20194	productReference = 93F19B1A08245E5A001E9ABC /* WebCore.framework */;	20282	productReference = 93F19B1A08245E5A001E9ABC /* WebCore.framework */;
20195	productType = "com.apple.product-type.framework";	20283	productType = "com.apple.product-type.framework";
20196	};	20284	};
		20285	A75FCB891207F63B0019E22D /* WebCoreTesting */ = {
		20286	isa = PBXNativeTarget;
		20287	buildConfigurationList = A75FCB8F1207F63C0019E22D /* Build configuration list for PBXNativeTarget "WebCoreTesting" */;
		20288	buildPhases = (
		20289	A75FCB851207F63B0019E22D /* Headers */,
		20290	A75FCB861207F63B0019E22D /* Resources */,
		20291	A75FCB871207F63B0019E22D /* Sources */,
		20292	A75FCB881207F63B0019E22D /* Frameworks */,
		20293	);
		20294	buildRules = (
		20295	);
		20296	dependencies = (
		20297	);
		20298	name = WebCoreTesting;
		20299	productName = WebCoreTesting;
		20300	productReference = A75FCB8A1207F63B0019E22D /* WebCoreTesting.framework */;
		20301	productType = "com.apple.product-type.framework";
		20302	};
20197	/* End PBXNativeTarget section */	20303	/* End PBXNativeTarget section */
20198		20304
20199	/* Begin PBXProject section */	20305	/* Begin PBXProject section */
Lines 20216-20225 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec21
20216	projectDirPath = "";	20322	projectDirPath = "";
20217	projectRoot = "";	20323	projectRoot = "";
20218	targets = (	20324	targets = (
		20325	A764F30E1207C7F2008D05B5 /* WebCoreAndWebCoreTesting */,
20219	93F198A508245E59001E9ABC /* WebCore */,	20326	93F198A508245E59001E9ABC /* WebCore */,
20220	DD041FBE09D9DDBE0010AF2A /* Derived Sources */,	20327	DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
20221	5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */,	20328	5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
20222	5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */,	20329	5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */,
		20330	A75FCB891207F63B0019E22D /* WebCoreTesting */,
20223	);	20331	);
20224	};	20332	};
20225	/* End PBXProject section */	20333	/* End PBXProject section */
Lines 20266-20271 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec22
20266	);	20374	);
20267	runOnlyForDeploymentPostprocessing = 0;	20375	runOnlyForDeploymentPostprocessing = 0;
20268	};	20376	};
		20377	A75FCB861207F63B0019E22D /* Resources */ = {
		20378	isa = PBXResourcesBuildPhase;
		20379	buildActionMask = 2147483647;
		20380	files = (
		20381	);
		20382	runOnlyForDeploymentPostprocessing = 0;
		20383	};
20269	/* End PBXResourcesBuildPhase section */	20384	/* End PBXResourcesBuildPhase section */
20270		20385
20271	/* Begin PBXShellScriptBuildPhase section */	20386	/* Begin PBXShellScriptBuildPhase section */
Lines 21509-21514 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec23
21509	1C5FAED10DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp in Sources */,	21624	1C5FAED10DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp in Sources */,
21510	1C5FAEE70DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp in Sources */,	21625	1C5FAEE70DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp in Sources */,
21511	A86629D409DA2B48009633A5 /* JSKeyboardEvent.cpp in Sources */,	21626	A86629D409DA2B48009633A5 /* JSKeyboardEvent.cpp in Sources */,
		21627	A77558E311F5B60200B43AC1 /* JSLayoutTestController.cpp in Sources */,
21512	935F45420F7C3B5F00D7C1FB /* JSLazyEventListener.cpp in Sources */,	21628	935F45420F7C3B5F00D7C1FB /* JSLazyEventListener.cpp in Sources */,
21513	BCE1C43B0D9830D3003B02F2 /* JSLocation.cpp in Sources */,	21629	BCE1C43B0D9830D3003B02F2 /* JSLocation.cpp in Sources */,
21514	BCE1C4400D9830F4003B02F2 /* JSLocationCustom.cpp in Sources */,	21630	BCE1C4400D9830F4003B02F2 /* JSLocationCustom.cpp in Sources */,
Lines 21799-21804 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec24
21799	A456FA2611AD4A830020B420 /* LabelsNodeList.cpp in Sources */,	21915	A456FA2611AD4A830020B420 /* LabelsNodeList.cpp in Sources */,
21800	9352084509BD43B900F2038D /* Language.mm in Sources */,	21916	9352084509BD43B900F2038D /* Language.mm in Sources */,
21801	2D9066060BE141D400956998 /* LayoutState.cpp in Sources */,	21917	2D9066060BE141D400956998 /* LayoutState.cpp in Sources */,
		21918	A745D2E611F5B37900ACD023 /* LayoutTestController.cpp in Sources */,
		21919	93F19A9C08245E59001E9ABC /* LegacyHTMLDocumentParser.cpp in Sources */,
21802	93F19A9B08245E59001E9ABC /* LegacyHTMLTreeBuilder.cpp in Sources */,	21920	93F19A9B08245E59001E9ABC /* LegacyHTMLTreeBuilder.cpp in Sources */,
21803	512DD8F40D91E6AF000F89EE /* LegacyWebArchive.cpp in Sources */,	21921	512DD8F40D91E6AF000F89EE /* LegacyWebArchive.cpp in Sources */,
21804	51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */,	21922	51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */,
Lines 22569-22574 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec25
22569	);	22687	);
22570	runOnlyForDeploymentPostprocessing = 0;	22688	runOnlyForDeploymentPostprocessing = 0;
22571	};	22689	};
		22690	A75FCB871207F63B0019E22D /* Sources */ = {
		22691	isa = PBXSourcesBuildPhase;
		22692	buildActionMask = 2147483647;
		22693	files = (
		22694	A79FAE6A12081FEB001203FE /* WebCoreTesting.cpp in Sources */,
		22695	A79FAE6D12082001001203FE /* LayoutTestControllerImpl.cpp in Sources */,
		22696	);
		22697	runOnlyForDeploymentPostprocessing = 0;
		22698	};
22572	/* End PBXSourcesBuildPhase section */	22699	/* End PBXSourcesBuildPhase section */
22573		22700
22574	/* Begin PBXTargetDependency section */	22701	/* Begin PBXTargetDependency section */
Lines 22582-22587 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec26
22582	target = 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */;	22709	target = 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */;
22583	targetProxy = 5D87BB8E11E3EE2B00702B6F /* PBXContainerItemProxy */;	22710	targetProxy = 5D87BB8E11E3EE2B00702B6F /* PBXContainerItemProxy */;
22584	};	22711	};
		22712	A764F3131207C7F8008D05B5 /* PBXTargetDependency */ = {
		22713	isa = PBXTargetDependency;
		22714	target = 93F198A508245E59001E9ABC /* WebCore */;
		22715	targetProxy = A764F3121207C7F8008D05B5 /* PBXContainerItemProxy */;
		22716	};
		22717	A7A24D8B1207F67000BEC9ED /* PBXTargetDependency */ = {
		22718	isa = PBXTargetDependency;
		22719	target = A75FCB891207F63B0019E22D /* WebCoreTesting */;
		22720	targetProxy = A7A24D8A1207F67000BEC9ED /* PBXContainerItemProxy */;
		22721	};
22585	DD041FF109D9E3250010AF2A /* PBXTargetDependency */ = {	22722	DD041FF109D9E3250010AF2A /* PBXTargetDependency */ = {
22586	isa = PBXTargetDependency;	22723	isa = PBXTargetDependency;
22587	target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;	22724	target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;
Lines 22710-22715 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec27
22710	};	22847	};
22711	name = Production;	22848	name = Production;
22712	};	22849	};
		22850	A75FCB8C1207F63B0019E22D /* Debug */ = {
		22851	isa = XCBuildConfiguration;
		22852	baseConfigurationReference = A7421C1B1207AE0600D93779 /* WebCoreTesting.xcconfig */;
		22853	buildSettings = {
		22854	INSTALL_PATH = "$(HOME)/Library/Frameworks";
		22855	};
		22856	name = Debug;
		22857	};
		22858	A75FCB8D1207F63B0019E22D /* Release */ = {
		22859	isa = XCBuildConfiguration;
		22860	baseConfigurationReference = A7421C1B1207AE0600D93779 /* WebCoreTesting.xcconfig */;
		22861	buildSettings = {
		22862	INSTALL_PATH = "$(HOME)/Library/Frameworks";
		22863	};
		22864	name = Release;
		22865	};
		22866	A75FCB8E1207F63B0019E22D /* Production */ = {
		22867	isa = XCBuildConfiguration;
		22868	baseConfigurationReference = A7421C1B1207AE0600D93779 /* WebCoreTesting.xcconfig */;
		22869	buildSettings = {
		22870	INSTALL_PATH = "$(HOME)/Library/Frameworks";
		22871	};
		22872	name = Production;
		22873	};
		22874	A764F30F1207C7F2008D05B5 /* Debug */ = {
		22875	isa = XCBuildConfiguration;
		22876	buildSettings = {
		22877	COPY_PHASE_STRIP = NO;
		22878	GCC_DYNAMIC_NO_PIC = NO;
		22879	GCC_OPTIMIZATION_LEVEL = 0;
		22880	PRODUCT_NAME = WebCoreAndWebCoreTesting;
		22881	};
		22882	name = Debug;
		22883	};
		22884	A764F3101207C7F2008D05B5 /* Release */ = {
		22885	isa = XCBuildConfiguration;
		22886	buildSettings = {
		22887	COPY_PHASE_STRIP = YES;
		22888	DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
		22889	GCC_ENABLE_FIX_AND_CONTINUE = NO;
		22890	PRODUCT_NAME = WebCoreAndWebCoreTesting;
		22891	ZERO_LINK = NO;
		22892	};
		22893	name = Release;
		22894	};
		22895	A764F3111207C7F2008D05B5 /* Production */ = {
		22896	isa = XCBuildConfiguration;
		22897	buildSettings = {
		22898	PRODUCT_NAME = WebCoreAndWebCoreTesting;
		22899	};
		22900	name = Production;
		22901	};
22713	DD041FC209D9DDDC0010AF2A /* Debug */ = {	22902	DD041FC209D9DDDC0010AF2A /* Debug */ = {
22714	isa = XCBuildConfiguration;	22903	isa = XCBuildConfiguration;
22715	baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;	22904	baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
Lines 22777-22782 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec28
22777	defaultConfigurationIsVisible = 0;	22966	defaultConfigurationIsVisible = 0;
22778	defaultConfigurationName = Production;	22967	defaultConfigurationName = Production;
22779	};	22968	};
		22969	A75FCB8F1207F63C0019E22D /* Build configuration list for PBXNativeTarget "WebCoreTesting" */ = {
		22970	isa = XCConfigurationList;
		22971	buildConfigurations = (
		22972	A75FCB8C1207F63B0019E22D /* Debug */,
		22973	A75FCB8D1207F63B0019E22D /* Release */,
		22974	A75FCB8E1207F63B0019E22D /* Production */,
		22975	);
		22976	defaultConfigurationIsVisible = 0;
		22977	defaultConfigurationName = Production;
		22978	};
		22979	A764F3161207C833008D05B5 /* Build configuration list for PBXAggregateTarget "WebCoreAndWebCoreTesting" */ = {
		22980	isa = XCConfigurationList;
		22981	buildConfigurations = (
		22982	A764F30F1207C7F2008D05B5 /* Debug */,
		22983	A764F3101207C7F2008D05B5 /* Release */,
		22984	A764F3111207C7F2008D05B5 /* Production */,
		22985	);
		22986	defaultConfigurationIsVisible = 0;
		22987	defaultConfigurationName = Production;
		22988	};
22780	DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {	22989	DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {
22781	isa = XCConfigurationList;	22990	isa = XCConfigurationList;
22782	buildConfigurations = (	22991	buildConfigurations = (



<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>${EXECUTABLE_NAME}</string>
	<key>CFBundleIdentifier</key>
	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundlePackageType</key>
	<string>FMWK</string>
	<key>CFBundleShortVersionString</key>
	<string>1.0</string>
	<key>CFBundleSignature</key>
	<string>????</string>
	<key>CFBundleVersion</key>
	<string>1</string>
</dict>
</plist>

Line 0 a/WebCore/WebCoreTesting.exp_sec1
- a/WebCore/WebCoreTesting.exp +2 lines
	1
	2	__ZN7WebCore7Testing31createJSLayoutTestControllerForEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_5FrameE

Lines 31-37 a/WebCore/bindings/js/JSDOMWindowShell.cpp_sec1
- a/WebCore/bindings/js/JSDOMWindowShell.cpp -1 lines
31		31
32	#include "Frame.h"	32	#include "Frame.h"
33	#include "JSDOMWindow.h"	33	#include "JSDOMWindow.h"
34	#include "DOMWindow.h"
35	#include "ScriptController.h"	34	#include "ScriptController.h"
36	#include <runtime/JSObject.h>	35	#include <runtime/JSObject.h>
37		36

Lines 90-96 public: a/WebCore/bindings/js/ScriptController.h_sec1
- a/WebCore/bindings/js/ScriptController.h -1 / +1 lines
90	{	90	{
91	return windowShell(world)->window();	91	return windowShell(world)->window();
92	}	92	}
93		93
94	static void getAllWorlds(Vector<DOMWrapperWorld*>&);	94	static void getAllWorlds(Vector<DOMWrapperWorld*>&);
95		95
96	ScriptValue executeScript(const ScriptSourceCode&, ShouldAllowXSS shouldAllowXSS = DoNotAllowXSS);	96	ScriptValue executeScript(const ScriptSourceCode&, ShouldAllowXSS shouldAllowXSS = DoNotAllowXSS);

Lines 63-68 a/WebCore/page/DOMWindow.cpp_sec1
- a/WebCore/page/DOMWindow.cpp +16 lines
63	#include "IDBKeyRange.h"	63	#include "IDBKeyRange.h"
64	#include "InspectorController.h"	64	#include "InspectorController.h"
65	#include "InspectorTimelineAgent.h"	65	#include "InspectorTimelineAgent.h"
		66	#include "LayoutTestController.h"
66	#include "Location.h"	67	#include "Location.h"
67	#include "StyleMedia.h"	68	#include "StyleMedia.h"
68	#include "MessageEvent.h"	69	#include "MessageEvent.h"
Lines 489-494 void DOMWindow::clear() a/WebCore/page/DOMWindow.cpp_sec2
489	m_idbFactory = 0;	490	m_idbFactory = 0;
490	m_idbKeyRange = 0;	491	m_idbKeyRange = 0;
491	#endif	492	#endif
		493
		494	if (m_layoutTestController)
		495	m_layoutTestController->disconnectFrame();
		496	m_layoutTestController = 0;
492	}	497	}
493		498
494	#if ENABLE(ORIENTATION_EVENTS)	499	#if ENABLE(ORIENTATION_EVENTS)
Lines 596-601 Location* DOMWindow::location() const a/WebCore/page/DOMWindow.cpp_sec3
596	return m_location.get();	601	return m_location.get();
597	}	602	}
598		603
		604	LayoutTestController* DOMWindow::layoutTestController() const
		605	{
		606	return m_layoutTestController.get();
		607	}
		608
		609	void DOMWindow::setLayoutTestController(LayoutTestController* controller)
		610	{
		611	ASSERT(!m_layoutTestController);
		612	m_layoutTestController = controller;
		613	}
		614
599	#if ENABLE(DOM_STORAGE)	615	#if ENABLE(DOM_STORAGE)
600	Storage* DOMWindow::sessionStorage(ExceptionCode& ec) const	616	Storage* DOMWindow::sessionStorage(ExceptionCode& ec) const
601	{	617	{

Lines 56-61 namespace WebCore { a/WebCore/page/DOMWindow.h_sec1
- a/WebCore/page/DOMWindow.h +5 lines
56	class IDBFactory;	56	class IDBFactory;
57	class IDBKeyRange;	57	class IDBKeyRange;
58	class InspectorTimelineAgent;	58	class InspectorTimelineAgent;
		59	class LayoutTestController;
59	class Location;	60	class Location;
60	class StyleMedia;	61	class StyleMedia;
61	class Navigator;	62	class Navigator;
Lines 382-387 namespace WebCore { a/WebCore/page/DOMWindow.h_sec2
382	DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }	383	DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
383	#endif	384	#endif
384		385
		386	LayoutTestController* layoutTestController() const;
		387	void setLayoutTestController(LayoutTestController*);
		388
385	using RefCounted<DOMWindow>::ref;	389	using RefCounted<DOMWindow>::ref;
386	using RefCounted<DOMWindow>::deref;	390	using RefCounted<DOMWindow>::deref;
387		391
Lines 412-417 namespace WebCore { a/WebCore/page/DOMWindow.h_sec3
412	#if ENABLE(WEB_TIMING)	416	#if ENABLE(WEB_TIMING)
413	mutable RefPtr<Performance> m_performance;	417	mutable RefPtr<Performance> m_performance;
414	#endif	418	#endif
		419	mutable RefPtr<LayoutTestController> m_layoutTestController;
415	mutable RefPtr<Location> m_location;	420	mutable RefPtr<Location> m_location;
416	mutable RefPtr<StyleMedia> m_media;	421	mutable RefPtr<StyleMedia> m_media;
417	#if ENABLE(DOM_STORAGE)	422	#if ENABLE(DOM_STORAGE)



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "LayoutTestController.h"

namespace WebCore {

LayoutTestController::LayoutTestController()
{
}

LayoutTestController::~LayoutTestController()
{
}

} // namespace WebCore



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef LayoutTestController_h
#define LayoutTestController_h

#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>

namespace WebCore {

class Frame;
class Node;
typedef int ExceptionCode;

class LayoutTestController : public RefCounted<LayoutTestController> {
public:
    LayoutTestController();
    virtual ~LayoutTestController();

    virtual Frame* frame() const = 0;
    virtual void disconnectFrame() = 0;

    virtual int documentMarkerSizeForNode(Node*, ExceptionCode&) const = 0;
    virtual String documentMarkerStringForNodeAt(Node*, int, ExceptionCode&) const = 0;
};

} // namespace WebCore

#endif // LayoutTestController_h



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

module window {

    interface [OmitConstructor] LayoutTestController {
        long documentMarkerSizeForNode(in Node node) raises(DOMException);
        DOMString documentMarkerStringForNodeAt(in Node node, in long index) raises(DOMException);
    };

}



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "LayoutTestControllerImpl.h"

#include "ExceptionCode.h"
#include "Frame.h"
#include "Node.h"
#include "PlatformString.h"

namespace WebCore {
namespace Testing {

Frame* LayoutTestControllerImpl::frame() const
{
    return m_frame;
}

void LayoutTestControllerImpl::disconnectFrame()
{
    m_frame = 0;
}

int LayoutTestControllerImpl::documentMarkerSizeForNode(Node*, ExceptionCode& ec) const
{
    if (!verifyConnected(ec))
        return 0;

    // FIXME: implement
    return 0;
}

String LayoutTestControllerImpl::documentMarkerStringForNodeAt(Node*, int, ExceptionCode& ec) const
{
    if (!verifyConnected(ec))
        return "";

    // FIXME: implement
    return "";
}

LayoutTestControllerImpl::LayoutTestControllerImpl(Frame* frame)
    : m_frame(frame)
{
}

bool LayoutTestControllerImpl::verifyConnected(ExceptionCode& ec) const
{
    if (!m_frame) {
        ec = INVALID_STATE_ERR;
        return false;
    }

    return true;
}

} // namespace Testing
} // namespace WebCore



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef LayoutTestControllerImpl_h
#define LayoutTestControllerImpl_h

#include "LayoutTestController.h"

#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>

namespace WebCore {
namespace Testing {

class LayoutTestControllerImpl : public LayoutTestController {
public:
    static PassRefPtr<LayoutTestControllerImpl> create(Frame* frame) { return adoptRef(new LayoutTestControllerImpl(frame)); }

    Frame* frame() const;
    void disconnectFrame();

    int documentMarkerSizeForNode(Node*, ExceptionCode&) const;
    String documentMarkerStringForNodeAt(Node*, int, ExceptionCode&) const;

private:
    bool verifyConnected(ExceptionCode&) const;
    LayoutTestControllerImpl(Frame*);

    Frame* m_frame;
};

} // namespace Testing
} // namespace WebCore

#endif // LayoutTestControllerImpl_h



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "WebCoreTesting.h"

#include "Frame.h"
#include "LayoutTestControllerImpl.h"

#if USE(JSC)
# include "JSLayoutTestController.h"
#endif

namespace WebCore {
namespace Testing {

static RefPtr<LayoutTestController> createLayoutTestControllerFor(Frame* frame)
{
    RefPtr<LayoutTestController> ret(LayoutTestControllerImpl::create(frame));
    frame->domWindow()->setLayoutTestController(ret.get());
    return ret;
}

#if USE(JSC)
JSC::JSObject* createJSLayoutTestControllerFor(JSC::ExecState* exec, JSDOMGlobalObject* window, Frame* frame)
{
    RefPtr<LayoutTestController> controller = createLayoutTestControllerFor(frame);
    return toJS(exec, window, controller.get()).toObject(exec);
}
#endif

} // namespace Testing
} // namespace WebCore



/*
 * Copyright (C) 2010 Google Inc.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef WebCoreTesting_h
#define WebCoreTesting_h

#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>

namespace JSC {
class JSObject;
class ExecState;
}

namespace WebCore {

class Frame;
class JSDOMGlobalObject;
class LayoutTestController;

namespace Testing {

#if USE(JSC)
JSC::JSObject* createJSLayoutTestControllerFor(JSC::ExecState*, JSDOMGlobalObject*, Frame*);
#endif

} // namespace Testing
} // namespace WebCore

#endif // WebCoreTesting_h



2010-08-03  MORITA Hajime  <morrita@google.com>

        DRT should allow test scripts to access WebCore internal states for setup/verification
        https://bugs.webkit.org/show_bug.cgi?id=42612

        Link WebKitTesting.framework with weak linkage.

        * WebKit.xcodeproj/project.pbxproj:

2010-08-06  Gavin Barraclough  <barraclough@apple.com>

        Rubber stamped by Sam Weinig



		939811290824BF01008DF038 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869402846DCD018635CA /* Carbon.framework */; };
		9398112A0824BF01008DF038 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5C2869502846DCD018635CA /* Cocoa.framework */; };
		9398112B0824BF01008DF038 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9E903FAD3DF0321FBE0 /* JavaScriptCore.framework */; };
		9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */; };
		9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD /* libicucore.dylib */; };
		9398112F0824BF01008DF038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 /* Security.framework */; };
		93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.mm */; };

		A5DEFC1411D5344B00885273 /* WebApplicationCacheQuotaManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */; };
		A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A70936AD0B5608DC00CDB48E /* WebDragClient.h */; };
		A70936B00B5608DC00CDB48E /* WebDragClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = A70936AE0B5608DC00CDB48E /* WebDragClient.mm */; };
		A7121949120836D0003A999A /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */; };
		A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */; };
		A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */; };
		AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */; };

		A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebApplicationCacheQuotaManager.mm; sourceTree = "<group>"; };
		A70936AD0B5608DC00CDB48E /* WebDragClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDragClient.h; sourceTree = "<group>"; };
		A70936AE0B5608DC00CDB48E /* WebDragClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDragClient.mm; sourceTree = "<group>"; };
		A70EB4EC120834A8004B0A3B /* WebCoreTesting.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCoreTesting.framework; sourceTree = BUILT_PRODUCTS_DIR; };
		A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardHelper.h; sourceTree = "<group>"; };
		A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardHelper.mm; sourceTree = "<group>"; };
		AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };

				0ACE917310FE47E30096A45F /* OpenGL.framework in Frameworks */,
				1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */,
				9398112F0824BF01008DF038 /* Security.framework in Frameworks */,
				A7121949120836D0003A999A /* WebCore.framework in Frameworks */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};

		0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */ = {
			isa = PBXGroup;
			children = (
				A70EB4EC120834A8004B0A3B /* WebCoreTesting.framework */,
				F5C2869402846DCD018635CA /* Carbon.framework */,
				F5C2869502846DCD018635CA /* Cocoa.framework */,
				CD8EAC7211CAC9A300774075 /* IOKit.framework */,



2010-08-03  MORITA Hajime  <morrita@google.com>

        DRT should allow test scripts to access WebCore internal states for setup/verification
        https://bugs.webkit.org/show_bug.cgi?id=42612
        
        Exposed WebKit::Testing API for extending LayoutTestController.
        Note that WebKitTesting.framework is linked with "weak" linkage
        and WebKit framework will ship without that.

        * Configurations/WebKit.xcconfig:
        * WebView/WebFrame.mm:
        (-[WebFrame layoutTestController]):
        * WebView/WebFramePrivate.h:

2010-08-11  Gavin Barraclough  <barraclough@apple.com>

        Rubber stamps by Darin Adler & Sam Weinig.




GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(WEBCORETESTING_HEADERS_DIR) $(HEADER_SEARCH_PATHS);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
INSTALL_PATH_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;

OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework WebCore;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = -sub_umbrella WebCore $(OTHER_LDFLAGS) -weak_framework WebCoreTesting;

PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;

WEBCORETESTING_HEADERS_DIR = $(WEBCORETESTING_HEADERS_DIR_$(CONFIGURATION));
WEBCORETESTING_HEADERS_DIR_Release = $(WEBCORETESTING_HEADERS_engineering);
WEBCORETESTING_HEADERS_DIR_Debug  = $(WEBCORETESTING_HEADERS_engineering);
WEBCORETESTING_HEADERS_DIR_Production = $(WEBCORETESTING_HEADERS_DIR_Production_$(REAL_PLATFORM_NAME));
WEBCORETESTING_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCoreTesting.framework/Headers;
WEBCORETESTING_HEADERS_DIR_Production_iphonesimulator = $(WEBCORETESTING_HEADERS_DIR_Production_iphoneos);
WEBCORETESTING_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCoreTesting.framework/Headers;
WEBCORETESTING_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;

WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);



#import <WebCore/htmlediting.h>
#import <WebCore/markup.h>
#import <WebCore/visible_units.h>
#import <WebCoreTesting/WebCoreTesting.h>
#import <WebKitSystemInterface.h>
#import <runtime/JSLock.h>
#import <runtime/JSObject.h>

    return coreFrame->layerTreeAsText();
}

- (JSValueRef)layoutTestController
{
    Frame* coreFrame = _private->coreFrame;
    if (!coreFrame)
        return 0;
    DOMWrapperWorld* world = mainThreadNormalWorld();
    WebCore::JSDOMGlobalObject* globalObject = coreFrame->script()->globalObject(world);
    JSC::ExecState* exec = globalObject->globalExec();
    return toRef(exec, JSValue(WebCore::Testing::createJSLayoutTestControllerFor(exec, globalObject, coreFrame)));
}

@end

@implementation WebFrame

Lines 140-143 typedef enum { a/WebKit/mac/WebView/WebFramePrivate.h_sec1
- a/WebKit/mac/WebView/WebFramePrivate.h +3 lines
140		140
141	- (NSString*)_layerTreeAsText;	141	- (NSString*)_layerTreeAsText;
142		142
		143	// Returns associated LayoutTestController object, or null on the production build.
		144	- (JSValueRef)layoutTestController;
		145
143	@end	146	@end



2010-08-03  MORITA Hajime  <morrita@google.com>

        Reviewed by NOBODY (OOPS!).

        Extended LayoutTestController object by adding delgation methods
        for WebCore::LayoutTestController.
        Now window.layoutTestController has methods defined in
        WebCore::LayoutTestController.

        * DumpRenderTree/LayoutTestController.cpp:
        (LayoutTestController::makeDelegationMethods):
        (LayoutTestController::makeWindowObject):
        * DumpRenderTree/LayoutTestController.h:
        * DumpRenderTree/mac/FrameLoadDelegate.mm:
        (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]):

2010-08-11  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>

        Unreviewed. Adding my Collabora personality to the list.



    controller->deref();
}

static const char setupLayoutTestControllerScript[] = 
    "function delegate(dst, src, name) { dst[name] = function() { return src[name].apply(src, arguments); } }\n"
    "for (var name in this.webCoreLayoutTestController) {\n"
    "    delegate(this, this.webCoreLayoutTestController, name);\n"
    "}\n";

void LayoutTestController::makeDelegationMethods(JSContextRef context, JSObjectRef thisObject, JSValueRef webCoreLayoutTestControllerObject, JSValueRef* exception)
{
    JSRetainPtr<JSStringRef> webCoreLayoutTestControllerStr(Adopt, JSStringCreateWithUTF8CString("webCoreLayoutTestController"));
    JSObjectSetProperty(context, thisObject, webCoreLayoutTestControllerStr.get(), webCoreLayoutTestControllerObject, kJSPropertyAttributeNone, exception);
    ASSERT(!*exception);

    JSRetainPtr<JSStringRef> urlStr(Adopt, JSStringCreateWithUTF8CString("setup_layout_test_controller_test.js"));
    JSRetainPtr<JSStringRef> scriptStr(Adopt, JSStringCreateWithUTF8CString(setupLayoutTestControllerScript));
    ASSERT(!*exception);
    JSEvaluateScript(context, scriptStr.get(), thisObject, urlStr.get(), 1, exception);
    ASSERT(!*exception);
}

// Object Creation

void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception, JSValueRef webCorelayoutTestContoller)
{
    JSRetainPtr<JSStringRef> layoutTestContollerStr(Adopt, JSStringCreateWithUTF8CString("layoutTestController"));
    ref();

    JSValueRef layoutTestContollerObject = JSObjectMake(context, classRef, this);
    JSClassRelease(classRef);

    if (webCorelayoutTestContoller)
        makeDelegationMethods(context, JSValueToObject(context, layoutTestContollerObject, exception), webCorelayoutTestContoller, exception);

    JSObjectSetProperty(context, windowObject, layoutTestContollerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
}




    static PassRefPtr<LayoutTestController> create(const std::string& testPathOrURL, const std::string& expectedPixelHash);
    ~LayoutTestController();

    void makeDelegationMethods(JSContextRef context, JSObjectRef thisObject, JSValueRef webCoreLayoutTestController, JSValueRef* exception);
    void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception, JSValueRef webCorelayoutTestContoller = 0);

    void addDisallowedURL(JSStringRef url);
    void clearAllApplicationCaches();



    JSValueRef exception = 0;

    ASSERT(gLayoutTestController);
    JSValueRef webCoreLayoutTestController = [frame layoutTestController];
    gLayoutTestController->makeWindowObject(context, globalObject, &exception, webCoreLayoutTestController);
    ASSERT(!exception);

    gcController->makeWindowObject(context, globalObject, &exception);

Return to Bug 42612

Lines 1775-1783 static void layoutTestControllerObjectFinalize(JSObjectRef object) a/WebKitTools/DumpRenderTree/LayoutTestController.cpp_sec1
- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp -1 / +23 lines
1775	controller->deref();	1775	controller->deref();
1776	}	1776	}
1777		1777
		1778	static const char setupLayoutTestControllerScript[] =
		1779	"function delegate(dst, src, name) { dst[name] = function() { return src[name].apply(src, arguments); } }\n"
		1780	"for (var name in this.webCoreLayoutTestController) {\n"
		1781	" delegate(this, this.webCoreLayoutTestController, name);\n"
		1782	"}\n";
		1783
		1784	void LayoutTestController::makeDelegationMethods(JSContextRef context, JSObjectRef thisObject, JSValueRef webCoreLayoutTestControllerObject, JSValueRef* exception)
		1785	{
		1786	JSRetainPtr<JSStringRef> webCoreLayoutTestControllerStr(Adopt, JSStringCreateWithUTF8CString("webCoreLayoutTestController"));
		1787	JSObjectSetProperty(context, thisObject, webCoreLayoutTestControllerStr.get(), webCoreLayoutTestControllerObject, kJSPropertyAttributeNone, exception);
		1788	ASSERT(!*exception);
		1789
		1790	JSRetainPtr<JSStringRef> urlStr(Adopt, JSStringCreateWithUTF8CString("setup_layout_test_controller_test.js"));
		1791	JSRetainPtr<JSStringRef> scriptStr(Adopt, JSStringCreateWithUTF8CString(setupLayoutTestControllerScript));
		1792	ASSERT(!*exception);
		1793	JSEvaluateScript(context, scriptStr.get(), thisObject, urlStr.get(), 1, exception);
		1794	ASSERT(!*exception);
		1795	}
		1796
1778	// Object Creation	1797	// Object Creation
1779		1798
1780	void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)	1799	void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception, JSValueRef webCorelayoutTestContoller)
1781	{	1800	{
1782	JSRetainPtr<JSStringRef> layoutTestContollerStr(Adopt, JSStringCreateWithUTF8CString("layoutTestController"));	1801	JSRetainPtr<JSStringRef> layoutTestContollerStr(Adopt, JSStringCreateWithUTF8CString("layoutTestController"));
1783	ref();	1802	ref();
Lines 1786-1791 void LayoutTestController::makeWindowObject(JSContextRef context, JSObjectRef wi a/WebKitTools/DumpRenderTree/LayoutTestController.cpp_sec2
1786	JSValueRef layoutTestContollerObject = JSObjectMake(context, classRef, this);	1805	JSValueRef layoutTestContollerObject = JSObjectMake(context, classRef, this);
1787	JSClassRelease(classRef);	1806	JSClassRelease(classRef);
1788		1807
		1808	if (webCorelayoutTestContoller)
		1809	makeDelegationMethods(context, JSValueToObject(context, layoutTestContollerObject, exception), webCorelayoutTestContoller, exception);
		1810
1789	JSObjectSetProperty(context, windowObject, layoutTestContollerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly \| kJSPropertyAttributeDontDelete, exception);	1811	JSObjectSetProperty(context, windowObject, layoutTestContollerStr.get(), layoutTestContollerObject, kJSPropertyAttributeReadOnly \| kJSPropertyAttributeDontDelete, exception);
1790	}	1812	}
1791		1813

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +15 lines
		1	2010-08-03 MORITA Hajime <morrita@google.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	DRT should allow test scripts to access WebCore internal states for setup/verification
		6	https://bugs.webkit.org/show_bug.cgi?id=42612
		7
		8	* fast/dom/Window/script-tests/window-layout-test-controller-webcore.js: Added.
		9	* fast/dom/Window/window-layout-test-controller-webcore-expected.txt: Added.
		10	* fast/dom/Window/window-layout-test-controller-webcore.html: Added.
		11	* platform/chromium/test_expectations.txt:
		12	* platform/gtk/Skipped:
		13	* platform/qt/Skipped:
		14	* platform/win/Skipped:
		15
1	2010-08-11 Sam Weinig <sam@webkit.org>	16	2010-08-11 Sam Weinig <sam@webkit.org>
2		17
3	Rubber-stamped by Jon Honeycutt.	18	Rubber-stamped by Jon Honeycutt.

Line 0 a/LayoutTests/fast/dom/Window/window-layout-test-controller-webcore-expected.txt_sec1
- a/LayoutTests/fast/dom/Window/window-layout-test-controller-webcore-expected.txt +12 lines
	1	window.layoutTestController should have functions defined in LayoutTestController.idl
	2
	3	On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
	4
	5
	6	PASS undefined != window.layoutTestController is true
	7	PASS undefined != window.layoutTestController.documentMarkerSizeForNode is true
	8	PASS 0 == window.layoutTestController.documentMarkerSizeForNode(window.node) is true
	9	PASS successfullyParsed is true
	10
	11	TEST COMPLETE
	12

Line 0 a/LayoutTests/fast/dom/Window/window-layout-test-controller-webcore.html_sec1
- a/LayoutTests/fast/dom/Window/window-layout-test-controller-webcore.html +13 lines
	1	<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
	2	<html>
	3	<head>
	4	<link rel="stylesheet" href="../../js/resources/js-test-style.css">
	5	<script src="../../js/resources/js-test-pre.js"></script>
	6	</head>
	7	<body>
	8	<p id="description"></p>
	9	<div id="console"></div>
	10	<script src="script-tests/window-layout-test-controller-webcore.js"></script>
	11	<script src="../../js/resources/js-test-post.js"></script>
	12	</body>
	13	</html>

Lines 316-321 SET(WebCore_IDL_FILES a/WebCore/CMakeLists.txt_sec1
- a/WebCore/CMakeLists.txt +2 lines
316	page/Geoposition.idl	316	page/Geoposition.idl
317	page/History.idl	317	page/History.idl
318	page/Location.idl	318	page/Location.idl
		319	page/LayoutTestController.idl
319	page/MemoryInfo.idl	320	page/MemoryInfo.idl
320	page/Navigation.idl	321	page/Navigation.idl
321	page/Navigator.idl	322	page/Navigator.idl
Lines 1165-1170 SET(WebCore_SOURCES a/WebCore/CMakeLists.txt_sec2
1165	page/GeolocationPositionCache.cpp	1166	page/GeolocationPositionCache.cpp
1166	page/History.cpp	1167	page/History.cpp
1167	page/Location.cpp	1168	page/Location.cpp
		1169	page/LayoutTestController.cpp
1168	page/MemoryInfo.cpp	1170	page/MemoryInfo.cpp
1169	page/MouseEventWithHitTestResults.cpp	1171	page/MouseEventWithHitTestResults.cpp
1170	page/Navigation.cpp	1172	page/Navigation.cpp

Lines 1-3 a/WebCore/ChangeLog_sec1
- a/WebCore/ChangeLog +64 lines
		1	2010-08-03 MORITA Hajime <morrita@google.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	DRT should allow test scripts to access WebCore internal states for setup/verification
		6	https://bugs.webkit.org/show_bug.cgi?id=42612
		7
		8	Introduced:
		9
		10	- WebCore::Testing namespace for testing-specific code.
		11	Implementation files are located under testing/ directory.
		12	- WebCore::LayoutTestController interface, that defines
		13	LayoutTestController API that will be implemented inside
		14	WebCore::Testing.
		15	- WebCore::Testing::LayoutTestControllerImpl that implements
		16	WebCore::LayoutTestController.
		17	- (Mac): WebKitTesting.framework to have code under testing/.
		18
		19	Note that files under WebCore::Testing will be built separately
		20	from WebCore.framework for a security reason. So WebCore doesn't
		21	depend on WebCore:Testing though provides interfaces for it.
		22
		23	Test: fast/dom/Window/window-layout-test-controller-webcore.html
		24
		25	* CMakeLists.txt:
		26	* Configurations/WebCore.xcconfig:
		27	* Configurations/WebCoreTesting.xcconfig: Added.
		28	* DerivedSources.cpp:
		29	* DerivedSources.make:
		30	* GNUmakefile.am:
		31	* WebCore.exp.in:
		32	* WebCore.gypi:
		33	* WebCore.pri:
		34	* WebCore.pro:
		35	* WebCore.vcproj/WebCore.vcproj:
		36	* WebCore.xcodeproj/project.pbxproj:
		37	* WebCoreTesting-Info.plist: Added.
		38	* WebCoreTesting.exp: Added.
		39	* bindings/js/JSDOMWindowShell.cpp:
		40	* bindings/js/ScriptController.h:
		41	* page/DOMWindow.cpp:
		42	(WebCore::DOMWindow::clear):
		43	(WebCore::DOMWindow::layoutTestController):
		44	(WebCore::DOMWindow::setLayoutTestController):
		45	* page/DOMWindow.h:
		46	* page/LayoutTestController.cpp: Added.
		47	(WebCore::LayoutTestController::LayoutTestController):
		48	(WebCore::LayoutTestController::~LayoutTestController):
		49	* page/LayoutTestController.h: Added.
		50	* page/LayoutTestController.idl: Added.
		51	* testing/LayoutTestControllerImpl.cpp: Added.
		52	(WebCore::Testing::LayoutTestControllerImpl::frame):
		53	(WebCore::Testing::LayoutTestControllerImpl::disconnectFrame):
		54	(WebCore::Testing::LayoutTestControllerImpl::documentMarkerSizeForNode):
		55	(WebCore::Testing::LayoutTestControllerImpl::documentMarkerStringForNodeAt):
		56	(WebCore::Testing::LayoutTestControllerImpl::LayoutTestControllerImpl):
		57	(WebCore::Testing::LayoutTestControllerImpl::verifyConnected):
		58	* testing/LayoutTestControllerImpl.h: Added.
		59	(WebCore::Testing::LayoutTestControllerImpl::create):
		60	* testing/WebCoreTesting.cpp: Added.
		61	(WebCore::Testing::createLayoutTestControllerFor):
		62	(WebCore::Testing::createJSLayoutTestControllerFor):
		63	* testing/WebCoreTesting.h: Added.
		64
1	2010-08-11 Adam Barth <abarth@webkit.org>	65	2010-08-11 Adam Barth <abarth@webkit.org>
2		66
3	Reviewed by Eric Seidel.	67	Reviewed by Eric Seidel.

Line 0 a/WebCore/Configurations/WebCoreTesting.xcconfig_sec1
- a/WebCore/Configurations/WebCoreTesting.xcconfig +39 lines
	1	// Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
	2	//
	3	// Redistribution and use in source and binary forms, with or without
	4	// modification, are permitted provided that the following conditions
	5	// are met:
	6	// 1. Redistributions of source code must retain the above copyright
	7	// notice, this list of conditions and the following disclaimer.
	8	// 2. Redistributions in binary form must reproduce the above copyright
	9	// notice, this list of conditions and the following disclaimer in the
	10	// documentation and/or other materials provided with the distribution.
	11	//
	12	// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
	13	// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	14	// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	15	// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
	16	// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	17	// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	18	// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	19	// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
	20	// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	21	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	22	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	23
	24	#include "WebCore.xcconfig"
	25
	26	EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
	27	EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
	28	EXPORTED_SYMBOLS_FILE_armv5 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
	29	EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
	30	EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
	31	EXPORTED_SYMBOLS_FILE_i386 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
	32	EXPORTED_SYMBOLS_FILE_ppc = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.exp;
	33	EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
	34	EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreTesting.LP64.exp;
	35
	36	HEADER_SEARCH_PATHS = $(WEBCORE_HEADER_SEARCH_PATHS) $(CONFIGURATION_TEMP_DIR)/WebCore.build/WebCore.hmap
	37
	38	PRODUCT_NAME = WebCoreTesting;
	39

Lines 840-845 SOURCES += \ a/WebCore/WebCore.pro_sec1
- a/WebCore/WebCore.pro +2 lines
840	page/GeolocationController.cpp \	840	page/GeolocationController.cpp \
841	page/GeolocationPositionCache.cpp \	841	page/GeolocationPositionCache.cpp \
842	page/History.cpp \	842	page/History.cpp \
		843	page/LayoutTestController.cpp \
843	page/Location.cpp \	844	page/Location.cpp \
844	page/MemoryInfo.cpp \	845	page/MemoryInfo.cpp \
845	page/MouseEventWithHitTestResults.cpp \	846	page/MouseEventWithHitTestResults.cpp \
Lines 1620-1625 HEADERS += \ a/WebCore/WebCore.pro_sec2
1620	page/Geoposition.h \	1621	page/Geoposition.h \
1621	page/HaltablePlugin.h \	1622	page/HaltablePlugin.h \
1622	page/History.h \	1623	page/History.h \
		1624	page/LayoutTestController.h \
1623	page/Location.h \	1625	page/Location.h \
1624	page/MouseEventWithHitTestResults.h \	1626	page/MouseEventWithHitTestResults.h \
1625	page/NavigatorBase.h \	1627	page/NavigatorBase.h \

Lines 9069-9074 a/WebCore/WebCore.vcproj/WebCore.vcproj_sec1
- a/WebCore/WebCore.vcproj/WebCore.vcproj +64 lines
9069	>	9069	>
9070	</File>	9070	</File>
9071	<File	9071	<File
		9072	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.cpp"
		9073	>
		9074	<FileConfiguration
		9075	Name="Debug\|Win32"
		9076	ExcludedFromBuild="true"
		9077	>
		9078	<Tool
		9079	Name="VCCLCompilerTool"
		9080	/>
		9081	</FileConfiguration>
		9082	<FileConfiguration
		9083	Name="Release\|Win32"
		9084	ExcludedFromBuild="true"
		9085	>
		9086	<Tool
		9087	Name="VCCLCompilerTool"
		9088	/>
		9089	</FileConfiguration>
		9090	<FileConfiguration
		9091	Name="Debug_Internal\|Win32"
		9092	ExcludedFromBuild="true"
		9093	>
		9094	<Tool
		9095	Name="VCCLCompilerTool"
		9096	/>
		9097	</FileConfiguration>
		9098	<FileConfiguration
		9099	Name="Debug_Cairo\|Win32"
		9100	ExcludedFromBuild="true"
		9101	>
		9102	<Tool
		9103	Name="VCCLCompilerTool"
		9104	/>
		9105	</FileConfiguration>
		9106	<FileConfiguration
		9107	Name="Release_Cairo\|Win32"
		9108	ExcludedFromBuild="true"
		9109	>
		9110	<Tool
		9111	Name="VCCLCompilerTool"
		9112	/>
		9113	</FileConfiguration>
		9114	<FileConfiguration
		9115	Name="Debug_All\|Win32"
		9116	ExcludedFromBuild="true"
		9117	>
		9118	<Tool
		9119	Name="VCCLCompilerTool"
		9120	/>
		9121	</FileConfiguration>
		9122	</File>
		9123	<File
		9124	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLayoutTestController.h"
		9125	>
		9126	</File>
		9127	<File
9072	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.cpp"	9128	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.cpp"
9073	>	9129	>
9074	<FileConfiguration	9130	<FileConfiguration
Lines 22353-22358 a/WebCore/WebCore.vcproj/WebCore.vcproj_sec2
22353	>	22409	>
22354	</File>	22410	</File>
22355	<File	22411	<File
		22412	RelativePath="..\page\LayoutTestController.cpp"
		22413	>
		22414	</File>
		22415	<File
		22416	RelativePath="..\page\LayoutTestController.h"
		22417	>
		22418	</File>
		22419	<File
22356	RelativePath="..\page\MouseEventWithHitTestResults.cpp"	22420	RelativePath="..\page\MouseEventWithHitTestResults.cpp"
22357	>	22421	>
22358	</File>	22422	</File>

Line 0 a/WebCore/WebCoreTesting-Info.plist_sec1
- a/WebCore/WebCoreTesting-Info.plist +22 lines
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
	3	<plist version="1.0">
	4	<dict>
	5	<key>CFBundleDevelopmentRegion</key>
	6	<string>English</string>
	7	<key>CFBundleExecutable</key>
	8	<string>${EXECUTABLE_NAME}</string>
	9	<key>CFBundleIdentifier</key>
	10	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
	11	<key>CFBundleInfoDictionaryVersion</key>
	12	<string>6.0</string>
	13	<key>CFBundlePackageType</key>
	14	<string>FMWK</string>
	15	<key>CFBundleShortVersionString</key>
	16	<string>1.0</string>
	17	<key>CFBundleSignature</key>
	18	<string>????</string>
	19	<key>CFBundleVersion</key>
	20	<string>1</string>
	21	</dict>
	22	</plist>

Line 0 a/WebCore/page/LayoutTestController.cpp_sec1
- a/WebCore/page/LayoutTestController.cpp +44 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	#include "config.h"
	32	#include "LayoutTestController.h"
	33
	34	namespace WebCore {
	35
	36	LayoutTestController::LayoutTestController()
	37	{
	38	}
	39
	40	LayoutTestController::~LayoutTestController()
	41	{
	42	}
	43
	44	} // namespace WebCore

Line 0 a/WebCore/page/LayoutTestController.h_sec1
- a/WebCore/page/LayoutTestController.h +59 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	#ifndef LayoutTestController_h
	32	#define LayoutTestController_h
	33
	34	#include <wtf/Forward.h>
	35	#include <wtf/PassRefPtr.h>
	36	#include <wtf/RefCounted.h>
	37	#include <wtf/text/WTFString.h>
	38
	39	namespace WebCore {
	40
	41	class Frame;
	42	class Node;
	43	typedef int ExceptionCode;
	44
	45	class LayoutTestController : public RefCounted<LayoutTestController> {
	46	public:
	47	LayoutTestController();
	48	virtual ~LayoutTestController();
	49
	50	virtual Frame* frame() const = 0;
	51	virtual void disconnectFrame() = 0;
	52
	53	virtual int documentMarkerSizeForNode(Node*, ExceptionCode&) const = 0;
	54	virtual String documentMarkerStringForNodeAt(Node*, int, ExceptionCode&) const = 0;
	55	};
	56
	57	} // namespace WebCore
	58
	59	#endif // LayoutTestController_h

Line 0 a/WebCore/page/LayoutTestController.idl_sec1
- a/WebCore/page/LayoutTestController.idl +38 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	module window {
	32
	33	interface [OmitConstructor] LayoutTestController {
	34	long documentMarkerSizeForNode(in Node node) raises(DOMException);
	35	DOMString documentMarkerStringForNodeAt(in Node node, in long index) raises(DOMException);
	36	};
	37
	38	}

Line 0 a/WebCore/testing/LayoutTestControllerImpl.cpp_sec1
- a/WebCore/testing/LayoutTestControllerImpl.cpp +86 lines
		1	/*
		2	* Copyright (C) 2010 Google Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions are
		6	* met:
		7	*
		8	* * Redistributions of source code must retain the above copyright
		9	* notice, this list of conditions and the following disclaimer.
		10	* * Redistributions in binary form must reproduce the above
		11	* copyright notice, this list of conditions and the following disclaimer
		12	* in the documentation and/or other materials provided with the
		13	* distribution.
		14	* * Neither the name of Google Inc. nor the names of its
		15	* contributors may be used to endorse or promote products derived from
		16	* this software without specific prior written permission.
		17	*
		18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		29	*/
		30
		31	#include "config.h"
		32	#include "LayoutTestControllerImpl.h"
		33
		34	#include "ExceptionCode.h"
		35	#include "Frame.h"
		36	#include "Node.h"
		37	#include "PlatformString.h"
		38
		39	namespace WebCore {
		40	namespace Testing {
		41
		42	Frame* LayoutTestControllerImpl::frame() const
		43	{
		44	return m_frame;
		45	}
		46
		47	void LayoutTestControllerImpl::disconnectFrame()
		48	{
		49	m_frame = 0;
		50	}
		51
		52	int LayoutTestControllerImpl::documentMarkerSizeForNode(Node*, ExceptionCode& ec) const
		53	{
		54	if (!verifyConnected(ec))
		55	return 0;
		56
		57	// FIXME: implement
		58	return 0;
		59	}
		60
		61	String LayoutTestControllerImpl::documentMarkerStringForNodeAt(Node*, int, ExceptionCode& ec) const
		62	{
		63	if (!verifyConnected(ec))
		64	return "";
65
66	// FIXME: implement
67	return "";
68	}
69
70	LayoutTestControllerImpl::LayoutTestControllerImpl(Frame* frame)
71	: m_frame(frame)
72	{
73	}
74
75	bool LayoutTestControllerImpl::verifyConnected(ExceptionCode& ec) const
76	{
77	if (!m_frame) {
78	ec = INVALID_STATE_ERR;
79	return false;
80	}
81
82	return true;
83	}
84
85	} // namespace Testing
86	} // namespace WebCore

Line 0 a/WebCore/testing/WebCoreTesting.cpp_sec1
- a/WebCore/testing/WebCoreTesting.cpp +60 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	#include "config.h"
	32	#include "WebCoreTesting.h"
	33
	34	#include "Frame.h"
	35	#include "LayoutTestControllerImpl.h"
	36
	37	#if USE(JSC)
	38	# include "JSLayoutTestController.h"
	39	#endif
	40
	41	namespace WebCore {
	42	namespace Testing {
	43
	44	static RefPtr<LayoutTestController> createLayoutTestControllerFor(Frame* frame)
	45	{
	46	RefPtr<LayoutTestController> ret(LayoutTestControllerImpl::create(frame));
	47	frame->domWindow()->setLayoutTestController(ret.get());
	48	return ret;
	49	}
	50
	51	#if USE(JSC)
	52	JSC::JSObject* createJSLayoutTestControllerFor(JSC::ExecState* exec, JSDOMGlobalObject* window, Frame* frame)
	53	{
	54	RefPtr<LayoutTestController> controller = createLayoutTestControllerFor(frame);
	55	return toJS(exec, window, controller.get()).toObject(exec);
	56	}
	57	#endif
	58
	59	} // namespace Testing
	60	} // namespace WebCore

Line 0 a/WebCore/testing/WebCoreTesting.h_sec1
- a/WebCore/testing/WebCoreTesting.h +58 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions are
	6	* met:
	7	*
	8	* * Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* * Redistributions in binary form must reproduce the above
	11	* copyright notice, this list of conditions and the following disclaimer
	12	* in the documentation and/or other materials provided with the
	13	* distribution.
	14	* * Neither the name of Google Inc. nor the names of its
	15	* contributors may be used to endorse or promote products derived from
	16	* this software without specific prior written permission.
	17	*
	18	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	19	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	20	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	21	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	22	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	23	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	24	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	25	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	26	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	28	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	29	*/
	30
	31	#ifndef WebCoreTesting_h
	32	#define WebCoreTesting_h
	33
	34	#include <wtf/Forward.h>
	35	#include <wtf/PassRefPtr.h>
	36	#include <wtf/RefCounted.h>
	37
	38	namespace JSC {
	39	class JSObject;
	40	class ExecState;
	41	}
	42
	43	namespace WebCore {
	44
	45	class Frame;
	46	class JSDOMGlobalObject;
	47	class LayoutTestController;
	48
	49	namespace Testing {
	50
	51	#if USE(JSC)
	52	JSC::JSObject* createJSLayoutTestControllerFor(JSC::ExecState, JSDOMGlobalObject, Frame*);
	53	#endif
	54
	55	} // namespace Testing
	56	} // namespace WebCore
	57
	58	#endif // WebCoreTesting_h

Lines 1-3 a/WebKit/ChangeLog_sec1
- a/WebKit/ChangeLog +9 lines
		1	2010-08-03 MORITA Hajime <morrita@google.com>
		2
		3	DRT should allow test scripts to access WebCore internal states for setup/verification
		4	https://bugs.webkit.org/show_bug.cgi?id=42612
		5
		6	Link WebKitTesting.framework with weak linkage.
		7
		8	* WebKit.xcodeproj/project.pbxproj:
		9
1	2010-08-06 Gavin Barraclough <barraclough@apple.com>	10	2010-08-06 Gavin Barraclough <barraclough@apple.com>
2		11
3	Rubber stamped by Sam Weinig	12	Rubber stamped by Sam Weinig

Lines 307-313 a/WebKit/WebKit.xcodeproj/project.pbxproj_sec1
- a/WebKit/WebKit.xcodeproj/project.pbxproj -2 / +4 lines
307	939811290824BF01008DF038 /* Carbon.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F5C2869402846DCD018635CA / Carbon.framework */; };	307	939811290824BF01008DF038 /* Carbon.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F5C2869402846DCD018635CA / Carbon.framework */; };
308	9398112A0824BF01008DF038 /* Cocoa.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F5C2869502846DCD018635CA / Cocoa.framework */; };	308	9398112A0824BF01008DF038 /* Cocoa.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F5C2869502846DCD018635CA / Cocoa.framework */; };
309	9398112B0824BF01008DF038 /* JavaScriptCore.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F738C9E903FAD3DF0321FBE0 / JavaScriptCore.framework */; };	309	9398112B0824BF01008DF038 /* JavaScriptCore.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F738C9E903FAD3DF0321FBE0 / JavaScriptCore.framework */; };
310	9398112C0824BF01008DF038 /* WebCore.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 / WebCore.framework */; };
311	9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD / libicucore.dylib */; };	310	9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks / = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD / libicucore.dylib */; };
312	9398112F0824BF01008DF038 /* Security.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 / Security.framework */; };	311	9398112F0824BF01008DF038 /* Security.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 / Security.framework */; };
313	93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources / = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF / WebSystemInterface.mm */; };	312	93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources / = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF / WebSystemInterface.mm */; };
Lines 323-328 a/WebKit/WebKit.xcodeproj/project.pbxproj_sec2
323	A5DEFC1411D5344B00885273 /* WebApplicationCacheQuotaManager.mm in Sources / = {isa = PBXBuildFile; fileRef = A5DEFC1211D5344B00885273 / WebApplicationCacheQuotaManager.mm */; };	322	A5DEFC1411D5344B00885273 /* WebApplicationCacheQuotaManager.mm in Sources / = {isa = PBXBuildFile; fileRef = A5DEFC1211D5344B00885273 / WebApplicationCacheQuotaManager.mm */; };
324	A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers / = {isa = PBXBuildFile; fileRef = A70936AD0B5608DC00CDB48E / WebDragClient.h */; };	323	A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers / = {isa = PBXBuildFile; fileRef = A70936AD0B5608DC00CDB48E / WebDragClient.h */; };
325	A70936B00B5608DC00CDB48E /* WebDragClient.mm in Sources / = {isa = PBXBuildFile; fileRef = A70936AE0B5608DC00CDB48E / WebDragClient.mm */; };	324	A70936B00B5608DC00CDB48E /* WebDragClient.mm in Sources / = {isa = PBXBuildFile; fileRef = A70936AE0B5608DC00CDB48E / WebDragClient.mm */; };
		325	A7121949120836D0003A999A /* WebCore.framework in Frameworks / = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 / WebCore.framework */; };
326	A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers / = {isa = PBXBuildFile; fileRef = A7D3C5BA0B5773C5002CA450 / WebPasteboardHelper.h */; };	326	A7D3C5BC0B5773C5002CA450 /* WebPasteboardHelper.h in Headers / = {isa = PBXBuildFile; fileRef = A7D3C5BA0B5773C5002CA450 / WebPasteboardHelper.h */; };
327	A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources / = {isa = PBXBuildFile; fileRef = A7D3C5BB0B5773C5002CA450 / WebPasteboardHelper.mm */; };	327	A7D3C5BD0B5773C5002CA450 /* WebPasteboardHelper.mm in Sources / = {isa = PBXBuildFile; fileRef = A7D3C5BB0B5773C5002CA450 / WebPasteboardHelper.mm */; };
328	AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers / = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 / WebDOMOperationsInternal.h */; };	328	AB9FBBBB0F8582B0006ADC43 /* WebDOMOperationsInternal.h in Headers / = {isa = PBXBuildFile; fileRef = AB9FBBBA0F8582B0006ADC43 / WebDOMOperationsInternal.h */; };
Lines 619-624 a/WebKit/WebKit.xcodeproj/project.pbxproj_sec3
619	A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebApplicationCacheQuotaManager.mm; sourceTree = "<group>"; };	619	A5DEFC1211D5344B00885273 /* WebApplicationCacheQuotaManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebApplicationCacheQuotaManager.mm; sourceTree = "<group>"; };
620	A70936AD0B5608DC00CDB48E /* WebDragClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDragClient.h; sourceTree = "<group>"; };	620	A70936AD0B5608DC00CDB48E /* WebDragClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDragClient.h; sourceTree = "<group>"; };
621	A70936AE0B5608DC00CDB48E /* WebDragClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDragClient.mm; sourceTree = "<group>"; };	621	A70936AE0B5608DC00CDB48E /* WebDragClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDragClient.mm; sourceTree = "<group>"; };
		622	A70EB4EC120834A8004B0A3B /* WebCoreTesting.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCoreTesting.framework; sourceTree = BUILT_PRODUCTS_DIR; };
622	A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardHelper.h; sourceTree = "<group>"; };	623	A7D3C5BA0B5773C5002CA450 /* WebPasteboardHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardHelper.h; sourceTree = "<group>"; };
623	A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardHelper.mm; sourceTree = "<group>"; };	624	A7D3C5BB0B5773C5002CA450 /* WebPasteboardHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPasteboardHelper.mm; sourceTree = "<group>"; };
624	AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };	625	AB9FBBBA0F8582B0006ADC43 /* WebDOMOperationsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDOMOperationsInternal.h; sourceTree = "<group>"; };
Lines 746-752 a/WebKit/WebKit.xcodeproj/project.pbxproj_sec4
746	0ACE917310FE47E30096A45F /* OpenGL.framework in Frameworks */,	747	0ACE917310FE47E30096A45F /* OpenGL.framework in Frameworks */,
747	1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */,	748	1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */,
748	9398112F0824BF01008DF038 /* Security.framework in Frameworks */,	749	9398112F0824BF01008DF038 /* Security.framework in Frameworks */,
749	9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */,	750	A7121949120836D0003A999A /* WebCore.framework in Frameworks */,
750	);	751	);
751	runOnlyForDeploymentPostprocessing = 0;	752	runOnlyForDeploymentPostprocessing = 0;
752	};	753	};
Lines 792-797 a/WebKit/WebKit.xcodeproj/project.pbxproj_sec5
792	0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */ = {	793	0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */ = {
793	isa = PBXGroup;	794	isa = PBXGroup;
794	children = (	795	children = (
		796	A70EB4EC120834A8004B0A3B /* WebCoreTesting.framework */,
795	F5C2869402846DCD018635CA /* Carbon.framework */,	797	F5C2869402846DCD018635CA /* Carbon.framework */,
796	F5C2869502846DCD018635CA /* Cocoa.framework */,	798	F5C2869502846DCD018635CA /* Cocoa.framework */,
797	CD8EAC7211CAC9A300774075 /* IOKit.framework */,	799	CD8EAC7211CAC9A300774075 /* IOKit.framework */,

Lines 1-3 a/WebKit/mac/ChangeLog_sec1
- a/WebKit/mac/ChangeLog +14 lines
		1	2010-08-03 MORITA Hajime <morrita@google.com>
		2
		3	DRT should allow test scripts to access WebCore internal states for setup/verification
		4	https://bugs.webkit.org/show_bug.cgi?id=42612
		5
		6	Exposed WebKit::Testing API for extending LayoutTestController.
		7	Note that WebKitTesting.framework is linked with "weak" linkage
		8	and WebKit framework will ship without that.
		9
		10	* Configurations/WebKit.xcconfig:
		11	* WebView/WebFrame.mm:
		12	(-[WebFrame layoutTestController]):
		13	* WebView/WebFramePrivate.h:
		14
1	2010-08-11 Gavin Barraclough <barraclough@apple.com>	15	2010-08-11 Gavin Barraclough <barraclough@apple.com>
2		16
3	Rubber stamps by Darin Adler & Sam Weinig.	17	Rubber stamps by Darin Adler & Sam Weinig.

Lines 48-54 FRAMEWORK_SEARCH_PATHS_macosx = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR) a/WebKit/mac/Configurations/WebKit.xcconfig_sec1
- a/WebKit/mac/Configurations/WebKit.xcconfig -2 / +11 lines
48		48
49	GCC_PREFIX_HEADER = mac/WebKitPrefix.h;	49	GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
50	GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);	50	GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
51	HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(HEADER_SEARCH_PATHS);	51	HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit" $(WEBCORETESTING_HEADERS_DIR) $(HEADER_SEARCH_PATHS);
52	INFOPLIST_FILE = mac/Info.plist;	52	INFOPLIST_FILE = mac/Info.plist;
53	INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));	53	INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
54	INSTALL_PATH_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;	54	INSTALL_PATH_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
Lines 60-66 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions a/WebKit/mac/Configurations/WebKit.xcconfig_sec2
60	OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));	60	OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
61	OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework WebCore;	61	OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework WebCore;
62	OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);	62	OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
63	OTHER_LDFLAGS_macosx = -sub_umbrella WebCore $(OTHER_LDFLAGS);	63	OTHER_LDFLAGS_macosx = -sub_umbrella WebCore $(OTHER_LDFLAGS) -weak_framework WebCoreTesting;
64		64
65	PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));	65	PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
66	PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;	66	PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
Lines 81-86 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADE a/WebKit/mac/Configurations/WebKit.xcconfig_sec3
81	WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;	81	WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
82	WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;	82	WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
83		83
		84	WEBCORETESTING_HEADERS_DIR = $(WEBCORETESTING_HEADERS_DIR_$(CONFIGURATION));
		85	WEBCORETESTING_HEADERS_DIR_Release = $(WEBCORETESTING_HEADERS_engineering);
		86	WEBCORETESTING_HEADERS_DIR_Debug = $(WEBCORETESTING_HEADERS_engineering);
		87	WEBCORETESTING_HEADERS_DIR_Production = $(WEBCORETESTING_HEADERS_DIR_Production_$(REAL_PLATFORM_NAME));
		88	WEBCORETESTING_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCoreTesting.framework/Headers;
		89	WEBCORETESTING_HEADERS_DIR_Production_iphonesimulator = $(WEBCORETESTING_HEADERS_DIR_Production_iphoneos);
		90	WEBCORETESTING_HEADERS_DIR_Production_macosx = $(UMBRELLA_FRAMEWORKS_DIR)/WebCoreTesting.framework/Headers;
		91	WEBCORETESTING_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
		92
84	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));	93	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
85	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);	94	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
86	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);	95	WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);

Lines 90-95 a/WebKit/mac/WebView/WebFrame.mm_sec1
- a/WebKit/mac/WebView/WebFrame.mm +12 lines
90	#import <WebCore/htmlediting.h>	90	#import <WebCore/htmlediting.h>
91	#import <WebCore/markup.h>	91	#import <WebCore/markup.h>
92	#import <WebCore/visible_units.h>	92	#import <WebCore/visible_units.h>
		93	#import <WebCoreTesting/WebCoreTesting.h>
93	#import <WebKitSystemInterface.h>	94	#import <WebKitSystemInterface.h>
94	#import <runtime/JSLock.h>	95	#import <runtime/JSLock.h>
95	#import <runtime/JSObject.h>	96	#import <runtime/JSObject.h>
Lines 1366-1371 static inline WebDataSource dataSource(DocumentLoader loader) a/WebKit/mac/WebView/WebFrame.mm_sec2
1366	return coreFrame->layerTreeAsText();	1367	return coreFrame->layerTreeAsText();
1367	}	1368	}
1368		1369
		1370	- (JSValueRef)layoutTestController
		1371	{
		1372	Frame* coreFrame = _private->coreFrame;
		1373	if (!coreFrame)
		1374	return 0;
		1375	DOMWrapperWorld* world = mainThreadNormalWorld();
		1376	WebCore::JSDOMGlobalObject* globalObject = coreFrame->script()->globalObject(world);
		1377	JSC::ExecState* exec = globalObject->globalExec();
		1378	return toRef(exec, JSValue(WebCore::Testing::createJSLayoutTestControllerFor(exec, globalObject, coreFrame)));
		1379	}
		1380
1369	@end	1381	@end
1370		1382
1371	@implementation WebFrame	1383	@implementation WebFrame

Lines 1-3 a/WebKitTools/ChangeLog_sec1
- a/WebKitTools/ChangeLog +16 lines
		1	2010-08-03 MORITA Hajime <morrita@google.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Extended LayoutTestController object by adding delgation methods
		6	for WebCore::LayoutTestController.
		7	Now window.layoutTestController has methods defined in
		8	WebCore::LayoutTestController.
		9
		10	* DumpRenderTree/LayoutTestController.cpp:
		11	(LayoutTestController::makeDelegationMethods):
		12	(LayoutTestController::makeWindowObject):
		13	* DumpRenderTree/LayoutTestController.h:
		14	* DumpRenderTree/mac/FrameLoadDelegate.mm:
		15	(-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]):
		16
1	2010-08-11 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>	17	2010-08-11 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
2		18
3	Unreviewed. Adding my Collabora personality to the list.	19	Unreviewed. Adding my Collabora personality to the list.

Lines 42-48 public: a/WebKitTools/DumpRenderTree/LayoutTestController.h_sec1
- a/WebKitTools/DumpRenderTree/LayoutTestController.h -1 / +2 lines
42	static PassRefPtr<LayoutTestController> create(const std::string& testPathOrURL, const std::string& expectedPixelHash);	42	static PassRefPtr<LayoutTestController> create(const std::string& testPathOrURL, const std::string& expectedPixelHash);
43	~LayoutTestController();	43	~LayoutTestController();
44		44
45	void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);	45	void makeDelegationMethods(JSContextRef context, JSObjectRef thisObject, JSValueRef webCoreLayoutTestController, JSValueRef* exception);
		46	void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception, JSValueRef webCorelayoutTestContoller = 0);
46		47
47	void addDisallowedURL(JSStringRef url);	48	void addDisallowedURL(JSStringRef url);
48	void clearAllApplicationCaches();	49	void clearAllApplicationCaches();

Lines 245-251 a/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm_sec1
- a/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm -1 / +2 lines
245	JSValueRef exception = 0;	245	JSValueRef exception = 0;
246		246
247	ASSERT(gLayoutTestController);	247	ASSERT(gLayoutTestController);
248	gLayoutTestController->makeWindowObject(context, globalObject, &exception);	248	JSValueRef webCoreLayoutTestController = [frame layoutTestController];
		249	gLayoutTestController->makeWindowObject(context, globalObject, &exception, webCoreLayoutTestController);
249	ASSERT(!exception);	250	ASSERT(!exception);
250		251
251	gcController->makeWindowObject(context, globalObject, &exception);	252	gcController->makeWindowObject(context, globalObject, &exception);