Title: [158230] trunk/Source/WebCore
- Revision
- 158230
- Author
- [email protected]
- Date
- 2013-10-29 14:50:47 -0700 (Tue, 29 Oct 2013)
Log Message
Build fix after 158223; make TileController use float for scales.
This matches what we do in other places, and fixes the constant
issue with exporting symbols that include CGFloat.
* WebCore.exp.in:
* platform/graphics/ca/mac/TileController.h:
(WebCore::TileController::scale):
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::setScale):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158229 => 158230)
--- trunk/Source/WebCore/ChangeLog 2013-10-29 21:45:16 UTC (rev 158229)
+++ trunk/Source/WebCore/ChangeLog 2013-10-29 21:50:47 UTC (rev 158230)
@@ -1,3 +1,16 @@
+2013-10-29 Tim Horton <[email protected]>
+
+ Build fix after 158223; make TileController use float for scales.
+
+ This matches what we do in other places, and fixes the constant
+ issue with exporting symbols that include CGFloat.
+
+ * WebCore.exp.in:
+ * platform/graphics/ca/mac/TileController.h:
+ (WebCore::TileController::scale):
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::setScale):
+
2013-10-29 Antti Koivisto <[email protected]>
Try to keep MSVC happy.
Modified: trunk/Source/WebCore/WebCore.exp.in (158229 => 158230)
--- trunk/Source/WebCore/WebCore.exp.in 2013-10-29 21:45:16 UTC (rev 158229)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-10-29 21:50:47 UTC (rev 158230)
@@ -416,7 +416,7 @@
__ZN7WebCore14StorageTracker7trackerEv
__ZN7WebCore14SubframeLoader12allowPluginsENS_28ReasonForCallingAllowPluginsE
__ZN7WebCore14TileController6createEPNS_15PlatformCALayerE
-__ZN7WebCore14TileController8setScaleEd
+__ZN7WebCore14TileController8setScaleEf
__ZN7WebCore14TileController14setTilesOpaqueEb
__ZN7WebCore14TileController15setNeedsDisplayEv
__ZN7WebCore14TileController21setAcceleratesDrawingEb
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (158229 => 158230)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2013-10-29 21:45:16 UTC (rev 158229)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2013-10-29 21:50:47 UTC (rev 158230)
@@ -59,8 +59,8 @@
void setNeedsDisplay();
void setNeedsDisplayInRect(const IntRect&);
- void setScale(CGFloat);
- CGFloat scale() const { return m_scale; }
+ void setScale(float);
+ float scale() const { return m_scale; }
bool acceleratesDrawing() const { return m_acceleratesDrawing; }
void setAcceleratesDrawing(bool);
@@ -216,8 +216,8 @@
IntRect m_primaryTileCoverageRect; // In tile coords.
- CGFloat m_scale;
- CGFloat m_deviceScaleFactor;
+ float m_scale;
+ float m_deviceScaleFactor;
TileCoverage m_tileCoverage;
bool m_isInWindow;
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (158229 => 158230)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-10-29 21:45:16 UTC (rev 158229)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-10-29 21:50:47 UTC (rev 158230)
@@ -202,7 +202,7 @@
return owningGraphicsLayer()->platformCALayerShowRepaintCounter(0);
}
-void TileController::setScale(CGFloat scale)
+void TileController::setScale(float scale)
{
ASSERT(owningGraphicsLayer()->isCommittingChanges());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
