Changeset 76649 in webkit


Ignore:
Timestamp:
Jan 25, 2011 3:40:57 PM (13 years ago)
Author:
andersca@apple.com
Message:

2011-01-25 Anders Carlsson <​andersca@apple.com>

Reviewed by Simon Fraser.

Add LayerTreeHost class
​https://bugs.webkit.org/show_bug.cgi?id=53132

  • WebKit2.xcodeproj/project.pbxproj: Add LayerTreeHost files.
  • WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::DrawingAreaImpl): Initialize m_layerTreeHost.

(WebKit::DrawingAreaImpl::setRootCompositingLayer):
Call the m_layerTreeHost.

  • WebProcess/WebPage/LayerTreeHost.cpp: Added. (WebKit::LayerTreeHost::attachRootCompositingLayer): (WebKit::LayerTreeHost::detachRootCompositingLayer): Add stubbed out functions.

(WebKit::LayerTreeHost::syncCompositingLayers):
Sync the compositing layers in the main frame.

  • WebProcess/WebPage/LayerTreeHost.h: Added.
Location:
trunk/Source/WebKit2
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r76638 r76649  
     12011-01-25  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Simon Fraser.
     4
     5        Add LayerTreeHost class
     6        https://bugs.webkit.org/show_bug.cgi?id=53132
     7
     8        * WebKit2.xcodeproj/project.pbxproj:
     9        Add LayerTreeHost files.
     10
     11        * WebProcess/WebPage/DrawingAreaImpl.cpp:
     12        (WebKit::DrawingAreaImpl::DrawingAreaImpl):
     13        Initialize m_layerTreeHost.
     14
     15        (WebKit::DrawingAreaImpl::setRootCompositingLayer):
     16        Call the m_layerTreeHost.
     17
     18        * WebProcess/WebPage/LayerTreeHost.cpp: Added.
     19        (WebKit::LayerTreeHost::attachRootCompositingLayer):
     20        (WebKit::LayerTreeHost::detachRootCompositingLayer):
     21        Add stubbed out functions.
     22
     23        (WebKit::LayerTreeHost::syncCompositingLayers):
     24        Sync the compositing layers in the main frame.
     25
     26        * WebProcess/WebPage/LayerTreeHost.h: Added.
     27
    1282011-01-25  Steve Falkenburg  <sfalken@apple.com>
    229

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

    r76559 r76649  
    6868                1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */; };
    6969                1A119A95127B796200A9ECB1 /* MessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A119A94127B796200A9ECB1 /* MessageSender.h */; };
     70                1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */; };
     71                1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */; };
    7072                1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
    7173                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
    … …  
    796798                1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProvider.h; sourceTree = "<group>"; };
    797799                1A119A94127B796200A9ECB1 /* MessageSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSender.h; sourceTree = "<group>"; };
     800                1A186EE812EF7618008E5F37 /* LayerTreeHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeHost.h; sourceTree = "<group>"; };
     801                1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeHost.cpp; sourceTree = "<group>"; };
    798802                1A1C648611F415B700553C19 /* WebContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMac.mm; sourceTree = "<group>"; };
    799803                1A1FA251127A0E4F0050E709 /* NPRemoteObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRemoteObjectMap.h; sourceTree = "<group>"; };
    … …  
    20592063                                0F5265B111DD37680006D33C /* LayerBackedDrawingArea.cpp */,
    20602064                                0F5265B211DD37680006D33C /* LayerBackedDrawingArea.h */,
     2065                                1A186EE912EF7618008E5F37 /* LayerTreeHost.cpp */,
     2066                                1A186EE812EF7618008E5F37 /* LayerTreeHost.h */,
    20612067                                1A90C23612650717003E44D4 /* PageOverlay.cpp */,
    20622068                                1A90C23512650717003E44D4 /* PageOverlay.h */,
    … …  
    25362542                        isa = PBXGroup;
    25372543                        children = (
     2544                                29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */,
    25382545                                29CD55A9128E294F00133C85 /* AccessibilityWebPageObject.mm */,
    2539                                 29CD55A8128E294F00133C85 /* AccessibilityWebPageObject.h */,
    25402546                                BC5F7BB8118237990052C02C /* ChunkedUpdateDrawingAreaMac.cpp */,
    25412547                                0F5265B511DD37700006D33C /* LayerBackedDrawingAreaMac.mm */,
    … …  
    30743080                                C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */,
    30753081                                E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */,
     3082                                1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */,
    30763083                        );
    30773084                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    35373544                                C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */,
    35383545                                E134F01A12EA5D99004EC58D /* WKPrintingView.mm in Sources */,
     3546                                1A186EEB12EF7618008E5F37 /* LayerTreeHost.cpp in Sources */,
    35393547                        );
    35403548                        runOnlyForDeploymentPostprocessing = 0;

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

    r76535 r76649  
    5656    , m_isPaintingSuspended(!parameters.isVisible)
    5757    , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::display)
     58    , m_layerTreeHost(webPage)
    5859{
    5960}
    … …  
    124125}
    125126
    126 void DrawingAreaImpl::setRootCompositingLayer(WebCore::GraphicsLayer*)
    127 {
     127void DrawingAreaImpl::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
     128{
     129    if (graphicsLayer)
     130        m_layerTreeHost.attachRootCompositingLayer(graphicsLayer);
     131    else
     132        m_layerTreeHost.detachRootCompositingLayer();
    128133}
    129134

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

    r76535 r76649  
    2828
    2929#include "DrawingArea.h"
     30#include "LayerTreeHost.h"
    3031#include "Region.h"
    3132#include "RunLoop.h"
    … …  
    7778
    7879    RunLoop::Timer<DrawingAreaImpl> m_displayTimer;
     80
     81    // The layer tree host which handles accelerated compositing.
     82    LayerTreeHost m_layerTreeHost;
    7983};
    8084
Note: See TracChangeset for help on using the changeset viewer.