Title: [210877] branches/safari-603-branch/Source/WebCore
- Revision
- 210877
- Author
- [email protected]
- Date
- 2017-01-18 12:43:34 -0800 (Wed, 18 Jan 2017)
Log Message
Merge r210762. rdar://problem/29883469
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210876 => 210877)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:31 UTC (rev 210876)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:34 UTC (rev 210877)
@@ -1,5 +1,17 @@
2017-01-18 Matthew Hanson <[email protected]>
+ Merge r210762. rdar://problem/29883469
+
+ 2017-01-13 Alex Christensen <[email protected]>
+
+ Fix WinCairo build after r210753.
+ https://bugs.webkit.org/show_bug.cgi?id=166730
+
+ * platform/WebGLStateTracker.h:
+ WTF::Function apparently needs to explicitly be differentiated from JSC::Attribute Function in PropertySlot.h.
+
+2017-01-18 Matthew Hanson <[email protected]>
+
Merge r210753. rdar://problem/29883469
2017-01-13 Chris Dumez <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/platform/WebGLStateTracker.h (210876 => 210877)
--- branches/safari-603-branch/Source/WebCore/platform/WebGLStateTracker.h 2017-01-18 20:43:31 UTC (rev 210876)
+++ branches/safari-603-branch/Source/WebCore/platform/WebGLStateTracker.h 2017-01-18 20:43:34 UTC (rev 210877)
@@ -32,7 +32,7 @@
class WebGLStateTracker {
public:
- using StateChangeHandler = Function<void(bool isUsingWebGL)>;
+ using StateChangeHandler = WTF::Function<void(bool isUsingWebGL)>;
WEBCORE_EXPORT explicit WebGLStateTracker(StateChangeHandler&&);
enum WebGLContextCounterType { };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
