Diff
Modified: trunk/Source/WebCore/ChangeLog (243071 => 243072)
--- trunk/Source/WebCore/ChangeLog 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/ChangeLog 2019-03-18 16:52:45 UTC (rev 243072)
@@ -1,3 +1,55 @@
+2019-03-18 Eric Carlson <eric.carl...@apple.com>
+
+ Change some logging levels
+ https://bugs.webkit.org/show_bug.cgi?id=195861
+ <rdar://problem/48961669>
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::dispatchEvent):
+ * Modules/webaudio/AudioNode.cpp:
+ (WebCore::AudioNode::addInput):
+ (WebCore::AudioNode::addOutput):
+ (WebCore::AudioNode::connect):
+ (WebCore::AudioNode::disconnect):
+ * Modules/webaudio/AudioParam.cpp:
+ (WebCore::AudioParam::connect):
+ (WebCore::AudioParam::disconnect):
+ * Modules/webaudio/WaveShaperNode.cpp:
+ (WebCore::WaveShaperNode::setOversample):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::canPlayType const):
+ (WebCore::HTMLMediaElement::seekTask):
+ (WebCore::HTMLMediaElement::dispatchEvent):
+ (WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
+ (WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLMediaElement::setMediaControlsDependOnPageScaleFactor):
+ * html/track/InbandGenericTextTrack.cpp:
+ (WebCore::InbandGenericTextTrack::addGenericCue):
+ (WebCore::InbandGenericTextTrack::removeGenericCue):
+ (WebCore::InbandGenericTextTrack::newCuesParsed):
+ * html/track/InbandWebVTTTextTrack.cpp:
+ (WebCore::InbandWebVTTTextTrack::newCuesParsed):
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::newCuesAvailable):
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::removeCue):
+ * inspector/agents/WebConsoleAgent.cpp:
+ (WebCore::WebConsoleAgent::getLoggingChannels):
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ (WebCore::InbandTextTrackPrivateAVF::processAttributedStrings):
+ (WebCore::InbandTextTrackPrivateAVF::removeCompletedCues):
+ (WebCore::InbandTextTrackPrivateAVF::processNativeSamples):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastImage):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekWithTolerance):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekInternal):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless const):
+
2019-03-15 Antoine Quint <grao...@apple.com>
Make mouse event simulation a quirk
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (243071 => 243072)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -580,7 +580,7 @@
void RTCPeerConnection::dispatchEvent(Event& event)
{
- DEBUG_LOG(LOGIDENTIFIER, "dispatching '", event.type(), "'");
+ INFO_LOG(LOGIDENTIFIER, "dispatching '", event.type(), "'");
EventTarget::dispatchEvent(event);
}
Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp (243071 => 243072)
--- trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -163,7 +163,7 @@
void AudioNode::addInput(std::unique_ptr<AudioNodeInput> input)
{
ASSERT(isMainThread());
- DEBUG_LOG(LOGIDENTIFIER, input->node()->nodeType());
+ INFO_LOG(LOGIDENTIFIER, input->node()->nodeType());
m_inputs.append(WTFMove(input));
}
@@ -170,7 +170,7 @@
void AudioNode::addOutput(std::unique_ptr<AudioNodeOutput> output)
{
ASSERT(isMainThread());
- DEBUG_LOG(LOGIDENTIFIER, output->node()->nodeType());
+ INFO_LOG(LOGIDENTIFIER, output->node()->nodeType());
m_outputs.append(WTFMove(output));
}
@@ -221,7 +221,7 @@
ASSERT(isMainThread());
- DEBUG_LOG(LOGIDENTIFIER, param.name(), ", output = ", outputIndex);
+ INFO_LOG(LOGIDENTIFIER, param.name(), ", output = ", outputIndex);
if (outputIndex >= numberOfOutputs())
return Exception { IndexSizeError };
@@ -245,7 +245,7 @@
return Exception { IndexSizeError };
auto* output = this->output(outputIndex);
- DEBUG_LOG(LOGIDENTIFIER, output->node()->nodeType());
+ INFO_LOG(LOGIDENTIFIER, output->node()->nodeType());
output->disconnectAll();
Modified: trunk/Source/WebCore/Modules/webaudio/AudioParam.cpp (243071 => 243072)
--- trunk/Source/WebCore/Modules/webaudio/AudioParam.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/Modules/webaudio/AudioParam.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -194,7 +194,7 @@
if (!m_outputs.add(output).isNewEntry)
return;
- DEBUG_LOG(LOGIDENTIFIER, output->node()->nodeType());
+ INFO_LOG(LOGIDENTIFIER, output->node()->nodeType());
output->addParam(this);
changedOutputs();
@@ -208,7 +208,7 @@
if (!output)
return;
- DEBUG_LOG(LOGIDENTIFIER, output->node()->nodeType());
+ INFO_LOG(LOGIDENTIFIER, output->node()->nodeType());
if (m_outputs.remove(output)) {
changedOutputs();
Modified: trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp (243071 => 243072)
--- trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/Modules/webaudio/WaveShaperNode.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -71,7 +71,7 @@
void WaveShaperNode::setOversample(OverSampleType type)
{
ASSERT(isMainThread());
- DEBUG_LOG(LOGIDENTIFIER, type);
+ INFO_LOG(LOGIDENTIFIER, type);
// Synchronize with any graph changes or changes to channel configuration.
AudioContext::AutoLocker contextLocker(context());
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (243071 => 243072)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -1159,7 +1159,7 @@
break;
}
- DEBUG_LOG(LOGIDENTIFIER, "[", mimeType, "] -> ", canPlay);
+ INFO_LOG(LOGIDENTIFIER, mimeType, ": ", canPlay);
return canPlay;
}
@@ -3078,7 +3078,7 @@
if (willLog(WTFLogLevelDebug)) {
MediaTime mediaTime = m_player->mediaTimeForTimeValue(time);
if (time != mediaTime)
- DEBUG_LOG(LOGIDENTIFIER, time, " media timeline equivalent is ", mediaTime);
+ INFO_LOG(LOGIDENTIFIER, time, " media timeline equivalent is ", mediaTime);
}
time = m_player->mediaTimeForTimeValue(time);
@@ -5914,7 +5914,7 @@
void HTMLMediaElement::dispatchEvent(Event& event)
{
- DEBUG_LOG(LOGIDENTIFIER, "dispatching '", event.type(), "'");
+ DEBUG_LOG(LOGIDENTIFIER, event.type());
HTMLElement::dispatchEvent(event);
}
@@ -7270,7 +7270,7 @@
bool HTMLMediaElement::ensureMediaControlsInjectedScript()
{
- DEBUG_LOG(LOGIDENTIFIER);
+ INFO_LOG(LOGIDENTIFIER);
Page* page = document().page();
if (!page)
@@ -7344,7 +7344,7 @@
void HTMLMediaElement::didAddUserAgentShadowRoot(ShadowRoot& root)
{
- DEBUG_LOG(LOGIDENTIFIER);
+ INFO_LOG(LOGIDENTIFIER);
if (!ensureMediaControlsInjectedScript())
return;
@@ -7422,10 +7422,10 @@
void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool dependsOnPageScale)
{
- DEBUG_LOG(LOGIDENTIFIER, "MediaElement::setMediaControlsDependPageScaleFactor", dependsOnPageScale);
+ INFO_LOG(LOGIDENTIFIER, dependsOnPageScale);
if (document().settings().mediaControlsScaleWithPageZoom()) {
- DEBUG_LOG(LOGIDENTIFIER, "MediaElement::setMediaControlsDependPageScaleFactor", "forced to false by Settings value");
+ INFO_LOG(LOGIDENTIFIER, "forced to false by Settings value");
m_mediaControlsDependOnPageScaleFactor = false;
return;
}
Modified: trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp (243071 => 243072)
--- trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/html/track/InbandGenericTextTrack.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -125,11 +125,11 @@
auto cue = TextTrackCueGeneric::create(*scriptExecutionContext(), cueData.startTime(), cueData.endTime(), cueData.content());
updateCueFromCueData(cue.get(), cueData);
if (hasCue(cue.ptr(), TextTrackCue::IgnoreDuration)) {
- DEBUG_LOG(LOGIDENTIFIER, "ignoring already added cue: ", cue.get());
+ INFO_LOG(LOGIDENTIFIER, "ignoring already added cue: ", cue.get());
return;
}
- DEBUG_LOG(LOGIDENTIFIER, "added cue: ", cue.get());
+ INFO_LOG(LOGIDENTIFIER, "added cue: ", cue.get());
if (cueData.status() != GenericCueData::Complete)
m_cueMap.add(cueData, cue);
@@ -153,10 +153,10 @@
{
auto cue = makeRefPtr(m_cueMap.find(cueData));
if (cue) {
- DEBUG_LOG(LOGIDENTIFIER, *cue);
+ INFO_LOG(LOGIDENTIFIER, *cue);
removeCue(*cue);
} else
- DEBUG_LOG(LOGIDENTIFIER, "UNABLE to find cue: ", cueData);
+ INFO_LOG(LOGIDENTIFIER, "UNABLE to find cue: ", cueData);
}
@@ -194,11 +194,11 @@
auto vttCue = VTTCue::create(*scriptExecutionContext(), *cueData);
if (hasCue(vttCue.ptr(), TextTrackCue::IgnoreDuration)) {
- DEBUG_LOG(LOGIDENTIFIER, "ignoring already added cue: ", vttCue.get());
+ INFO_LOG(LOGIDENTIFIER, "ignoring already added cue: ", vttCue.get());
return;
}
- DEBUG_LOG(LOGIDENTIFIER, vttCue.get());
+ INFO_LOG(LOGIDENTIFIER, vttCue.get());
addCue(WTFMove(vttCue));
}
Modified: trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp (243071 => 243072)
--- trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/html/track/InbandWebVTTTextTrack.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -72,11 +72,11 @@
for (auto& cueData : cues) {
auto vttCue = VTTCue::create(*scriptExecutionContext(), *cueData);
if (hasCue(vttCue.ptr(), TextTrackCue::IgnoreDuration)) {
- DEBUG_LOG(LOGIDENTIFIER, "ignoring already added cue: ", vttCue.get());
+ INFO_LOG(LOGIDENTIFIER, "ignoring already added cue: ", vttCue.get());
return;
}
- DEBUG_LOG(LOGIDENTIFIER, vttCue.get());
+ INFO_LOG(LOGIDENTIFIER, vttCue.get());
addCue(WTFMove(vttCue));
}
Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (243071 => 243072)
--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -98,7 +98,7 @@
for (auto& newCue : newCues) {
newCue->setTrack(this);
- DEBUG_LOG(LOGIDENTIFIER, *toVTTCue(newCue.get()));
+ INFO_LOG(LOGIDENTIFIER, *toVTTCue(newCue.get()));
m_cues->add(newCue.releaseNonNull());
}
Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (243071 => 243072)
--- trunk/Source/WebCore/html/track/TextTrack.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -337,7 +337,7 @@
if (!m_cues)
return Exception { InvalidStateError };
- DEBUG_LOG(LOGIDENTIFIER, cue);
+ INFO_LOG(LOGIDENTIFIER, cue);
// 2. Remove cue from the method's TextTrack object's text track's text track list of cues.
m_cues->remove(cue);
Modified: trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp (243071 => 243072)
--- trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/inspector/agents/WebConsoleAgent.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -73,9 +73,9 @@
case WTFLogLevelAlways:
case WTFLogLevelError:
case WTFLogLevelWarning:
+ case WTFLogLevelInfo:
level = Inspector::Protocol::Console::ChannelLevel::Basic;
break;
- case WTFLogLevelInfo:
case WTFLogLevelDebug:
level = Inspector::Protocol::Console::ChannelLevel::Verbose;
break;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (243071 => 243072)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2019-03-18 16:52:45 UTC (rev 243072)
@@ -318,7 +318,7 @@
CFIndex count = attributedStrings ? CFArrayGetCount(attributedStrings) : 0;
if (count)
- DEBUG_LOG(LOGIDENTIFIER, "added ", count, count > 1 ? " cues" : " cue", " at time ", time);
+ INFO_LOG(LOGIDENTIFIER, "added ", count, count > 1 ? " cues" : " cue", " at time ", time);
Vector<Ref<GenericCueData>> arrivingCues;
if (count) {
@@ -359,7 +359,7 @@
if (!arrivingCue->doesExtendCueData(*cueData))
nonExtensionCues.append(WTFMove(arrivingCue));
else
- DEBUG_LOG(LOGIDENTIFIER, "found an extension cue ", *cueData);
+ INFO_LOG(LOGIDENTIFIER, "found an extension cue ", *cueData);
}
bool currentCueIsExtended = (arrivingCues.size() != nonExtensionCues.size());
@@ -373,13 +373,13 @@
cueData->setEndTime(m_currentCueEndTime);
cueData->setStatus(GenericCueData::Complete);
- DEBUG_LOG(LOGIDENTIFIER, "updating cue ", *cueData);
+ INFO_LOG(LOGIDENTIFIER, "updating cue ", *cueData);
client()->updateGenericCue(*cueData);
} else {
// We have to assume that the implicit duration is invalid for cues delivered during a seek because the AVF decode pipeline may not
// see every cue, so DO NOT update cue duration while seeking.
- DEBUG_LOG(LOGIDENTIFIER, "ignoring cue delivered during seek ", *cueData);
+ INFO_LOG(LOGIDENTIFIER, "ignoring cue delivered during seek ", *cueData);
}
}
} else
@@ -395,7 +395,7 @@
for (auto& cueData : arrivingCues) {
m_cues.append(cueData.ptr());
- DEBUG_LOG(LOGIDENTIFIER, "adding cue ", cueData.get());
+ INFO_LOG(LOGIDENTIFIER, "adding cue ", cueData.get());
client()->addGenericCue(cueData);
}
@@ -426,7 +426,7 @@
if (cue->status() != GenericCueData::Complete)
continue;
- DEBUG_LOG(LOGIDENTIFIER, "removing cue ", *cue);
+ INFO_LOG(LOGIDENTIFIER, "removing cue ", *cue);
m_cues.remove(currentCue);
}
@@ -501,7 +501,7 @@
continue;
}
- DEBUG_LOG(LOGIDENTIFIER, "chunk type = '", type.toString(), "', size = ", (size_t)boxLength);
+ INFO_LOG(LOGIDENTIFIER, "chunk type = '", type.toString(), "', size = ", (size_t)boxLength);
do {
if (m_haveReportedVTTHeader || !formatDescription)
@@ -529,7 +529,7 @@
header.append(reinterpret_cast<const unsigned char*>(CFDataGetBytePtr(webvttHeaderData)), length);
header.append("\n\n");
- DEBUG_LOG(LOGIDENTIFIER, "VTT header ", &header);
+ INFO_LOG(LOGIDENTIFIER, "VTT header ", &header);
client()->parseWebVTTFileHeader(header.toString());
m_haveReportedVTTHeader = true;
} while (0);
@@ -537,7 +537,7 @@
if (type == ISOWebVTTCue::boxTypeName()) {
ISOWebVTTCue cueData = ISOWebVTTCue(presentationTime, duration);
cueData.read(view);
- DEBUG_LOG(LOGIDENTIFIER, "VTT cue data ", cueData);
+ INFO_LOG(LOGIDENTIFIER, "VTT cue data ", cueData);
client()->parseWebVTTCueData(cueData);
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (243071 => 243072)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2019-03-18 16:52:45 UTC (rev 243072)
@@ -1675,7 +1675,7 @@
RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawImage.get(), sRGBColorSpaceRef()));
#if !RELEASE_LOG_DISABLED
- DEBUG_LOG(LOGIDENTIFIER, "creating image took ", (MonotonicTime::now() - start).seconds());
+ INFO_LOG(LOGIDENTIFIER, "creating image took ", (MonotonicTime::now() - start).seconds());
#endif
return image;
@@ -2357,7 +2357,7 @@
m_lastImage = m_pixelBufferConformer->createImageFromPixelBuffer(m_lastPixelBuffer.get());
#if !RELEASE_LOG_DISABLED
- DEBUG_LOG(LOGIDENTIFIER, "creating buffer took ", (MonotonicTime::now() - start).seconds());
+ INFO_LOG(LOGIDENTIFIER, "creating buffer took ", (MonotonicTime::now() - start).seconds());
#endif
#endif // HAVE(CORE_VIDEO)
}
@@ -3154,7 +3154,7 @@
{
m_currentMetaData = metadata && ![metadata isKindOfClass:[NSNull class]] ? metadata : nil;
- DEBUG_LOG(LOGIDENTIFIER, "adding ", m_currentMetaData ? [m_currentMetaData.get() count] : 0, " at time ", mediaTime);
+ INFO_LOG(LOGIDENTIFIER, "adding ", m_currentMetaData ? [m_currentMetaData.get() count] : 0, " at time ", mediaTime);
#if ENABLE(DATACUE_VALUE)
if (seeking())
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (243071 => 243072)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2019-03-18 16:30:31 UTC (rev 243071)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2019-03-18 16:52:45 UTC (rev 243072)
@@ -406,7 +406,7 @@
void MediaPlayerPrivateMediaSourceAVFObjC::seekWithTolerance(const MediaTime& time, const MediaTime& negativeThreshold, const MediaTime& positiveThreshold)
{
- DEBUG_LOG(LOGIDENTIFIER, "time = ", time, ", negativeThreshold = ", negativeThreshold, ", positiveThreshold = ", positiveThreshold);
+ INFO_LOG(LOGIDENTIFIER, "time = ", time, ", negativeThreshold = ", negativeThreshold, ", positiveThreshold = ", positiveThreshold);
m_seeking = true;
auto weakThis = createWeakPtr();
@@ -437,7 +437,7 @@
m_lastSeekTime = MediaTime::createWithDouble(m_lastSeekTime.toDouble(), MediaTime::DefaultTimeScale);
MediaTime synchronizerTime = PAL::toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
- DEBUG_LOG(LOGIDENTIFIER, "seekTime = ", m_lastSeekTime, ", synchronizerTime = ", synchronizerTime);
+ INFO_LOG(LOGIDENTIFIER, "seekTime = ", m_lastSeekTime, ", synchronizerTime = ", synchronizerTime);
bool doesNotRequireSeek = synchronizerTime == m_lastSeekTime;
@@ -1163,7 +1163,7 @@
return false;
auto hasTarget = m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
- DEBUG_LOG(LOGIDENTIFIER, hasTarget);
+ INFO_LOG(LOGIDENTIFIER, hasTarget);
return hasTarget;
}
#endif
