Changeset 241251 in webkit


Ignore:
Timestamp:
Feb 10, 2019 11:34:10 AM (5 years ago)
Author:
Philippe Normand
Message:

Unreviewed, GTK Debug build fix after r241148.

  • Modules/mediasource/SourceBuffer.cpp:

(WebCore::removeSamplesFromTrackBuffer):
SourceBuffer::logClassName and friends are declared for
!RELEASE_LOG_DISABLED builds so adapt calling sites accordingly.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r241250 r241251  
     12019-02-10  Philippe Normand  <pnormand@igalia.com>
     2
     3        Unreviewed, GTK Debug build fix after r241148.
     4
     5        * Modules/mediasource/SourceBuffer.cpp:
     6        (WebCore::removeSamplesFromTrackBuffer):
     7        SourceBuffer::logClassName and friends are declared for
     8        !RELEASE_LOG_DISABLED builds so adapt calling sites accordingly.
     9
    1102019-02-10  Zalan Bujtas  <zalan@apple.com>
    211
  • trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

    r241148 r241251  
    736736static PlatformTimeRanges removeSamplesFromTrackBuffer(const DecodeOrderSampleMap::MapType& samples, SourceBuffer::TrackBuffer& trackBuffer, const SourceBuffer* buffer, const char* logPrefix)
    737737{
    738 #if !LOG_DISABLED
     738#if !RELEASE_LOG_DISABLED
    739739    MediaTime earliestSample = MediaTime::positiveInfiniteTime();
    740740    MediaTime latestSample = MediaTime::zeroTime();
     
    751751    for (const auto& sampleIt : samples) {
    752752        const DecodeOrderSampleMap::KeyType& decodeKey = sampleIt.first;
    753 #if !LOG_DISABLED
     753#if !RELEASE_LOG_DISABLED
    754754        size_t startBufferSize = trackBuffer.samples.sizeInBytes();
    755755#endif
     
    757757        const RefPtr<MediaSample>& sample = sampleIt.second;
    758758
    759 #if !LOG_DISABLED
     759#if !RELEASE_LOG_DISABLED
    760760        if (willLog)
    761761            logger.debug(buffer->logChannel(), logIdentifier, "removing sample ", *sampleIt.second);
     
    772772        erasedRanges.add(startTime, endTime);
    773773
    774 #if !LOG_DISABLED
     774#if !RELEASE_LOG_DISABLED
    775775        bytesRemoved += startBufferSize - trackBuffer.samples.sizeInBytes();
    776776        if (startTime < earliestSample)
     
    809809        erasedRanges.unionWith(additionalErasedRanges);
    810810
    811 #if !LOG_DISABLED
     811#if !RELEASE_LOG_DISABLED
    812812    if (bytesRemoved && willLog)
    813813        logger.debug(buffer->logChannel(), logIdentifier, "removed ", bytesRemoved, ", start = ", earliestSample, ", end = ", latestSample);
Note: See TracChangeset for help on using the changeset viewer.