Changeset 85116 in webkit


Ignore:
Timestamp:
Apr 27, 2011 4:01:48 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-04-27 James Robinson <​jamesr@chromium.org>

Unreviewed, rolling out r85112.
​http://trac.webkit.org/changeset/85112
​https://bugs.webkit.org/show_bug.cgi?id=59159

Broke mac compile

  • page/FrameView.cpp: (WebCore::FrameView::updateCompositingLayers):
  • page/FrameView.h:
  • platform/graphics/chromium/GraphicsLayerChromium.cpp: (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
  • platform/graphics/chromium/LayerChromium.cpp: (WebCore::LayerChromium::LayerChromium): (WebCore::LayerChromium::~LayerChromium):
  • platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::updateLayers):
  • platform/graphics/chromium/LayerRendererChromium.h:
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85114 r85116  
     12011-04-27  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r85112.
     4        http://trac.webkit.org/changeset/85112
     5        https://bugs.webkit.org/show_bug.cgi?id=59159
     6
     7        Broke mac compile
     8
     9        * page/FrameView.cpp:
     10        (WebCore::FrameView::updateCompositingLayers):
     11        * page/FrameView.h:
     12        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
     13        (WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
     14        * platform/graphics/chromium/LayerChromium.cpp:
     15        (WebCore::LayerChromium::LayerChromium):
     16        (WebCore::LayerChromium::~LayerChromium):
     17        * platform/graphics/chromium/LayerRendererChromium.cpp:
     18        (WebCore::LayerRendererChromium::updateLayers):
     19        * platform/graphics/chromium/LayerRendererChromium.h:
     20
    1212011-04-27  Mark Rowe  <mrowe@apple.com>
    222

  • trunk/Source/WebCore/page/FrameView.cpp

    r85112 r85116  
    586586   
    587587#if USE(ACCELERATED_COMPOSITING)
    588 void FrameView::updateCompositingLayers(CompositingUpdateType updateType)
     588void FrameView::updateCompositingLayers()
    589589{
    590590    RenderView* view = m_frame->contentRenderer();
    … …  
    594594    // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
    595595    view->compositor()->cacheAcceleratedCompositingFlags();
    596     view->compositor()->updateCompositingLayers(updateType);
     596    view->compositor()->updateCompositingLayers(CompositingUpdateAfterLayoutOrStyleChange);
    597597   
    598598#if ENABLE(FULLSCREEN_API)
    599599    Document* document = m_frame->document();
    600600    if (isDocumentRunningFullScreenAnimation(document))
    601         view->compositor()->updateCompositingLayers(updateType, document->fullScreenRenderer()->layer());
     601        view->compositor()->updateCompositingLayers(CompositingUpdateAfterLayoutOrStyleChange, document->fullScreenRenderer()->layer());
    602602#endif
    603603}

  • trunk/Source/WebCore/page/FrameView.h

    r85112 r85116  
    3333#include <wtf/Forward.h>
    3434#include <wtf/OwnPtr.h>
    35 
    36 #if USE(ACCELERATED_COMPOSITING)
    37 #include "RenderLayerCompositor.h" // For CompositingUpdateType
    38 #endif
    3935
    4036namespace WebCore {
    … …  
    110106
    111107#if USE(ACCELERATED_COMPOSITING)
    112     void updateCompositingLayers(CompositingUpdateType = CompositingUpdateAfterLayoutOrStyleChange);
     108    void updateCompositingLayers();
    113109    bool syncCompositingStateForThisFrame();
    114110

  • trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

    r85112 r85116  
    589589    } else if (!m_preserves3D && m_transformLayer) {
    590590        // Relace the transformLayer in the parent with this layer.
    591         if (m_transformLayer->superlayer())
    592             m_transformLayer->superlayer()->replaceSublayer(m_transformLayer.get(), m_layer.get());
    593591        m_layer->removeFromSuperlayer();
     592        m_transformLayer->superlayer()->replaceSublayer(m_transformLayer.get(), m_layer.get());
    594593
    595594        // Release the transform layer.

  • trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

    r85112 r85116  
    8282    , m_replicaLayer(0)
    8383{
    84     ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
    8584}
    8685
    8786LayerChromium::~LayerChromium()
    8887{
    89     ASSERT(!LayerRendererChromium::s_inPaintLayerContents);
    9088    // Our superlayer should be holding a reference to us so there should be no
    9189    // way for us to be destroyed while we still have a superlayer.

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r85112 r85116  
    6060static size_t textureMemoryLimitBytes = 64 * 1024 * 1024;
    6161
    62 #ifndef NDEBUG
    63 bool LayerRendererChromium::s_inPaintLayerContents = false;
    64 #endif
    65 
    6662static TransformationMatrix orthoMatrix(float left, float right, float bottom, float top)
    6763{
    … …  
    288284    updatePropertiesAndRenderSurfaces(m_rootLayer.get(), identityMatrix, renderSurfaceLayerList, m_defaultRenderSurface->m_layerList);
    289285
    290 #ifndef NDEBUG
    291     s_inPaintLayerContents = true;
    292 #endif
    293286    paintLayerContents(renderSurfaceLayerList);
    294 #ifndef NDEBUG
    295     s_inPaintLayerContents = false;
    296 #endif
    297287
    298288    // FIXME: Before updateCompositorResourcesRecursive, when the compositor runs in

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

    r85112 r85116  
    135135    void removeChildContext(GraphicsContext3D*);
    136136
    137 #ifndef NDEBUG
    138     static bool s_inPaintLayerContents;
    139 #endif
    140137private:
    141138    typedef Vector<RefPtr<CCLayerImpl> > LayerList;
Note: See TracChangeset for help on using the changeset viewer.