Title: [117182] trunk/Source/WebCore
- Revision
- 117182
- Author
- [email protected]
- Date
- 2012-05-15 16:36:02 -0700 (Tue, 15 May 2012)
Log Message
[chromium] ScrollElasticityController.mm doesn't compile with the 10.6 SDK on mac
https://bugs.webkit.org/show_bug.cgi?id=86544
Reviewed by Anders Carlsson.
This is a build fix for now until we can figure out what a
better way to approach this is.
* platform/mac/ScrollElasticityController.mm:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117181 => 117182)
--- trunk/Source/WebCore/ChangeLog 2012-05-15 23:31:43 UTC (rev 117181)
+++ trunk/Source/WebCore/ChangeLog 2012-05-15 23:36:02 UTC (rev 117182)
@@ -1,3 +1,16 @@
+2012-05-15 Dirk Pranke <[email protected]>
+
+ [chromium] ScrollElasticityController.mm doesn't compile with the 10.6 SDK on mac
+ https://bugs.webkit.org/show_bug.cgi?id=86544
+
+ Reviewed by Anders Carlsson.
+
+ This is a build fix for now until we can figure out what a
+ better way to approach this is.
+
+ * platform/mac/ScrollElasticityController.mm:
+ (WebCore):
+
2012-05-15 Nate Chapin <[email protected]>
MainResourceLoader::load() always returns true, so make it return
Modified: trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm (117181 => 117182)
--- trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm 2012-05-15 23:31:43 UTC (rev 117181)
+++ trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm 2012-05-15 23:36:02 UTC (rev 117182)
@@ -71,7 +71,8 @@
static const float rubberbandDirectionLockStretchRatio = 1;
static const float rubberbandMinimumRequiredDeltaBeforeStretch = 10;
-#if defined(BUILDING_ON_LEOPARD) || defined(BULDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION)
+#if defined(BUILDING_ON_LEOPARD) || defined(BULDING_ON_SNOW_LEOPARD) || \
+ defined(BUILDING_ON_LION) || PLATFORM(CHROMIUM)
static const float rubberbandStiffness = 20;
static const float rubberbandAmplitude = 0.31f;
static const float rubberbandPeriod = 1.6f;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
