[webkit-changes] [97704] trunk/Source/WebKit/efl

Mon, 17 Oct 2011 19:58:47 -0700

Title: [97704] trunk/Source/WebKit/efl
Revision
97704
Author
[email protected]
Date
2011-10-17 19:59:42 -0700 (Mon, 17 Oct 2011)

Log Message

[EFL] Expose the kit() frame function to the rest of ewk.
https://bugs.webkit.org/show_bug.cgi?id=70253

Patch by Raphael Kubo da Costa <[email protected]> on 2011-10-17
Reviewed by Antonio Gomes.

Now that we have the EWKPrivate namespace, it makes sense to make the
kit() function accessible there instead of having it as a static local
function in ewk_frame.

While on it, get rid of ewk_frame_core_get, which is obsolete after
EWKPrivate::coreFrame.

* WebCoreSupport/EditorClientEfl.cpp:
(WebCore::EditorClientEfl::respondToChangedSelection):
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::callPolicyFunction):
(WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNewWindowAction):
(WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNavigationAction):
(WebCore::FrameLoaderClientEfl::didTransferChildFrameToNewDocument):
(WebCore::FrameLoaderClientEfl::dispatchDidClearWindowObjectInWorld):
(WebCore::FrameLoaderClientEfl::dispatchCreatePage):
(WebCore::FrameLoaderClientEfl::createNetworkingContext):
* ewk/ewk_frame.cpp:
(_ewk_frame_loader_efl_get):
(_ewk_frame_children_iterator_next):
(ewk_frame_child_find):
(ewk_frame_hit_test_new):
(EWKPrivate::kitFrame):
* ewk/ewk_private.h:
* ewk/ewk_view.cpp:
(ewk_view_setting_encoding_custom_get):
(ewk_view_setting_encoding_custom_set):

Modified Paths

Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (97703 => 97704)


--- trunk/Source/WebKit/efl/ChangeLog	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/ChangeLog	2011-10-18 02:59:42 UTC (rev 97704)
@@ -1,5 +1,40 @@
 2011-10-17  Raphael Kubo da Costa  <[email protected]>
 
+        [EFL] Expose the kit() frame function to the rest of ewk.
+        https://bugs.webkit.org/show_bug.cgi?id=70253
+
+        Reviewed by Antonio Gomes.
+
+        Now that we have the EWKPrivate namespace, it makes sense to make the
+        kit() function accessible there instead of having it as a static local
+        function in ewk_frame.
+
+        While on it, get rid of ewk_frame_core_get, which is obsolete after
+        EWKPrivate::coreFrame.
+
+        * WebCoreSupport/EditorClientEfl.cpp:
+        (WebCore::EditorClientEfl::respondToChangedSelection):
+        * WebCoreSupport/FrameLoaderClientEfl.cpp:
+        (WebCore::FrameLoaderClientEfl::callPolicyFunction):
+        (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNavigationAction):
+        (WebCore::FrameLoaderClientEfl::didTransferChildFrameToNewDocument):
+        (WebCore::FrameLoaderClientEfl::dispatchDidClearWindowObjectInWorld):
+        (WebCore::FrameLoaderClientEfl::dispatchCreatePage):
+        (WebCore::FrameLoaderClientEfl::createNetworkingContext):
+        * ewk/ewk_frame.cpp:
+        (_ewk_frame_loader_efl_get):
+        (_ewk_frame_children_iterator_next):
+        (ewk_frame_child_find):
+        (ewk_frame_hit_test_new):
+        (EWKPrivate::kitFrame):
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (ewk_view_setting_encoding_custom_get):
+        (ewk_view_setting_encoding_custom_set):
+
+2011-10-17  Raphael Kubo da Costa  <[email protected]>
+
         [EFL] Do not check for Frame::contentRenderer() in ewk_view_repaint.
         https://bugs.webkit.org/show_bug.cgi?id=70118

Modified: trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (97703 => 97704)


--- trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp	2011-10-18 02:59:42 UTC (rev 97704)
@@ -143,7 +143,7 @@
     if (!frame)
         return;
 
