Changeset 139791 in webkit


Ignore:
Timestamp:
Jan 15, 2013, 2:20:51 PM (13 years ago)
Author:
andersca@apple.com
Message:

Rename LayerTreeHostCAMac to LayerTreeHostMac.

Rubber-stamped by Deth Bakin.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/LayerTreeHost.cpp:
  • WebProcess/WebPage/mac/LayerTreeHostMac.h: Renamed from Source/WebKit2/WebProcess/WebPage/ca/mac/LayerTreeHostCAMac.h.
  • WebProcess/WebPage/mac/LayerTreeHostMac.mm: Renamed from Source/WebKit2/WebProcess/WebPage/ca/mac/LayerTreeHostCAMac.mm.
Location:
trunk/Source/WebKit2
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r139781 r139791  
     12013-01-15  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename LayerTreeHostCAMac to LayerTreeHostMac.
     4
     5        Rubber-stamped by Deth Bakin.
     6
     7        * WebKit2.xcodeproj/project.pbxproj:
     8        * WebProcess/WebPage/LayerTreeHost.cpp:
     9        * WebProcess/WebPage/mac/LayerTreeHostMac.h: Renamed from Source/WebKit2/WebProcess/WebPage/ca/mac/LayerTreeHostCAMac.h.
     10        * WebProcess/WebPage/mac/LayerTreeHostMac.mm: Renamed from Source/WebKit2/WebProcess/WebPage/ca/mac/LayerTreeHostCAMac.mm.
     11
    1122013-01-15  Dominik Röttsches  <dominik.rottsches@intel.com>
    213

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r139240 r139791  
    195195                1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
    196196                1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */; };
     197                1A97E07616A5F9E0000BC9E5 /* LayerTreeHostMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A97E07316A5F578000BC9E5 /* LayerTreeHostMac.h */; };
     198                1A97E07716A5F9E0000BC9E5 /* LayerTreeHostMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A97E07416A5F578000BC9E5 /* LayerTreeHostMac.mm */; };
    197199                1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */; };
    198200                1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */; };
    … …  
    987989                C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */; };
    988990                C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */; };
    989                 C03A136C133BEBF900D767D1 /* LayerTreeHostCAMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C03A136B133BEBF900D767D1 /* LayerTreeHostCAMac.mm */; };
    990991                C064504A133BE709003470E2 /* LayerTreeHostCA.h in Headers */ = {isa = PBXBuildFile; fileRef = C098A053133BE1C500B199A4 /* LayerTreeHostCA.h */; };
    991992                C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06C6093124C14430001682F /* WebPageCreationParameters.cpp */; };
    … …  
    998999                C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA451209E2BA00A49D01 /* Module.cpp */; };
    9991000                C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E3AA441209E2BA00A49D01 /* Module.h */; };
    1000                 C0FA52431345694A0028E8C2 /* LayerTreeHostCAMac.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FA52421345694A0028E8C2 /* LayerTreeHostCAMac.h */; };
    10011001                C517388112DF8F4F00EE3F47 /* DragControllerAction.h in Headers */ = {isa = PBXBuildFile; fileRef = C517388012DF8F4F00EE3F47 /* DragControllerAction.h */; };
    10021002                C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5237F5F12441CA300780472 /* WebEditorClientMac.mm */; };
    … …  
    14241424                1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
    14251425                1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeContextMac.mm; sourceTree = "<group>"; };
     1426                1A97E07316A5F578000BC9E5 /* LayerTreeHostMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHostMac.h; sourceTree = "<group>"; };
     1427                1A97E07416A5F578000BC9E5 /* LayerTreeHostMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeHostMac.mm; sourceTree = "<group>"; };
    14261428                1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginComplexTextInputState.h; sourceTree = "<group>"; };
    14271429                1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    22852287                C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebTouchEvent.cpp; sourceTree = "<group>"; };
    22862288                C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlatformTouchPoint.cpp; sourceTree = "<group>"; };
    2287                 C03A136B133BEBF900D767D1 /* LayerTreeHostCAMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeHostCAMac.mm; sourceTree = "<group>"; };
    22882289                C06C6093124C14430001682F /* WebPageCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageCreationParameters.cpp; sourceTree = "<group>"; };
    22892290                C06C6094124C14430001682F /* WebPageCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageCreationParameters.h; sourceTree = "<group>"; };
    … …  
    23012302                C0E3AA451209E2BA00A49D01 /* Module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Module.cpp; sourceTree = "<group>"; };
    23022303                C0E3AA481209E45000A49D01 /* ModuleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ModuleMac.mm; sourceTree = "<group>"; };
    2303                 C0FA52421345694A0028E8C2 /* LayerTreeHostCAMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHostCAMac.h; sourceTree = "<group>"; };
    23042304                C517388012DF8F4F00EE3F47 /* DragControllerAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragControllerAction.h; sourceTree = "<group>"; };
    23052305                C5237F5F12441CA300780472 /* WebEditorClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEditorClientMac.mm; sourceTree = "<group>"; };
    … …  
    40854085                        isa = PBXGroup;
    40864086                        children = (
     4087                                1A97E07316A5F578000BC9E5 /* LayerTreeHostMac.h */,
     4088                                1A97E07416A5F578000BC9E5 /* LayerTreeHostMac.mm */,
    40874089                                1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */,
    40884090                                1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */,
    … …  
    42824284                        isa = PBXGroup;
    42834285                        children = (
    4284                                 C0FA52421345694A0028E8C2 /* LayerTreeHostCAMac.h */,
    4285                                 C03A136B133BEBF900D767D1 /* LayerTreeHostCAMac.mm */,
    42864286                        );
    42874287                        path = mac;
    … …  
    46524652                                1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */,
    46534653                                C064504A133BE709003470E2 /* LayerTreeHostCA.h in Headers */,
    4654                                 C0FA52431345694A0028E8C2 /* LayerTreeHostCAMac.h in Headers */,
    46554654                                51A7F2F3125BF820008AEB1D /* Logging.h in Headers */,
    46564655                                BCC56F791159957D001CCAF9 /* MachPort.h in Headers */,
    … …  
    50715070                                E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */,
    50725071                                E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */,
     5072                                1A97E07616A5F9E0000BC9E5 /* LayerTreeHostMac.h in Headers */,
    50735073                        );
    50745074                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    56305630                                1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */,
    56315631                                C0D74DDE133BE2D90089CD44 /* LayerTreeHostCA.cpp in Sources */,
    5632                                 C03A136C133BEBF900D767D1 /* LayerTreeHostCAMac.mm in Sources */,
    56335632                                51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
    56345633                                5160BFE113381DF900918999 /* Logging.mac.mm in Sources */,
    … …  
    60506049                                E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */,
    60516050                                E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */,
     6051                                1A97E07716A5F9E0000BC9E5 /* LayerTreeHostMac.mm in Sources */,
    60526052                        );
    60536053                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp

    r139023 r139791  
    2828
    2929#if PLATFORM(MAC)
    30 #include "LayerTreeHostCAMac.h"
     30#include "LayerTreeHostMac.h"
    3131#endif
    3232
    … …  
    4646{
    4747#if PLATFORM(MAC)
    48     return LayerTreeHostCAMac::create(webPage);
     48    return LayerTreeHostMac::create(webPage);
    4949#elif USE(COORDINATED_GRAPHICS)
    5050    return CoordinatedLayerTreeHost::create(webPage);

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h

    r139790 r139791  
    2424 */
    2525
    26 #ifndef LayerTreeHostCAMac_h
    27 #define LayerTreeHostCAMac_h
     26#ifndef LayerTreeHostMac_h
     27#define LayerTreeHostMac_h
    2828
    2929#include "LayerTreeHostCA.h"
    … …  
    3535class LayerHostingContext;
    3636
    37 class LayerTreeHostCAMac : public LayerTreeHostCA, public WebCore::LayerFlushSchedulerClient {
     37class LayerTreeHostMac : public LayerTreeHostCA, public WebCore::LayerFlushSchedulerClient {
    3838public:
    39     static PassRefPtr<LayerTreeHostCAMac> create(WebPage*);
    40     virtual ~LayerTreeHostCAMac();
     39    static PassRefPtr<LayerTreeHostMac> create(WebPage*);
     40    virtual ~LayerTreeHostMac();
    4141
    4242private:
    43     explicit LayerTreeHostCAMac(WebPage*);
     43    explicit LayerTreeHostMac(WebPage*);
    4444
    4545    // LayerTreeHost.
    … …  
    6969} // namespace WebKit
    7070
    71 #endif // LayerTreeHostCAMac_h
     71#endif // LayerTreeHostMac_h

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm

    r139790 r139791  
    2525
    2626#import "config.h"
    27 #import "LayerTreeHostCAMac.h"
     27#import "LayerTreeHostMac.h"
    2828
    2929#import "LayerHostingContext.h"
    … …  
    4141namespace WebKit {
    4242
    43 PassRefPtr<LayerTreeHostCAMac> LayerTreeHostCAMac::create(WebPage* webPage)
     43PassRefPtr<LayerTreeHostMac> LayerTreeHostMac::create(WebPage* webPage)
    4444{
    45     RefPtr<LayerTreeHostCAMac> host = adoptRef(new LayerTreeHostCAMac(webPage));
     45    RefPtr<LayerTreeHostMac> host = adoptRef(new LayerTreeHostMac(webPage));
    4646    host->initialize();
    4747    return host.release();
    4848}
    4949
    50 LayerTreeHostCAMac::LayerTreeHostCAMac(WebPage* webPage)
     50LayerTreeHostMac::LayerTreeHostMac(WebPage* webPage)
    5151    : LayerTreeHostCA(webPage)
    5252    , m_layerFlushScheduler(this)
    … …  
    5454}
    5555
    56 LayerTreeHostCAMac::~LayerTreeHostCAMac()
     56LayerTreeHostMac::~LayerTreeHostMac()
    5757{
    5858    ASSERT(!m_layerHostingContext);
    5959}
    6060
    61 void LayerTreeHostCAMac::platformInitialize()
     61void LayerTreeHostMac::platformInitialize()
    6262{
    6363    switch (m_webPage->layerHostingMode()) {
    … …  
    7676}
    7777
    78 void LayerTreeHostCAMac::scheduleLayerFlush()
     78void LayerTreeHostMac::scheduleLayerFlush()
    7979{
    8080    m_layerFlushScheduler.schedule();
    8181}
    8282
    83 void LayerTreeHostCAMac::setLayerFlushSchedulingEnabled(bool layerFlushingEnabled)
     83void LayerTreeHostMac::setLayerFlushSchedulingEnabled(bool layerFlushingEnabled)
    8484{
    8585    if (layerFlushingEnabled)
    … …  
    8989}
    9090
    91 void LayerTreeHostCAMac::invalidate()
     91void LayerTreeHostMac::invalidate()
    9292{
    9393    m_layerFlushScheduler.invalidate();
    … …  
    9999}
    100100
    101 void LayerTreeHostCAMac::sizeDidChange(const IntSize& newSize)
     101void LayerTreeHostMac::sizeDidChange(const IntSize& newSize)
    102102{
    103103    LayerTreeHostCA::sizeDidChange(newSize);
    … …  
    106106}
    107107
    108 void LayerTreeHostCAMac::forceRepaint()
     108void LayerTreeHostMac::forceRepaint()
    109109{
    110110    LayerTreeHostCA::forceRepaint();
    … …  
    113113}
    114114
    115 void LayerTreeHostCAMac::pauseRendering()
     115void LayerTreeHostMac::pauseRendering()
    116116{
    117117    CALayer* root = rootLayer()->platformLayer();
    … …  
    120120}
    121121
    122 void LayerTreeHostCAMac::resumeRendering()
     122void LayerTreeHostMac::resumeRendering()
    123123{
    124124    CALayer* root = rootLayer()->platformLayer();
    … …  
    127127}
    128128
    129 bool LayerTreeHostCAMac::flushLayers()
     129bool LayerTreeHostMac::flushLayers()
    130130{
    131131    performScheduledLayerFlush();
    … …  
    133133}
    134134
    135 void LayerTreeHostCAMac::didPerformScheduledLayerFlush()
     135void LayerTreeHostMac::didPerformScheduledLayerFlush()
    136136{
    137137    LayerTreeHostCA::didPerformScheduledLayerFlush();
    138138}
    139139
    140 bool LayerTreeHostCAMac::flushPendingLayerChanges()
     140bool LayerTreeHostMac::flushPendingLayerChanges()
    141141{
    142142    if (m_layerFlushScheduler.isSuspended())
    … …  
    146146}
    147147
    148 void LayerTreeHostCAMac::setLayerHostingMode(LayerHostingMode layerHostingMode)
     148void LayerTreeHostMac::setLayerHostingMode(LayerHostingMode layerHostingMode)
    149149{
    150150    if (layerHostingMode == m_layerHostingContext->layerHostingMode())
Note: See TracChangeset for help on using the changeset viewer.