Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / shell / renderer / test_runner / WebTestProxy.cpp

diff --git a/src/content/shell/renderer/test_runner/WebTestProxy.cpp b/src/content/shell/renderer/test_runner/WebTestProxy.cpp
index f083294..7a82cfd 100644 (file)
--- a/src/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/src/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -40,7 +40,6 @@
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebPrintParams.h"
 #include "third_party/WebKit/public/web/WebRange.h"
-#include "third_party/WebKit/public/web/WebScriptController.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ -472,8 +471,6 @@ void WebTestProxyBase::moveValidationMessage(const WebRect&)
 
 string WebTestProxyBase::captureTree(bool debugRenderTree)
 {
-    WebScriptController::flushConsoleMessages();
-
     bool shouldDumpAsText = m_testInterfaces->testRunner()->shouldDumpAsText();
     bool shouldDumpAsMarkup = m_testInterfaces->testRunner()->shouldDumpAsMarkup();
     bool shouldDumpAsPrinted = m_testInterfaces->testRunner()->isPrinting();
@@ -738,6 +735,11 @@ void WebTestProxyBase::animateNow()
     }
 }
 
+bool WebTestProxyBase::isCompositorFramePending() const
+{
+    return m_animateScheduled || !m_paintRect.isEmpty();
+}
+
 void WebTestProxyBase::show(WebNavigationPolicy)
 {
     invalidateAll();
@@ -896,7 +898,7 @@ bool WebTestProxyBase::createView(WebFrame*, const WebURLRequest& request, const
 
 WebPlugin* WebTestProxyBase::createPlugin(WebFrame* frame, const WebPluginParams& params)
 {
-    if (params.mimeType == TestPlugin::mimeType())
+    if (TestPlugin::isSupportedMimeType(params.mimeType))
         return TestPlugin::create(frame, params, m_delegate);
     return 0;
 }