-    WebCore::Frame* coreFrame = ewk_frame_core_get(frame);
+    WebCore::Frame* coreFrame = EWKPrivate::coreFrame(frame);
 
     if (!coreFrame)
         return;

Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (97703 => 97704)


--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp	2011-10-18 02:59:42 UTC (rev 97704)
@@ -129,7 +129,7 @@
 
 void FrameLoaderClientEfl::callPolicyFunction(FramePolicyFunction function, PolicyAction action)
 {
-    Frame* f = ewk_frame_core_get(m_frame);
+    Frame* f = EWKPrivate::coreFrame(m_frame);
     ASSERT(f);
     (f->loader()->policyChecker()->*function)(action);
 }
@@ -292,7 +292,7 @@
 
     // if not acceptNavigationRequest - look at Qt -> PolicyIgnore;
     // FIXME: do proper check and only reset forms when on PolicyIgnore
-    Frame* f = ewk_frame_core_get(m_frame);
+    Frame* f = EWKPrivate::coreFrame(m_frame);
     f->loader()->resetMultipleFormSubmissionProtection();
     callPolicyFunction(function, PolicyUse);
 }
@@ -319,7 +319,7 @@
         policy = PolicyIgnore;
     else {
         if (action.type() == NavigationTypeFormSubmitted || action.type() == NavigationTypeFormResubmitted) {
-            Frame* f = ewk_frame_core_get(m_frame);
+            Frame* f = EWKPrivate::coreFrame(m_frame);
             f->loader()->resetMultipleFormSubmissionProtection();
         }
         policy = PolicyUse;
@@ -349,7 +349,7 @@
 {
     ASSERT(m_frame);
 
-    Frame* currentFrame = ewk_frame_core_get(m_frame);
+    Frame* currentFrame = EWKPrivate::coreFrame(m_frame);
     Evas_Object* currentView = ewk_frame_view_get(m_frame);
     Frame* parentFrame = currentFrame->tree()->parent();
 
@@ -428,7 +428,7 @@
     if (world != mainThreadNormalWorld())
         return;
 
-    Frame* coreFrame = ewk_frame_core_get(m_frame);
+    Frame* coreFrame = EWKPrivate::coreFrame(m_frame);
     ASSERT(coreFrame);
 
     Settings* settings = coreFrame->settings();
@@ -888,7 +888,7 @@
     else
         mainFrame = ewk_view_frame_main_get(newView);
 
-    return ewk_frame_core_get(mainFrame);
+    return EWKPrivate::coreFrame(mainFrame);
 }
 
 void FrameLoaderClientEfl::dispatchUnableToImplementPolicy(const ResourceError&)
@@ -956,7 +956,7 @@
 
 PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext()
 {
-    return FrameNetworkingContextEfl::create(ewk_frame_core_get(m_frame));
+    return FrameNetworkingContextEfl::create(EWKPrivate::coreFrame(m_frame));
 }
 
 }

Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (97703 => 97704)


--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp	2011-10-18 02:59:42 UTC (rev 97704)
@@ -135,21 +135,11 @@
 }
 #endif
 
-static WebCore::FrameLoaderClientEfl* _ewk_frame_loader_efl_get(WebCore::Frame* frame)
+static WebCore::FrameLoaderClientEfl* _ewk_frame_loader_efl_get(const WebCore::Frame* frame)
 {
     return static_cast<WebCore::FrameLoaderClientEfl*>(frame->loader()->client());
 }
 
