Diff
Modified: trunk/LayoutTests/ChangeLog (89529 => 89530)
--- trunk/LayoutTests/ChangeLog 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/LayoutTests/ChangeLog 2011-06-23 05:09:24 UTC (rev 89530)
@@ -1,3 +1,12 @@
+2011-06-22 Dominic Cooney <[email protected]>
+
+ Reviewed by Mark Rowe.
+
+ 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-22 Sam Weinig <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (89529 => 89530)
--- trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-23 05:09:24 UTC (rev 89530)
@@ -1555,9 +1555,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/WebCore/ChangeLog (89529 => 89530)
--- trunk/Source/WebCore/ChangeLog 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Source/WebCore/ChangeLog 2011-06-23 05:09:24 UTC (rev 89530)
@@ -1,3 +1,13 @@
+2011-06-22 Dominic Cooney <[email protected]>
+
+ Reviewed by Mark Rowe.
+
+ Add window.internals to WebKit2's WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=61073
+
+ * Configurations/WebCoreTestSupport.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+
2011-06-22 Dimitri Glazkov <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (89529 => 89530)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2011-06-23 05:09:24 UTC (rev 89530)
@@ -29,10 +29,12 @@
PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
-INSTALL_PATH_Debug = @executable_path;
-INSTALL_PATH_Release = $(INSTALL_PATH_Debug);
INSTALL_PATH_Production = /usr/local/lib;
+LD_DYLIB_INSTALL_NAME = $(LD_DYLIB_INSTALL_NAME_$(CONFIGURATION));
+LD_DYLIB_INSTALL_NAME_Debug = @rpath/$(EXECUTABLE_PATH);
+LD_DYLIB_INSTALL_NAME_Release = $(LD_DYLIB_INSTALL_NAME_Debug);
+
PRODUCT_NAME = WebCoreTestSupport;
EXECUTABLE_PREFIX = lib;
EXPORTED_SYMBOLS_FILE = ;
Modified: trunk/Source/WebKit/win/ChangeLog (89529 => 89530)
--- trunk/Source/WebKit/win/ChangeLog 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Source/WebKit/win/ChangeLog 2011-06-23 05:09:24 UTC (rev 89530)
@@ -1,3 +1,12 @@
+2011-06-22 Dominic Cooney <[email protected]>
+
+ Reviewed by Mark Rowe.
+
+ 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-20 Dimitri Glazkov <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (89529 => 89530)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2011-06-23 05:09:24 UTC (rev 89530)
@@ -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 (89529 => 89530)
--- trunk/Tools/ChangeLog 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/ChangeLog 2011-06-23 05:09:24 UTC (rev 89530)
@@ -1,3 +1,20 @@
+2011-06-22 Dominic Cooney <[email protected]>
+
+ Reviewed by Mark Rowe.
+
+ Add window.internals to WebKit2's WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=61073
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pxbproj:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:
+ * WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops:
+ * WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didClearWindowForFrame):
+ * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
2011-06-22 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (89529 => 89530)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2011-06-23 05:09:24 UTC (rev 89530)
@@ -22,6 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OTHER_LDFLAGS = -sectcreate __DATA Ahem qt/fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf
+LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree
GCC_ENABLE_OBJC_EXCEPTIONS = YES
GCC_PREFIX_HEADER = DumpRenderTreePrefix.h
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2011-06-23 05:09:24 UTC (rev 89530)
@@ -23,7 +23,7 @@
#include "CompilerVersion.xcconfig"
-HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ${SRCROOT}/../../Source/_javascript_Core/icu;
+HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ${SRCROOT}/../../Source/_javascript_Core/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
GCC_PREPROCESSOR_DEFINITIONS = ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
DEBUG_INFORMATION_FORMAT = dwarf
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2011-06-23 05:09:24 UTC (rev 89530)
@@ -21,6 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../..";
PRODUCT_NAME = WebKitTestRunnerInjectedBundle;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops 2011-06-23 05:09:24 UTC (rev 89530)
@@ -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 (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCommon.vsprops 2011-06-23 05:09:24 UTC (rev 89530)
@@ -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 (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundleCoreFoundation.vsprops 2011-06-23 05:09:24 UTC (rev 89530)
@@ -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 (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-23 05:09:24 UTC (rev 89530)
@@ -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/InjectedBundle/qt/InjectedBundle.pro (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro 2011-06-23 05:09:24 UTC (rev 89530)
@@ -61,6 +61,7 @@
$$PWD/../../../../Source/_javascript_Core/wtf/unicode \
$$PWD/../../../../Source/WebCore \
$$PWD/../../../../Source/WebCore/platform/text \
+ $$PWD/../../../../Source/WebCore/testing/js \
$$PWD/../../../../Source/WebKit2 \
$$PWD/../../../../Source/WebKit2/Shared \
$$OUTPUT_DIR/include/QtWebKit \
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (89529 => 89530)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2011-06-23 04:54:18 UTC (rev 89529)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2011-06-23 05:09:24 UTC (rev 89530)
@@ -33,6 +33,7 @@
6510A78B11EC643800410867 /* WebKitWeightWatcher800.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A78011EC643800410867 /* WebKitWeightWatcher800.ttf */; };
6510A78C11EC643800410867 /* WebKitWeightWatcher900.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6510A78111EC643800410867 /* WebKitWeightWatcher900.ttf */; };
65EB85A011EC67CC0034D300 /* ActivateFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65EB859F11EC67CC0034D300 /* ActivateFonts.mm */; };
+ A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */; };
BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4E8120E03D800826C0C /* JSGCController.cpp */; };
BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934A411906584005EA8E2 /* Cocoa.framework */; };
@@ -78,6 +79,8 @@
/* Begin PBXFileReference section */
378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+ 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };
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>"; };
@@ -159,6 +162,7 @@
BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */,
BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */,
BC25194011D15D8B002EBC01 /* _javascript_Core.framework in Frameworks */,
+ A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -201,6 +205,8 @@
BC7934A411906584005EA8E2 /* Cocoa.framework */,
BC7934AB1190658C005EA8E2 /* WebKit2.framework */,
BCDA2B991191051F00C3BC47 /* _javascript_Core.framework */,
+ 4181731B138AD39D0057AAA4 /* WebCoreTestSupport.h */,
+ 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */,
);
name = "External Frameworks and Libraries";
sourceTree = "<group>";
