Title: [117504] trunk/Source
- Revision
- 117504
- Author
- oli...@apple.com
- Date
- 2012-05-17 15:09:29 -0700 (Thu, 17 May 2012)
Log Message
Endeavour to make the windows test bot actually able to run tests.
https://bugs.webkit.org/show_bug.cgi?id=86772
Reviewed by Sam Weinig.
Source/WebCore:
Use WEBKIT_EXPORT to get correct export behaviour on windows, rather than
relying on the .def files.
* bindings/js/JSDOMGlobalObject.h:
(JSDOMGlobalObject):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
Source/WebKit2:
Remove the ClassInfo exports from the .def files as we're now using
WEBKIT_EXPORT declarations to get expected behaviour on windows.
* win/WebKit2.def:
* win/WebKit2CFLite.def:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117503 => 117504)
--- trunk/Source/WebCore/ChangeLog 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebCore/ChangeLog 2012-05-17 22:09:29 UTC (rev 117504)
@@ -1,3 +1,18 @@
+2012-05-17 Oliver Hunt <oli...@apple.com>
+
+ Endeavour to make the windows test bot actually able to run tests.
+ https://bugs.webkit.org/show_bug.cgi?id=86772
+
+ Reviewed by Sam Weinig.
+
+ Use WEBKIT_EXPORT to get correct export behaviour on windows, rather than
+ relying on the .def files.
+
+ * bindings/js/JSDOMGlobalObject.h:
+ (JSDOMGlobalObject):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+
2012-05-17 Beth Dakin <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=86266
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h (117503 => 117504)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2012-05-17 22:09:29 UTC (rev 117504)
@@ -30,6 +30,10 @@
#include <runtime/JSGlobalObject.h>
#include <runtime/JSGlobalThis.h>
+#ifndef WEBKIT_EXPORTDATA
+#define WEBKIT_EXPORTDATA
+#endif
+
namespace WebCore {
class Document;
@@ -71,7 +75,7 @@
DOMWrapperWorld* world() { return m_world.get(); }
- static const JSC::ClassInfo s_info;
+ static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;
static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
{
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (117503 => 117504)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-05-17 22:09:29 UTC (rev 117504)
@@ -776,8 +776,11 @@
}
# Class info
- push(@headerContent, " static const JSC::ClassInfo s_info;\n\n");
-
+ if ($interfaceName eq "Node") {
+ push(@headerContent, " static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;\n\n");
+ } else {
+ push(@headerContent, " static const JSC::ClassInfo s_info;\n\n");
+ }
# Structure ID
if ($interfaceName eq "DOMWindow") {
$structureFlags{"JSC::ImplementsHasInstance"} = 1;
Modified: trunk/Source/WebKit2/ChangeLog (117503 => 117504)
--- trunk/Source/WebKit2/ChangeLog 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-17 22:09:29 UTC (rev 117504)
@@ -1,3 +1,16 @@
+2012-05-17 Oliver Hunt <oli...@apple.com>
+
+ Endeavour to make the windows test bot actually able to run tests.
+ https://bugs.webkit.org/show_bug.cgi?id=86772
+
+ Reviewed by Sam Weinig.
+
+ Remove the ClassInfo exports from the .def files as we're now using
+ WEBKIT_EXPORT declarations to get expected behaviour on windows.
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-05-17 Timothy Hatcher <timo...@apple.com>
Make the docked Web Inspector use autoresizing masks so the view doesn't jitter when
Modified: trunk/Source/WebKit2/win/WebKit2.def (117503 => 117504)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-05-17 22:09:29 UTC (rev 117504)
@@ -203,8 +203,6 @@
?remove@String@WTF@@QAEXIH@Z
?reverseFind@StringImpl@WTF@@QAEI_WI@Z
?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
- ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
- ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (117503 => 117504)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-05-17 22:04:49 UTC (rev 117503)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-05-17 22:09:29 UTC (rev 117504)
@@ -196,8 +196,6 @@
?remove@String@WTF@@QAEXIH@Z
?reverseFind@StringImpl@WTF@@QAEI_WI@Z
?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
- ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
- ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
