Title: [204619] trunk/Source/WebCore
Revision
204619
Author
[email protected]
Date
2016-08-18 17:55:42 -0700 (Thu, 18 Aug 2016)

Log Message

Windows build fix after r204611. Use the fully qualified name to avoid the ambiguity in VC++.

* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::invokeCallback):
* bindings/js/JSCustomElementInterface.h:
(WebCore::JSCustomElementInterface::invokeCallback):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (204618 => 204619)


--- trunk/Source/WebCore/ChangeLog	2016-08-19 00:50:36 UTC (rev 204618)
+++ trunk/Source/WebCore/ChangeLog	2016-08-19 00:55:42 UTC (rev 204619)
@@ -1,3 +1,12 @@
+2016-08-18  Ryosuke Niwa  <[email protected]>
+
+        Windows build fix after r204611. Use the fully qualified name to avoid the ambiguity in VC++.
+
+        * bindings/js/JSCustomElementInterface.cpp:
+        (WebCore::JSCustomElementInterface::invokeCallback):
+        * bindings/js/JSCustomElementInterface.h:
+        (WebCore::JSCustomElementInterface::invokeCallback):
+
 2016-08-18  Dean Jackson  <[email protected]>
 
         Support passing preferLowPowerToHighPerformance and failIfMajorPerformanceCaveat
@@ -40,7 +49,7 @@
 
 2016-08-18  Ryosuke Niwa  <[email protected]>
 
-        Building test fix after r204611.
+        Binding test fix after r204611.
 
         * bindings/scripts/test/TestObj.idl:
 

Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (204618 => 204619)


--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp	2016-08-19 00:50:36 UTC (rev 204618)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp	2016-08-19 00:55:42 UTC (rev 204619)
@@ -151,7 +151,7 @@
     ASSERT(wrappedElement->isCustomElement());
 }
 
-void JSCustomElementInterface::invokeCallback(Element& element, JSObject* callback, const Function<void(ExecState*, MarkedArgumentBuffer&)>& addArguments)
+void JSCustomElementInterface::invokeCallback(Element& element, JSObject* callback, const WTF::Function<void(ExecState*, MarkedArgumentBuffer&)>& addArguments)
 {
     if (!canInvokeCallback())
         return;

Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h (204618 => 204619)


--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h	2016-08-19 00:50:36 UTC (rev 204618)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h	2016-08-19 00:55:42 UTC (rev 204619)
@@ -91,7 +91,7 @@
 private:
     JSCustomElementInterface(const QualifiedName&, JSC::JSObject* callback, JSDOMGlobalObject*);
 
-    void invokeCallback(Element&, JSC::JSObject* callback, const Function<void(JSC::ExecState*, JSC::MarkedArgumentBuffer&)>& addArguments = {});
+    void invokeCallback(Element&, JSC::JSObject* callback, const WTF::Function<void(JSC::ExecState*, JSC::MarkedArgumentBuffer&)>& addArguments = {});
 
     QualifiedName m_name;
     JSC::Weak<JSC::JSObject> m_constructor;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to