Changeset 166307 in webkit

Timestamp:

Mar 26, 2014 12:21:49 PM (10 years ago)

Author:

Brent Fulgham

Message:

Source/JavaScriptCore: Unreviewed build fix.

• runtime/JSCell.h: VS2013 confused about argument type.

Source/WebCore: Unreviewed test correction.

Because of the way DRT on Windows links to WebCore, having the implementaion of the update
method in the header caused a runtime failure due to duplicate symbols being bound to the
compilation unit.

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Moved from header.

• accessibility/AXObjectCache.h:

(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Deleted.

Source/WebKit: Unreviewed build/test correction.

• WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export the AXObjectCache::setEnhancedUserInterfaceEnabled

set function.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSCell.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/AXObjectCache.cpp (modified) (1 diff)
• WebCore/accessibility/AXObjectCache.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-03-26  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix.
+
+        * runtime/JSCell.h: VS2013 confused about argument type.
+
 2014-03-26  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -93 +93 @@
     bool isProxy() const;
     bool inherits(const ClassInfo*) const;
-    bool isAPIValueWrapper() const;
+    JS_EXPORT_PRIVATE bool isAPIValueWrapper() const;
 
     JSType type() const;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed test correction.
+
+        Because of the way DRT on Windows links to WebCore, having the implementaion of the update
+        method in the header caused a runtime failure due to duplicate symbols being bound to the
+        compilation unit.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Moved from header.
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Deleted.
+
 2014-03-26  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -119 +119 @@
 }
 
+void AXObjectCache::setEnhancedUserInterfaceAccessibility(bool flag)
+{
+    gAccessibilityEnhancedUserInterfaceEnabled = flag;
+}
+
 AXObjectCache::AXObjectCache(Document& document)
     : m_document(document)

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -132 +132 @@
 
     // Enhanced user interface accessibility can be toggled by the assistive technology.
-    static void setEnhancedUserInterfaceAccessibility(bool flag) { gAccessibilityEnhancedUserInterfaceEnabled = flag; }
+    static void setEnhancedUserInterfaceAccessibility(bool flag);
     
     static bool accessibilityEnabled() { return gAccessibilityEnabled; }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2014-03-26  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build/test correction.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export the AXObjectCache::setEnhancedUserInterfaceEnabled
+        set function.
+
 2014-03-22  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

@@ -477 +477 @@
         symbolWithPointer(?gAccessibilityEnhancedUserInterfaceEnabled@AXObjectCache@WebCore@@0_NA, ?gAccessibilityEnhancedUserInterfaceEnabled@AXObjectCache@WebCore@@0_NA)
         symbolWithPointer(?disableAccessibility@AXObjectCache@WebCore@@SAXXZ, ?disableAccessibility@AXObjectCache@WebCore@@SAXXZ)
+        symbolWithPointer(?setEnhancedUserInterfaceAccessibility@AXObjectCache@WebCore@@SAX_N@Z, ?setEnhancedUserInterfaceAccessibility@AXObjectCache@WebCore@@SAX_N@Z)
         symbolWithPointer(?sessionID@Page@WebCore@@QBE?AVSessionID@2@XZ, ?sessionID@Page@WebCore@@QEBA?AVSessionID@2@XZ)
         symbolWithPointer(?resourceForURL@MemoryCache@WebCore@@QAEPAVCachedResource@2@ABVURL@2@VSessionID@2@@Z, ?resourceForURL@MemoryCache@WebCore@@QEAAPEAVCachedResource@2@AEBVURL@2@VSessionID@2@@Z)