| Index: Source/WebCore/html/HTMLPlugInImageElement.cpp
|
| diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
|
| index 269c2b32f95b4a701c0970e6f525dece786dfe55..c9a3a82f2a2c572e1f3852046e797addf388252e 100644
|
| --- a/Source/WebCore/html/HTMLPlugInImageElement.cpp
|
| +++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp
|
| @@ -492,8 +492,8 @@ void HTMLPlugInImageElement::simulatedMouseClickTimerFired(DeferrableOneShotTime
|
|
|
| void HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn(const KURL& url)
|
| {
|
| - LOG(Plugins, "%p Plug-in URL: %s", this, m_url.utf8().data());
|
| - LOG(Plugins, " Loaded URL: %s", url.string().utf8().data());
|
| + LOG_INFO(Plugins, "%p Plug-in URL: %s", this, m_url.utf8().data());
|
| + LOG_INFO(Plugins, " Loaded URL: %s", url.string().utf8().data());
|
|
|
| m_loadedUrl = url;
|
|
|
| @@ -503,29 +503,29 @@ void HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn(const KURL& url)
|
|
|
| if (displayState() == Restarting) {
|
| setDisplayState(Playing);
|
| - LOG(Plugins, "%p Plug-in is explicitly restarting", this);
|
| + LOG_INFO(Plugins, "%p Plug-in is explicitly restarting", this);
|
| return;
|
| }
|
|
|
| if (displayState() == RestartingWithPendingMouseClick) {
|
| - LOG(Plugins, "%p Plug-in is explicitly restarting but also waiting for a click", this);
|
| + LOG_INFO(Plugins, "%p Plug-in is explicitly restarting but also waiting for a click", this);
|
| return;
|
| }
|
|
|
| bool inMainFrame = document()->frame() == document()->page()->mainFrame();
|
|
|
| if (document()->isPluginDocument() && inMainFrame) {
|
| - LOG(Plugins, "%p Plug-in document in main frame", this);
|
| + LOG_INFO(Plugins, "%p Plug-in document in main frame", this);
|
| return;
|
| }
|
|
|
| if (ScriptController::processingUserGesture()) {
|
| - LOG(Plugins, "%p Script is currently processing user gesture, set to play", this);
|
| + LOG_INFO(Plugins, "%p Script is currently processing user gesture, set to play", this);
|
| return;
|
| }
|
|
|
| if (m_createdDuringUserGesture) {
|
| - LOG(Plugins, "%p Plug-in was created when processing user gesture, set to play", this);
|
| + LOG_INFO(Plugins, "%p Plug-in was created when processing user gesture, set to play", this);
|
| return;
|
| }
|
|
|
| @@ -533,7 +533,7 @@ void HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn(const KURL& url)
|
| if (!inMainFrame && document()->page()->mainFrame() && document()->page()->mainFrame()->document())
|
| lastKnownUserGestureTimestamp = std::max(lastKnownUserGestureTimestamp, document()->page()->mainFrame()->document()->lastHandledUserGestureTimestamp());
|
| if (currentTime() - lastKnownUserGestureTimestamp < autostartSoonAfterUserGestureThreshold) {
|
| - LOG(Plugins, "%p Plug-in was created shortly after a user gesture, set to play", this);
|
| + LOG_INFO(Plugins, "%p Plug-in was created shortly after a user gesture, set to play", this);
|
| return;
|
| }
|
|
|
| @@ -550,12 +550,12 @@ void HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn(const KURL& url)
|
| if (inMainFrame && styleWidth.isPercent() && (styleWidth.percent() == 100)
|
| && styleHeight.isPercent() && (styleHeight.percent() == 100)
|
| && (static_cast<float>(contentArea) / visibleArea > sizingFullPageAreaRatioThreshold)) {
|
| - LOG(Plugins, "%p Plug-in is top level full page, set to play", this);
|
| + LOG_INFO(Plugins, "%p Plug-in is top level full page, set to play", this);
|
| return;
|
| }
|
|
|
| if (contentWidth <= sizingTinyDimensionThreshold || contentHeight <= sizingTinyDimensionThreshold) {
|
| - LOG(Plugins, "%p Plug-in is very small %dx%d, set to play", this, contentWidth, contentHeight);
|
| + LOG_INFO(Plugins, "%p Plug-in is very small %dx%d, set to play", this, contentWidth, contentHeight);
|
| return;
|
| }
|
|
|
| @@ -565,11 +565,11 @@ void HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn(const KURL& url)
|
| }
|
|
|
| if (document()->page()->plugInClient()->shouldAutoStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), url.host(), loadedMimeType())) {
|
| - LOG(Plugins, "%p Plug-in from (%s, %s) is marked to auto-start, set to play", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data());
|
| + LOG_INFO(Plugins, "%p Plug-in from (%s, %s) is marked to auto-start, set to play", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data());
|
| return;
|
| }
|
|
|
| - LOG(Plugins, "%p Plug-in from (%s, %s) is not auto-start, sized at %dx%d, set to wait for snapshot", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data(), contentWidth, contentHeight);
|
| + LOG_INFO(Plugins, "%p Plug-in from (%s, %s) is not auto-start, sized at %dx%d, set to wait for snapshot", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data(), contentWidth, contentHeight);
|
| setDisplayState(WaitingForSnapshot);
|
| }
|
|
|
| @@ -579,7 +579,7 @@ void HTMLPlugInImageElement::subframeLoaderDidCreatePlugIn(const Widget* widget)
|
| || !static_cast<const PluginViewBase*>(widget)->shouldAlwaysAutoStart())
|
| return;
|
|
|
| - LOG(Plugins, "%p Plug-in should auto-start, set to play", this);
|
| + LOG_INFO(Plugins, "%p Plug-in should auto-start, set to play", this);
|
| setDisplayState(Playing);
|
| }
|
|
|
|
|