Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

1 files changed, 10 insertions, 9 deletions

diff --git a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
index 51a78c9b4..993135ee4 100644
--- a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
+++ b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
@@ -139,7 +139,7 @@ Evas_Object* DumpRenderTreeChrome::createView() const
     return view;
 }
 
-Evas_Object* DumpRenderTreeChrome::createWebInspectorView()
+Evas_Object* DumpRenderTreeChrome::createInspectorView()
 {
     Evas_Object* inspectorView = drtViewAdd(m_evas);
     if (!inspectorView)
@@ -161,9 +161,9 @@ Evas_Object* DumpRenderTreeChrome::createWebInspectorView()
     return inspectorView;
 }
 
-void DumpRenderTreeChrome::removeWebInspectorView()
+void DumpRenderTreeChrome::removeInspectorView()
 {
-    Evas_Object* inspectorView = ewk_view_web_inspector_view_get(mainView());
+    Evas_Object* inspectorView = ewk_view_inspector_view_get(mainView());
     if (!inspectorView)
         return;
 
@@ -171,14 +171,14 @@ void DumpRenderTreeChrome::removeWebInspectorView()
     evas_object_smart_callback_del(mainFrame, "load,finished", onInspectorFrameLoadFinished);
 
     evas_object_del(inspectorView);
-    ewk_view_web_inspector_view_set(mainView(), 0);
+    ewk_view_inspector_view_set(mainView(), 0);
 }
 
 void DumpRenderTreeChrome::waitInspectorLoadFinished()
 {
     // Waits until the page has finished loading.
     // Because it can't complete loading inspector.html before loading testURL.
-    Evas_Object* inspectorView = ewk_view_web_inspector_view_get(mainView());
+    Evas_Object* inspectorView = ewk_view_inspector_view_get(mainView());
     if (inspectorView)
         ecore_main_loop_begin();
 }
@@ -318,6 +318,7 @@ void DumpRenderTreeChrome::resetDefaultsToConsistentValues()
     DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false);
     DumpRenderTreeSupportEfl::setMinimumLogicalFontSize(mainView(), 9);
     DumpRenderTreeSupportEfl::setCSSRegionsEnabled(mainView(), true);
+    DumpRenderTreeSupportEfl::setShouldTrackVisitedLinks(false);
 
     // Reset capacities for the memory cache for dead objects.
     static const unsigned cacheTotalCapacity =  8192 * 1024;
@@ -676,19 +677,19 @@ void DumpRenderTreeChrome::onWebViewPopulateVisitedLinks(void*, Evas_Object* ewk
 
 void DumpRenderTreeChrome::onInspectorViewCreate(void*, Evas_Object*, void*)
 {
-    Evas_Object* inspectorView = browser->createWebInspectorView();
+    Evas_Object* inspectorView = browser->createInspectorView();
     if (inspectorView)
-        ewk_view_web_inspector_view_set(browser->mainView(), inspectorView);
+        ewk_view_inspector_view_set(browser->mainView(), inspectorView);
 }
 
 void DumpRenderTreeChrome::onInspectorViewClose(void*, Evas_Object*, void*)
 {
-    browser->removeWebInspectorView();
+    browser->removeInspectorView();
 }
 
 void DumpRenderTreeChrome::onInspectorFrameLoadFinished(void*, Evas_Object*, void*)
 {
-    Evas_Object* inspectorView = ewk_view_web_inspector_view_get(browser->mainView());
+    Evas_Object* inspectorView = ewk_view_inspector_view_get(browser->mainView());
     if (inspectorView)
         ecore_main_loop_quit();
 }