Changeset 117504 in webkit


Ignore:
Timestamp:
May 17, 2012 3:09:29 PM (12 years ago)
Author:
oliver@apple.com
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:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r117502 r117504  
     12012-05-17  Oliver Hunt  <oliver@apple.com>
     2
     3        Endeavour to make the windows test bot actually able to run tests.
     4        https://bugs.webkit.org/show_bug.cgi?id=86772
     5
     6        Reviewed by Sam Weinig.
     7
     8        Use WEBKIT_EXPORT to get correct export behaviour on windows, rather than
     9        relying on the .def files.
     10
     11        * bindings/js/JSDOMGlobalObject.h:
     12        (JSDOMGlobalObject):
     13        * bindings/scripts/CodeGeneratorJS.pm:
     14        (GenerateHeader):
     15
    1162012-05-17  Beth Dakin  <bdakin@apple.com>
    217

  • trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h

    r112555 r117504  
    3030#include <runtime/JSGlobalObject.h>
    3131#include <runtime/JSGlobalThis.h>
     32
     33#ifndef WEBKIT_EXPORTDATA
     34#define WEBKIT_EXPORTDATA
     35#endif
    3236
    3337namespace WebCore {
    … …  
    7276        DOMWrapperWorld* world() { return m_world.get(); }
    7377
    74         static const JSC::ClassInfo s_info;
     78        static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;
    7579
    7680        static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r116828 r117504  
    777777
    778778    # Class info
    779     push(@headerContent, "    static const JSC::ClassInfo s_info;\n\n");
    780 
     779    if ($interfaceName eq "Node") {
     780        push(@headerContent, "    static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;\n\n");
     781    } else {
     782        push(@headerContent, "    static const JSC::ClassInfo s_info;\n\n");
     783    }
    781784    # Structure ID
    782785    if ($interfaceName eq "DOMWindow") {

  • trunk/Source/WebKit2/ChangeLog

    r117495 r117504  
     12012-05-17  Oliver Hunt  <oliver@apple.com>
     2
     3        Endeavour to make the windows test bot actually able to run tests.
     4        https://bugs.webkit.org/show_bug.cgi?id=86772
     5
     6        Reviewed by Sam Weinig.
     7
     8        Remove the ClassInfo exports from the .def files as we're now using
     9        WEBKIT_EXPORT declarations to get expected behaviour on windows.
     10
     11        * win/WebKit2.def:
     12        * win/WebKit2CFLite.def:
     13
    1142012-05-17  Timothy Hatcher  <timothy@apple.com>
    215

  • trunk/Source/WebKit2/win/WebKit2.def

    r117460 r117504  
    204204        ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
    205205        ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
    206         ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
    207         ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
    208206        ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
    209207        ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z

  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r117324 r117504  
    197197        ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
    198198        ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
    199         ?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
    200         ?s_info@JSDOMGlobalObject@WebCore@@2UClassInfo@JSC@@B
    201199        ?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
    202200        ?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
Note: See TracChangeset for help on using the changeset viewer.