Title: [166307] trunk/Source
Revision
166307
Author
bfulg...@apple.com
Date
2014-03-26 12:21:49 -0700 (Wed, 26 Mar 2014)

Log Message

Source/_javascript_Core: 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.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (166306 => 166307)


--- trunk/Source/_javascript_Core/ChangeLog	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-03-26 19:21:49 UTC (rev 166307)
@@ -1,3 +1,9 @@
+2014-03-26  Brent Fulgham  <bfulg...@apple.com>
+
+        Unreviewed build fix.
+
+        * runtime/JSCell.h: VS2013 confused about argument type.
+
 2014-03-26  Zoltan Horvath  <zol...@webkit.org>
 
         [CSS Shapes] Remove shape-inside support

Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (166306 => 166307)


--- trunk/Source/_javascript_Core/runtime/JSCell.h	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/_javascript_Core/runtime/JSCell.h	2014-03-26 19:21:49 UTC (rev 166307)
@@ -92,7 +92,7 @@
     bool isGetterSetter() const;
     bool isProxy() const;
     bool inherits(const ClassInfo*) const;
-    bool isAPIValueWrapper() const;
+    JS_EXPORT_PRIVATE bool isAPIValueWrapper() const;
 
     JSType type() const;
     IndexingType indexingType() const;

Modified: trunk/Source/WebCore/ChangeLog (166306 => 166307)


--- trunk/Source/WebCore/ChangeLog	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/WebCore/ChangeLog	2014-03-26 19:21:49 UTC (rev 166307)
@@ -1,3 +1,16 @@
+2014-03-26  Brent Fulgham  <bfulg...@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.no...@apple.com>
 
         REGRESSION(r162679): Poster image visible under the video

Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (166306 => 166307)


--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2014-03-26 19:21:49 UTC (rev 166307)
@@ -118,6 +118,11 @@
     gAccessibilityEnabled = false;
 }
 
+void AXObjectCache::setEnhancedUserInterfaceAccessibility(bool flag)
+{
+    gAccessibilityEnhancedUserInterfaceEnabled = flag;
+}
+
 AXObjectCache::AXObjectCache(Document& document)
     : m_document(document)
     , m_notificationPostTimer(this, &AXObjectCache::notificationPostTimerFired)

Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (166306 => 166307)


--- trunk/Source/WebCore/accessibility/AXObjectCache.h	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h	2014-03-26 19:21:49 UTC (rev 166307)
@@ -131,7 +131,7 @@
     static void disableAccessibility();
 
     // 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; }
     static bool accessibilityEnhancedUserInterfaceEnabled() { return gAccessibilityEnhancedUserInterfaceEnabled; }

Modified: trunk/Source/WebKit/ChangeLog (166306 => 166307)


--- trunk/Source/WebKit/ChangeLog	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/WebKit/ChangeLog	2014-03-26 19:21:49 UTC (rev 166307)
@@ -1,3 +1,10 @@
+2014-03-26  Brent Fulgham  <bfulg...@apple.com>
+
+        Unreviewed build/test correction.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export the AXObjectCache::setEnhancedUserInterfaceEnabled
+        set function.
+
 2014-03-22  Darin Adler  <da...@apple.com>
 
         Remove String::deprecatedCharacters

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (166306 => 166307)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in	2014-03-26 19:20:58 UTC (rev 166306)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in	2014-03-26 19:21:49 UTC (rev 166307)
@@ -476,6 +476,7 @@
         symbolWithPointer(?visibleContentRect@ScrollableArea@WebCore@@QBE?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z, ?visibleContentRect@ScrollableArea@WebCore@@QEBA?AVIntRect@2@W4VisibleContentRectBehavior@12@@Z)
         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)
         symbolWithPointer(?makeDOMBindingsTypeErrorStringInternal@WebCore@@YA?AVString@WTF@@PBDZZ, ?makeDOMBindingsTypeErrorStringInternal@WebCore@@YA?AVString@WTF@@PEBDZZ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to