Title: [91733] trunk/Source/WebCore
Revision
91733
Author
[email protected]
Date
2011-07-25 18:03:39 -0700 (Mon, 25 Jul 2011)

Log Message

[chromium] components/mac: Make webcore not depend on CoreAnimation
https://bugs.webkit.org/show_bug.cgi?id=65143

Reviewed by James Robinson.

* platform/chromium/ScrollAnimatorChromiumMac.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (91732 => 91733)


--- trunk/Source/WebCore/ChangeLog	2011-07-26 01:02:33 UTC (rev 91732)
+++ trunk/Source/WebCore/ChangeLog	2011-07-26 01:03:39 UTC (rev 91733)
@@ -1,3 +1,12 @@
+2011-07-25  Nico Weber  <[email protected]>
+
+        [chromium] components/mac: Make webcore not depend on CoreAnimation
+        https://bugs.webkit.org/show_bug.cgi?id=65143
+
+        Reviewed by James Robinson.
+
+        * platform/chromium/ScrollAnimatorChromiumMac.mm:
+
 2011-07-25  Ian Henderson  <[email protected]>
 
         WebFrame should have a method to determine its visual emptiness

Modified: trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm (91732 => 91733)


--- trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm	2011-07-26 01:02:33 UTC (rev 91732)
+++ trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm	2011-07-26 01:03:39 UTC (rev 91733)
@@ -354,6 +354,7 @@
     return aRect;
 }
 
+#if !PLATFORM(CHROMIUM)
 - (CALayer *)layer
 {
     if (!_animator)
@@ -365,6 +366,7 @@
     static CALayer *dummyLayer = [[CALayer alloc] init];
     return dummyLayer;
 }
+#endif
 
 - (void)setUpAnimation:(RetainPtr<ScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(WKScrollbarPainterRef)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
 {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to