-static inline Evas_Object* kit(WebCore::Frame* frame)
-{
-    if (!frame)
-        return 0;
-    WebCore::FrameLoaderClientEfl* fl = _ewk_frame_loader_efl_get(frame);
-    if (!fl)
-        return 0;
-    return fl->webFrame();
-}
-
 static Eina_Bool _ewk_frame_children_iterator_next(Eina_Iterator_Ewk_Frame* it, Evas_Object** data)
 {
     EWK_FRAME_SD_GET_OR_RETURN(it->obj, sd, EINA_FALSE);
@@ -159,7 +149,7 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(tree, EINA_FALSE);
 
     if (it->currentIndex < tree->childCount()) {
-        *data = ""
+        *data = ""
         return EINA_TRUE;
     }
 
@@ -315,7 +305,7 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(name, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
     WTF::String s = WTF::String::fromUTF8(name);
-    return kit(sd->frame->tree()->find(WTF::AtomicString(s)));
+    return EWKPrivate::kitFrame(sd->frame->tree()->find(WTF::AtomicString(s)));
 }
 
 Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
@@ -695,12 +685,12 @@
     hit_test->alternate_text = eina_stringshare_add(result.altDisplayString().utf8().data());
     if (result.innerNonSharedNode() && result.innerNonSharedNode()->document()
         && result.innerNonSharedNode()->document()->frame())
-        hit_test->frame = kit(result.innerNonSharedNode()->document()->frame());
+        hit_test->frame = EWKPrivate::kitFrame(result.innerNonSharedNode()->document()->frame());
 
     hit_test->link.text = eina_stringshare_add(result.textContent().utf8().data());
     hit_test->link.url = ""
     hit_test->link.title = eina_stringshare_add(result.titleDisplayString().utf8().data());
-    hit_test->link.target_frame = kit(result.targetFrame());
+    hit_test->link.target_frame = EWKPrivate::kitFrame(result.targetFrame());
 
     hit_test->image_uri = eina_stringshare_add(result.absoluteImageURL().string().utf8().data());
     hit_test->media_uri = eina_stringshare_add(result.absoluteMediaURL().string().utf8().data());
@@ -1183,20 +1173,6 @@
 
 /**
  * @internal
- * Retrieve WebCore::Frame associated with this object.
- *
- * Avoid using this call from outside, add specific ewk_frame_*
- * actions instead.
- */
-WebCore::Frame* ewk_frame_core_get(const Evas_Object* ewkFrame)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
-    return sd->frame;
-}
-
-
-/**
- * @internal
  * Reports a resource will be requested. User may override behavior of webkit by
  * changing values in @param request.
  *
@@ -1664,4 +1640,16 @@
     return sd->frame;
 }
 
+Evas_Object* kitFrame(const WebCore::Frame* coreFrame)
+{
+    if (!coreFrame)
+        return 0;
+
+    WebCore::FrameLoaderClientEfl* frameLoaderClient = _ewk_frame_loader_efl_get(coreFrame);
+    if (!frameLoaderClient)
+        return 0;
+
+    return frameLoaderClient->webFrame();
+}
+
 } // namespace EWKPrivate

Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (97703 => 97704)


--- trunk/Source/WebKit/efl/ewk/ewk_private.h	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h	2011-10-18 02:59:42 UTC (rev 97704)
@@ -83,6 +83,8 @@
 WebCore::Page *corePage(const Evas_Object *ewkView);
 WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem);
 
+Evas_Object* kitFrame(const WebCore::Frame* coreFrame);
+
 } // namespace EWKPrivate
 
 void ewk_view_ready(Evas_Object* o);
@@ -187,7 +189,6 @@
 Eina_Bool ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer);
 void ewk_frame_view_set(Evas_Object* o, Evas_Object* newParent);
 
-WebCore::Frame* ewk_frame_core_get(const Evas_Object* o);
 void ewk_frame_core_gone(Evas_Object* o);
 
 void ewk_frame_load_started(Evas_Object* o);

Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (97703 => 97704)


--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2011-10-18 02:25:32 UTC (rev 97703)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2011-10-18 02:59:42 UTC (rev 97704)
@@ -2094,7 +2094,7 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     Evas_Object* main_frame = ewk_view_frame_main_get(ewkView);
-    WebCore::Frame* core_frame = ewk_frame_core_get(main_frame);
+    WebCore::Frame* core_frame = EWKPrivate::coreFrame(main_frame);
 
     String overrideEncoding = core_frame->loader()->documentLoader()->overrideEncoding();
 
@@ -2110,7 +2110,7 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     Evas_Object* main_frame = ewk_view_frame_main_get(ewkView);
-    WebCore::Frame* core_frame = ewk_frame_core_get(main_frame);
+    WebCore::Frame* core_frame = EWKPrivate::coreFrame(main_frame);
     DBG("%s", encoding);
     if (eina_stringshare_replace(&priv->settings.encoding_custom, encoding))
         core_frame->loader()->reloadWithOverrideEncoding(String::fromUTF8(encoding));

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to