Diff
Modified: trunk/LayoutTests/ChangeLog (88624 => 88625)
--- trunk/LayoutTests/ChangeLog 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/LayoutTests/ChangeLog 2011-06-13 03:05:02 UTC (rev 88625)
@@ -1,3 +1,12 @@
+2011-06-12 Dominic Cooney <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ Add window.internals to WebKit2's WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=61073
+
+ * platform/mac-wk2/Skipped: unskip fast/harness/internals-object.html
+
2011-06-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88616.
Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (88624 => 88625)
--- trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-13 03:05:02 UTC (rev 88625)
@@ -1522,9 +1522,6 @@
# http://webkit.org/b/58990
editing/undo/undo-iframe-location-change.html
-# https://bugs.webkit.org/show_bug.cgi?id=61073
-fast/harness/internals-object.html
-
### END OF (1) Classified failures with bug reports
########################################
Modified: trunk/Source/WebKit/win/ChangeLog (88624 => 88625)
--- trunk/Source/WebKit/win/ChangeLog 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Source/WebKit/win/ChangeLog 2011-06-13 03:05:02 UTC (rev 88625)
@@ -1,3 +1,12 @@
+2011-06-12 Dominic Cooney <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ Add window.internals to WebKit2's WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=61073
+
+ * WebKit.vcproj/WebKit.sln: InjectedBundle depends on WebCoreTestSupport
+
2011-06-12 Adam Barth <[email protected]>
Reviewed by Alexey Proskuryakov.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (88624 => 88625)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2011-06-13 03:05:02 UTC (rev 88625)
@@ -122,6 +122,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundle.vcproj", "{CBC3391C-F060-4BF5-A66E-81404168816B}"
ProjectSection(ProjectDependencies) = postProject
{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD} = {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}
+ {83414B15-1C0D-490B-990E-03F4D49170E4} = {83414B15-1C0D-490B-990E-03F4D49170E4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundleGenerated", "..\..\..\..\Tools\WebKitTestRunner\win\InjectedBundleGenerated.vcproj", "{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
Modified: trunk/Tools/ChangeLog (88624 => 88625)
--- trunk/Tools/ChangeLog 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/ChangeLog 2011-06-13 03:05:02 UTC (rev 88625)
@@ -1,3 +1,19 @@
+2011-06-12 Dominic Cooney <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ Add window.internals to WebKit2's WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=61073
+
+ Test: fast/harness/internals-object.html
+
+ * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
+ * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
+ * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didClearWindowForFrame): initialize window.internals
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
2011-06-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88616.
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops (88624 => 88625)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2011-06-13 03:05:02 UTC (rev 88625)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
+ AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
/>
</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops (88624 => 88625)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2011-06-13 03:05:02 UTC (rev 88625)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\InjectedBundle\";"$(ProjectDir)\..\InjectedBundle\Bindings";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\""
+ AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\InjectedBundle\";"$(ProjectDir)\..\InjectedBundle\Bindings";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\WebCoreTestSupport";"$(WebKitLibrariesDir)\include";"$(ConfigurationBuildDir)\obj\InjectedBundle\DerivedSources\""
ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
/>
</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops (88624 => 88625)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2011-06-13 03:05:02 UTC (rev 88625)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
+ AdditionalDependencies="_javascript_Core$(WebKitDLLConfigSuffix).lib WebCoreTestSupport$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
/>
</VisualStudioPropertySheet>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (88624 => 88625)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-13 03:05:02 UTC (rev 88625)
@@ -28,6 +28,7 @@
#include "InjectedBundle.h"
#include "StringFunctions.h"
+#include "WebCoreTestSupport.h"
#include <cmath>
#include <_javascript_Core/JSRetainPtr.h>
#include <WebKit2/WKArray.h>
@@ -616,6 +617,7 @@
InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
+ WebCoreTestSupport::injectInternalsObject(context);
}
void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (88624 => 88625)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2011-06-13 02:17:23 UTC (rev 88624)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2011-06-13 03:05:02 UTC (rev 88625)
@@ -21,6 +21,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 41230F0A138C78DF00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */; };
6510A78211EC643800410867 /* AHEM____.TTF in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77711EC643800410867 /* AHEM____.TTF */; };
6510A78311EC643800410867 /* ColorBits.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77811EC643800410867 /* ColorBits.ttf */; };
6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */; };
@@ -78,6 +79,8 @@
/* Begin PBXFileReference section */
378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+ 41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = ../../Source/WebCore/testing/js/WebCoreTestSupport.h; sourceTree = SOURCE_ROOT; };
6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };
6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };
6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher100.ttf; path = fonts/WebKitWeightWatcher100.ttf; sourceTree = "<group>"; };
@@ -158,6 +161,7 @@
files = (
BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */,
BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */,
+ 41230F0A138C78DF00BCCFCA /* WebCoreTestSupport.dylib in Frameworks */,
BC25194011D15D8B002EBC01 /* _javascript_Core.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -201,6 +205,8 @@
BC7934A411906584005EA8E2 /* Cocoa.framework */,
BC7934AB1190658C005EA8E2 /* WebKit2.framework */,
BCDA2B991191051F00C3BC47 /* _javascript_Core.framework */,
+ 4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */,
+ 41230E16138C78BF00BCCFCA /* WebCoreTestSupport.dylib */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
