Changeset 158230 in webkit


Ignore:
Timestamp:
Oct 29, 2013 2:50:47 PM (10 years ago)
Author:
timothy_horton@apple.com
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):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r158229 r158230  
     12013-10-29  Tim Horton  <timothy_horton@apple.com>
     2
     3        Build fix after 158223; make TileController use float for scales.
     4
     5        This matches what we do in other places, and fixes the constant
     6        issue with exporting symbols that include CGFloat.
     7
     8        * WebCore.exp.in:
     9        * platform/graphics/ca/mac/TileController.h:
     10        (WebCore::TileController::scale):
     11        * platform/graphics/ca/mac/TileController.mm:
     12        (WebCore::TileController::setScale):
     13
    1142013-10-29  Antti Koivisto  <antti@apple.com>
    215

  • trunk/Source/WebCore/WebCore.exp.in

    r158226 r158230  
    417417__ZN7WebCore14SubframeLoader12allowPluginsENS_28ReasonForCallingAllowPluginsE
    418418__ZN7WebCore14TileController6createEPNS_15PlatformCALayerE
    419 __ZN7WebCore14TileController8setScaleEd
     419__ZN7WebCore14TileController8setScaleEf
    420420__ZN7WebCore14TileController14setTilesOpaqueEb
    421421__ZN7WebCore14TileController15setNeedsDisplayEv

  • trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h

    r158122 r158230  
    6060    void setNeedsDisplayInRect(const IntRect&);
    6161
    62     void setScale(CGFloat);
    63     CGFloat scale() const { return m_scale; }
     62    void setScale(float);
     63    float scale() const { return m_scale; }
    6464
    6565    bool acceleratesDrawing() const { return m_acceleratesDrawing; }
    … …  
    217217    IntRect m_primaryTileCoverageRect; // In tile coords.
    218218
    219     CGFloat m_scale;
    220     CGFloat m_deviceScaleFactor;
     219    float m_scale;
     220    float m_deviceScaleFactor;
    221221
    222222    TileCoverage m_tileCoverage;

  • trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm

    r158160 r158230  
    203203}
    204204
    205 void TileController::setScale(CGFloat scale)
     205void TileController::setScale(float scale)
    206206{
    207207    ASSERT(owningGraphicsLayer()->isCommittingChanges());
Note: See TracChangeset for help on using the changeset viewer.