Changeset 58121 in webkit

Timestamp:

Apr 22, 2010 3:41:32 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 Leandro Pereira <​leandro@profusion.mobi>

Reviewed by Gustavo Noronha Silva.

Update EWebKit (EFL port) to match recent API changes.
​http://webkit.org/b/37997

• efl/ewk/ewk_frame.cpp: (ewk_frame_zoom_set): Change to use WebCore::ZoomMode. (ewk_frame_zoom_text_only_set): Change to use WebCore::ZoomMode. (_ewk_frame_handle_key_scrolling): s/WebCore::VK_/VK_/g (ewk_frame_plugin_create): Disable temporarily PluginView-related code until a proper plugin implementation is made.
• efl/ewk/ewk_view.cpp: Fix typo in _parent_sc declaration. (ewk_view_selection_get): Fix a reference to WebCore::CString to WTF::CString.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/ewk/ewk_frame.cpp (modified) (6 diffs)
• efl/ewk/ewk_view.cpp (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-04-22  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Update EWebKit (EFL port) to match recent API changes.
+        http://webkit.org/b/37997
+
+        * efl/ewk/ewk_frame.cpp:
+        (ewk_frame_zoom_set): Change to use WebCore::ZoomMode.
+        (ewk_frame_zoom_text_only_set): Change to use WebCore::ZoomMode.
+        (_ewk_frame_handle_key_scrolling): s/WebCore::VK_/VK_/g
+        (ewk_frame_plugin_create): Disable temporarily PluginView-related
+        code until a proper plugin implementation is made.
+        * efl/ewk/ewk_view.cpp: Fix typo in _parent_sc declaration.
+        (ewk_view_selection_get): Fix a reference to WebCore::CString to
+        WTF::CString.
+
 2010-04-22  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebKit/efl/ewk/ewk_frame.cpp

@@ -989 +989 @@
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    sd->frame->setZoomFactor(zoom, sd->zoom_text_only);
+    WebCore::ZoomMode zoomMode;
+    if (sd->zoom_text_only)
+        zoomMode = WebCore::ZoomTextOnly;
+    else
+        zoomMode = WebCore::ZoomPage;
+    sd->frame->setZoomFactor(zoom, zoomMode);
     return EINA_TRUE;
 }
@@ -1023 +1028 @@
 
     sd->zoom_text_only = setting;
-    sd->frame->setZoomFactor(sd->frame->zoomFactor(), setting);
+    WebCore::ZoomMode zoomMode;
+    if (sd->zoom_text_only)
+        zoomMode = WebCore::ZoomTextOnly;
+    else
+        zoomMode = WebCore::ZoomPage;
+    sd->frame->setZoomFactor(sd->frame->zoomFactor(), zoomMode);
     return EINA_TRUE;
 }
@@ -1425 +1435 @@
 
     switch (keyCode) {
-    case WebCore::VK_SPACE:
+    case VK_SPACE:
         granularity = WebCore::ScrollByPage;
         if (event.shiftKey())
@@ -1432 +1442 @@
             direction = WebCore::ScrollDown;
         break;
-    case WebCore::VK_NEXT:
+    case VK_NEXT:
         granularity = WebCore::ScrollByPage;
         direction = WebCore::ScrollDown;
         break;
-    case WebCore::VK_PRIOR:
+    case VK_PRIOR:
         granularity = WebCore::ScrollByPage;
         direction = WebCore::ScrollUp;
         break;
-    case WebCore::VK_HOME:
+    case VK_HOME:
         granularity = WebCore::ScrollByDocument;
         direction = WebCore::ScrollUp;
         break;
-    case WebCore::VK_END:
+    case VK_END:
         granularity = WebCore::ScrollByDocument;
         direction = WebCore::ScrollDown;
         break;
-    case WebCore::VK_LEFT:
+    case VK_LEFT:
         granularity = WebCore::ScrollByLine;
         direction = WebCore::ScrollLeft;
         break;
-    case WebCore::VK_RIGHT:
+    case VK_RIGHT:
         granularity = WebCore::ScrollByLine;
         direction = WebCore::ScrollRight;
         break;
-    case WebCore::VK_UP:
+    case VK_UP:
         direction = WebCore::ScrollUp;
         if (event.ctrlKey())
@@ -1463 +1473 @@
             granularity = WebCore::ScrollByLine;
         break;
-    case WebCore::VK_DOWN:
+    case VK_DOWN:
         direction = WebCore::ScrollDown;
          if (event.ctrlKey())
@@ -1824 +1834 @@
 WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WebCore::String>& paramNames, const WTF::Vector<WebCore::String>& paramValues, const WebCore::String& mimeType, bool loadManually)
 {
-    DBG("o=%p, size=%dx%d, element=%p, url=%s, mimeType=%s",
-        o, pluginSize.width(), pluginSize.height(), element,
-        url.prettyURL().utf8().data(), mimeType.utf8().data());
-
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
-
-    // TODO: emit signal and ask webkit users if something else should be done.
-    // like creating another x window (see gtk, it allows users to create
-    // GtkPluginWidget.
-
-    WTF::RefPtr<WebCore::PluginView> pluginView = WebCore::PluginView::create
-        (sd->frame, pluginSize, element, url, paramNames, paramValues,
-         mimeType, loadManually);
-
-    if (pluginView->status() == WebCore::PluginStatusLoadedSuccessfully)
-        return pluginView;
-
     return 0;
 }

trunk/WebKit/efl/ewk/ewk_view.cpp

@@ -495 +495 @@
 }
 
-static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_0;
+static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
 
 static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
@@ -1393 +1393 @@
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
-    WebCore::CString s = priv->page->focusController()->focusedOrMainFrame()->selectedText().utf8();
+    WTF::CString s = priv->page->focusController()->focusedOrMainFrame()->selectedText().utf8();
     if (s.isNull())
         return 0;