Changeset 152390 in webkit


Ignore:
Timestamp:
Jul 3, 2013 11:44:59 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[Coordinated Graphics] Don't use && operator in ASSERT
https://bugs.webkit.org/show_bug.cgi?id=118377

Patch by Jae Hyun Park <jae.park@company100.net> on 2013-07-03
Reviewed by Noam Rosenthal.

We don't use && opeartor in ASSERT because it's impossible to know which
condition caused the assertion.

  • platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:

(WebCore::CoordinatedBackingStoreTile::swapBuffers):

  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r152389 r152390  
     12013-07-03  Jae Hyun Park  <jae.park@company100.net>
     2
     3        [Coordinated Graphics] Don't use && operator in ASSERT
     4        https://bugs.webkit.org/show_bug.cgi?id=118377
     5
     6        Reviewed by Noam Rosenthal.
     7
     8        We don't use && opeartor in ASSERT because it's impossible to know which
     9        condition caused the assertion.
     10
     11        * platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
     12        (WebCore::CoordinatedBackingStoreTile::swapBuffers):
     13        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
     14        (WebCore::CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer):
     15
    1162013-07-03  KyungTae Kim  <ktf.kim@samsung.com>
    217
  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp

    r144190 r152390  
    4848    }
    4949
    50     ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width() && textureMapper->maxTextureSize().height() >= m_tileRect.size().height());
     50    ASSERT(textureMapper->maxTextureSize().width() >= m_tileRect.size().width());
     51    ASSERT(textureMapper->maxTextureSize().height() >= m_tileRect.size().height());
    5152    if (shouldReset)
    5253        texture->reset(m_tileRect.size(), m_surface->supportsAlpha());
  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

    r151262 r152390  
    136136        m_coordinator->detachLayer(this);
    137137    }
    138     ASSERT(!m_coordinatedImageBacking && !m_mainBackingStore);
     138    ASSERT(!m_coordinatedImageBacking);
     139    ASSERT(!m_mainBackingStore);
    139140    willBeDestroyed();
    140141}
Note: See TracChangeset for help on using the changeset viewer.