Changeset 113514 in webkit


Ignore:
Timestamp:
Apr 6, 2012 3:55:45 PM (12 years ago)
Author:
Simon Fraser
Message:

Rename paintingGoesToWindow() to paintsIntoWindow()
https://bugs.webkit.org/show_bug.cgi?id=83406

Reviewed by Dirk Schulze.

Rename paintingGoesToWindow() to paintsIntoWindow() to be consistent
with some future refactoring.

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::paintsWithTransform):
(WebCore::RenderLayer::setBackingNeedsRepaint):
(WebCore::RenderLayer::setBackingNeedsRepaintInRect):

  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::containsPaintedContent):
(WebCore::RenderLayerBacking::paintsIntoWindow):
(WebCore::RenderLayerBacking::paintIntoLayer):

  • rendering/RenderLayerBacking.h:

(RenderLayerBacking):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::rootLayerAttachmentChanged):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::repaintUsingContainer):

  • rendering/RenderView.cpp:

(WebCore::RenderView::paintBoxDecorations):

Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r113513 r113514  
     12012-04-06  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename paintingGoesToWindow() to paintsIntoWindow()
     4        https://bugs.webkit.org/show_bug.cgi?id=83406
     5
     6        Reviewed by Dirk Schulze.
     7       
     8        Rename paintingGoesToWindow() to paintsIntoWindow() to be consistent
     9        with some future refactoring.
     10
     11        * rendering/RenderLayer.cpp:
     12        (WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
     13        (WebCore::RenderLayer::paintLayer):
     14        (WebCore::RenderLayer::paintsWithTransform):
     15        (WebCore::RenderLayer::setBackingNeedsRepaint):
     16        (WebCore::RenderLayer::setBackingNeedsRepaintInRect):
     17        * rendering/RenderLayerBacking.cpp:
     18        (WebCore::RenderLayerBacking::containsPaintedContent):
     19        (WebCore::RenderLayerBacking::paintsIntoWindow):
     20        (WebCore::RenderLayerBacking::paintIntoLayer):
     21        * rendering/RenderLayerBacking.h:
     22        (RenderLayerBacking):
     23        * rendering/RenderLayerCompositor.cpp:
     24        (WebCore::RenderLayerCompositor::rootLayerAttachmentChanged):
     25        * rendering/RenderObject.cpp:
     26        (WebCore::RenderObject::repaintUsingContainer):
     27        * rendering/RenderView.cpp:
     28        (WebCore::RenderView::paintBoxDecorations):
     29
    1302012-04-06  James Simonsen  <simonjam@chromium.org>
    231
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r113335 r113514  
    10111011#if USE(ACCELERATED_COMPOSITING)
    10121012    if (parentLayer->isComposited()) {
    1013         if (!parentLayer->backing()->paintingGoesToWindow()) {
     1013        if (!parentLayer->backing()->paintsIntoWindow()) {
    10141014            parentLayer->setBackingNeedsRepaintInRect(parentLayerRect);
    10151015            return;
     
    28562856        if (context->updatingControlTints() || (paintBehavior & PaintBehaviorFlattenCompositingLayers))
    28572857            paintFlags |= PaintLayerTemporaryClipRects;
    2858         else if (!backing()->paintingGoesToWindow() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection)) {
     2858        else if (!backing()->paintsIntoWindow() && !shouldDoSoftwarePaint(this, paintFlags & PaintLayerPaintingReflection)) {
    28592859            // If this RenderLayer should paint into its backing, that will be done via RenderLayerBacking::paintIntoLayer().
    28602860            return;
     
    42714271{
    42724272#if USE(ACCELERATED_COMPOSITING)
    4273     bool paintsToWindow = !isComposited() || backing()->paintingGoesToWindow();
     4273    bool paintsToWindow = !isComposited() || backing()->paintsIntoWindow();
    42744274#else
    42754275    bool paintsToWindow = true;
     
    45514551{
    45524552    ASSERT(isComposited());
    4553     if (backing()->paintingGoesToWindow()) {
     4553    if (backing()->paintsIntoWindow()) {
    45544554        // If we're trying to repaint the placeholder document layer, propagate the
    45554555        // repaint to the native view system.
     
    45664566    // so assert but check that the layer is composited.
    45674567    ASSERT(isComposited());
    4568     if (!isComposited() || backing()->paintingGoesToWindow()) {
     4568    if (!isComposited() || backing()->paintsIntoWindow()) {
    45694569        // If we're trying to repaint the placeholder document layer, propagate the
    45704570        // repaint to the native view system.
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r113335 r113514  
    938938bool RenderLayerBacking::containsPaintedContent() const
    939939{
    940     if (isSimpleContainerCompositingLayer() || paintingGoesToWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
     940    if (isSimpleContainerCompositingLayer() || paintsIntoWindow() || m_artificiallyInflatedBounds || m_owningLayer->isReflection())
    941941        return false;
    942942
     
    10771077}
    10781078
    1079 bool RenderLayerBacking::paintingGoesToWindow() const
     1079bool RenderLayerBacking::paintsIntoWindow() const
    10801080{
    10811081    if (m_usingTiledCacheLayer)
     
    11331133                    RenderObject* paintingRoot)
    11341134{
    1135     if (paintingGoesToWindow()) {
     1135    if (paintsIntoWindow()) {
    11361136        ASSERT_NOT_REACHED();
    11371137        return;
  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r113281 r113514  
    9696    // This returns false for other layers, and when the document layer actually needs to paint into its backing store
    9797    // for some reason.
    98     bool paintingGoesToWindow() const;
     98    bool paintsIntoWindow() const;
    9999
    100100    void setContentsNeedDisplay();
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r113335 r113514  
    20432043void RenderLayerCompositor::rootLayerAttachmentChanged()
    20442044{
    2045     // The attachment can affect whether the RenderView layer's paintingGoesToWindow() behavior,
     2045    // The attachment can affect whether the RenderView layer's paintsIntoWindow() behavior,
    20462046    // so call updateGraphicsLayerGeometry() to udpate that.
    20472047    RenderLayer* layer = m_renderView->layer();
  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r113491 r113514  
    13151315        ASSERT(repaintContainer == v);
    13161316        bool viewHasCompositedLayer = v->hasLayer() && v->layer()->isComposited();
    1317         if (!viewHasCompositedLayer || v->layer()->backing()->paintingGoesToWindow()) {
     1317        if (!viewHasCompositedLayer || v->layer()->backing()->paintsIntoWindow()) {
    13181318            LayoutRect repaintRectangle = r;
    13191319            if (viewHasCompositedLayer &&  v->layer()->transform())
  • trunk/Source/WebCore/rendering/RenderView.cpp

    r113487 r113514  
    253253#if USE(ACCELERATED_COMPOSITING)
    254254        if (RenderLayer* compositingLayer = layer->enclosingCompositingLayer()) {
    255             if (!compositingLayer->backing()->paintingGoesToWindow()) {
     255            if (!compositingLayer->backing()->paintsIntoWindow()) {
    256256                frameView()->setCannotBlitToWindow();
    257257                break;
Note: See TracChangeset for help on using the changeset viewer.