Title: [164767] trunk/Source/WebCore
- Revision
- 164767
- Author
- simon.fra...@apple.com
- Date
- 2014-02-26 17:57:10 -0800 (Wed, 26 Feb 2014)
Log Message
Fix the build with some compiler configurations.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::didAddVerticalScrollbar):
(WebCore::ScrollAnimatorMac::didAddHorizontalScrollbar):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164766 => 164767)
--- trunk/Source/WebCore/ChangeLog 2014-02-27 01:53:02 UTC (rev 164766)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 01:57:10 UTC (rev 164767)
@@ -1,3 +1,12 @@
+2014-02-26 Simon Fraser <simon.fra...@apple.com>
+
+ Fix the build with some compiler configurations.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
+ (WebCore::ScrollAnimatorMac::didAddVerticalScrollbar):
+ (WebCore::ScrollAnimatorMac::didAddHorizontalScrollbar):
+
2014-02-26 Myles C. Maxfield <mmaxfi...@apple.com>
Ranges given to createMarkupInternal might not be canonicalized
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (164766 => 164767)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2014-02-27 01:53:02 UTC (rev 164766)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2014-02-27 01:57:10 UTC (rev 164767)
@@ -650,7 +650,7 @@
m_scrollbarPainterControllerDelegate = adoptNS([[WebScrollbarPainterControllerDelegate alloc] initWithScrollableArea:scrollableArea]);
m_scrollbarPainterController = [[[NSClassFromString(@"NSScrollerImpPair") alloc] init] autorelease];
- [m_scrollbarPainterController setDelegate:m_scrollbarPainterControllerDelegate.get()];
+ [m_scrollbarPainterController setDelegate:(id)m_scrollbarPainterControllerDelegate.get()];
[m_scrollbarPainterController setScrollerStyle:recommendedScrollerStyle()];
}
@@ -936,7 +936,7 @@
ASSERT(!m_verticalScrollbarPainterDelegate);
m_verticalScrollbarPainterDelegate = adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollbar:scrollbar]);
- [painter setDelegate:m_verticalScrollbarPainterDelegate.get()];
+ [painter setDelegate:(id)m_verticalScrollbarPainterDelegate.get()];
if (GraphicsLayer* layer = scrollbar->scrollableArea()->layerForVerticalScrollbar())
[painter setLayer:layer->platformLayer()];
@@ -968,7 +968,7 @@
ASSERT(!m_horizontalScrollbarPainterDelegate);
m_horizontalScrollbarPainterDelegate = adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollbar:scrollbar]);
- [painter setDelegate:m_horizontalScrollbarPainterDelegate.get()];
+ [painter setDelegate:(id)m_horizontalScrollbarPainterDelegate.get()];
if (GraphicsLayer* layer = scrollbar->scrollableArea()->layerForHorizontalScrollbar())
[painter setLayer:layer->platformLayer()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
