Changeset 111673 in webkit

Timestamp:

Mar 22, 2012 5:43:03 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Add PageClientEfl to WebCoreSupport.
​https://bugs.webkit.org/show_bug.cgi?id=80748

Patch by Hyowon Kim <​hw1008.kim@samsung.com> on 2012-03-22
Reviewed by Noam Rosenthal.

Source/WebCore:

• platform/Widget.h: Use PageClientEfl as type for PlatformPageClient.

(WebCore):

• platform/graphics/efl/GraphicsContext3DPrivate.cpp:

(WebCore::GraphicsContext3DPrivate::createSurface): Change the argument type.

• plugins/efl/PluginViewEfl.cpp:

(WebCore::PluginView::platformGetValue): Use PageClientEfl.

Source/WebKit:

• PlatformEfl.cmake: Add WebCore/platform/graphics/efl to the include path

and PageClientEfl.cpp to the source list.

Source/WebKit/efl:

This patch adds PageClientEfl for implementaion of accelerated compositing.

• WebCoreSupport/ChromeClientEfl.cpp:

(WebCore::ChromeClientEfl::platformPageClient):

• WebCoreSupport/PageClientEfl.cpp: Added.

(WebCore):
(WebCore::PageClientEfl::PageClientEfl):
(WebCore::PageClientEfl::~PageClientEfl):
(WebCore::PageClientEfl::createEvasObjectForAcceleratedCompositing):
Just call ewk_view_accelerated_compositing_object_create().
(WebCore::PageClientEfl::acceleratedCompositingContext):
Just call ewk_view_accelerated_compositing_context_get().

• WebCoreSupport/PageClientEfl.h: Added.

(WebCore):
(PageClientEfl):
(WebCore::PageClientEfl::view): Return ewkView.

• ewk/ewk_private.h:

(WebCore):
(EWKPrivate):

• ewk/ewk_view.cpp:

(_Ewk_View_Private_Data): Add OwnPtr<PageClientEfl>.
(_ewk_view_priv_new): Create a new PageClientEfl.
(ewk_view_accelerated_compositing_object_create): Not implemented.
(ewk_view_accelerated_compositing_context_get): Not implemented.
(EWKPrivate::corePageClient): Return the PageClientEfl pointer.
(EWKPrivate):

Source/WTF:

• wtf/Platform.h: Disable accelerated compositing. It's not ready yet.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Widget.h (modified) (1 diff)
• WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp (modified) (1 diff)
• WebCore/plugins/efl/PluginViewEfl.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformEfl.cmake (modified) (2 diffs)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/PageClientEfl.cpp (added)
• WebKit/efl/WebCoreSupport/PageClientEfl.h (added)
• WebKit/efl/ewk/ewk_private.h (modified) (4 diffs)
• WebKit/efl/ewk/ewk_view.cpp (modified) (6 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
+
+        [EFL] Add PageClientEfl to WebCoreSupport.
+        https://bugs.webkit.org/show_bug.cgi?id=80748
+
+        Reviewed by Noam Rosenthal.
+
+        * wtf/Platform.h: Disable accelerated compositing. It's not ready yet.
+
 2012-03-21  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1063 +1063 @@
 
 /* Accelerated compositing */
-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(EFL)
+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO))
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
+
+        [EFL] Add PageClientEfl to WebCoreSupport.
+        https://bugs.webkit.org/show_bug.cgi?id=80748
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/Widget.h: Use PageClientEfl as type for PlatformPageClient.
+        (WebCore):
+        * platform/graphics/efl/GraphicsContext3DPrivate.cpp:
+        (WebCore::GraphicsContext3DPrivate::createSurface): Change the argument type.
+        * plugins/efl/PluginViewEfl.cpp:
+        (WebCore::PluginView::platformGetValue): Use PageClientEfl.
+
 2012-03-22  Kaustubh Atrawalkar  <kaustubh@motorola.com>
 

trunk/Source/WebCore/platform/Widget.h

@@ -91 +91 @@
 #include "PageClientBlackBerry.h"
 typedef PageClientBlackBerry* PlatformPageClient;
+#elif PLATFORM(EFL)
+namespace WebCore {
+class PageClientEfl;
+typedef PageClientEfl* PlatformPageClient;
+}
 #else
 typedef PlatformWidget PlatformPageClient;

trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp

@@ -140 +140 @@
 
         // Create and specially set up a evas_object which act as the render targer surface.
-        if (!pageClient->createEvasObjectForAcceleratedCompositing(&nativeSurface, x, y, width, height))
+        if (!pageClient->createEvasObjectForAcceleratedCompositing(&nativeSurface, IntRect(x, y, width, height)))
             return false;
     }

trunk/Source/WebCore/plugins/efl/PluginViewEfl.cpp

@@ -39 +39 @@
 #include "MouseEvent.h"
 #include "NotImplemented.h"
+#include "PageClientEfl.h"
 #include "PluginPackage.h"
 #include "npruntime_impl.h"
@@ -283 +284 @@
 
     case NPNVnetscapeWindow: {
-        Evas_Object* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
+        PageClientEfl* pageClient = static_cast<PageClientEfl*>(m_parentFrame->view()->hostWindow()->platformPageClient());
+        Evas_Object* widget = pageClient->view();
         Evas* evas = evas_object_evas_get(widget);
         Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(evas);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
+
+        [EFL] Add PageClientEfl to WebCoreSupport.
+        https://bugs.webkit.org/show_bug.cgi?id=80748
+
+        Reviewed by Noam Rosenthal.
+
+        * PlatformEfl.cmake: Add WebCore/platform/graphics/efl to the include path
+        and PageClientEfl.cpp to the source list.
+
 2012-03-20  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebKit/PlatformEfl.cmake

@@ -14 +14 @@
     "${WEBCORE_DIR}/platform/efl"
     "${WEBCORE_DIR}/platform/graphics/cairo"
+    "${WEBCORE_DIR}/platform/graphics/efl"
     ${Cairo_INCLUDE_DIRS}
     ${ECORE_X_INCLUDE_DIRS}
@@ -81 +82 @@
     efl/WebCoreSupport/InspectorClientEfl.cpp
     efl/WebCoreSupport/NotificationPresenterClientEfl.cpp
+    efl/WebCoreSupport/PageClientEfl.cpp
 
     efl/ewk/ewk_auth.cpp

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-03-22  Hyowon Kim  <hw1008.kim@samsung.com>
+
+        [EFL] Add PageClientEfl to WebCoreSupport.
+        https://bugs.webkit.org/show_bug.cgi?id=80748
+
+        Reviewed by Noam Rosenthal.
+
+        This patch adds PageClientEfl for implementaion of accelerated compositing.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::platformPageClient):
+        * WebCoreSupport/PageClientEfl.cpp: Added.
+        (WebCore):
+        (WebCore::PageClientEfl::PageClientEfl):
+        (WebCore::PageClientEfl::~PageClientEfl):
+        (WebCore::PageClientEfl::createEvasObjectForAcceleratedCompositing):
+        Just call ewk_view_accelerated_compositing_object_create().
+        (WebCore::PageClientEfl::acceleratedCompositingContext):
+        Just call ewk_view_accelerated_compositing_context_get().
+        * WebCoreSupport/PageClientEfl.h: Added.
+        (WebCore):
+        (PageClientEfl):
+        (WebCore::PageClientEfl::view): Return ewkView.
+        * ewk/ewk_private.h:
+        (WebCore):
+        (EWKPrivate):
+        * ewk/ewk_view.cpp:
+        (_Ewk_View_Private_Data): Add OwnPtr<PageClientEfl>.
+        (_ewk_view_priv_new): Create a new PageClientEfl.
+        (ewk_view_accelerated_compositing_object_create): Not implemented.
+        (ewk_view_accelerated_compositing_context_get): Not implemented.
+        (EWKPrivate::corePageClient): Return the PageClientEfl pointer.
+        (EWKPrivate):
+
 2012-03-19  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -340 +340 @@
 PlatformPageClient ChromeClientEfl::platformPageClient() const
 {
-    return m_view;
+    return EWKPrivate::corePageClient(m_view);
 }
 

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -37 +37 @@
 #include "ewk_view.h"
 #include <Evas.h>
+#if USE(ACCELERATED_COMPOSITING)
+#include <Evas_GL.h>
+#endif
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
@@ -75 +78 @@
 struct ContextMenu;
 struct ContextMenuItem;
+#if USE(ACCELERATED_COMPOSITING)
+class GraphicsContext3D;
+class GraphicsLayer;
+#endif
 }
 
@@ -88 +95 @@
 WebCore::Page *corePage(const Evas_Object *ewkView);
 WebCore::HistoryItem *coreHistoryItem(const Ewk_History_Item *ewkHistoryItem);
+WebCore::PlatformPageClient corePageClient(Evas_Object* ewkView);
 
 Evas_Object* kitFrame(const WebCore::Frame* coreFrame);
@@ -235 +243 @@
 void ewk_view_mixed_content_run_set(Evas_Object* ewkView, bool hasRun);
 
+#if USE(ACCELERATED_COMPOSITING)
+bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect);
+WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView);
+#endif
+
 #endif // ewk_private_h

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -46 +46 @@
 #include "JSLock.h"
 #include "LayoutTypes.h"
+#include "PageClientEfl.h"
 #include "PlatformMouseEvent.h"
 #include "PopupMenuClient.h"
@@ -77 +78 @@
 #if ENABLE(BATTERY_STATUS)
 #include "BatteryClientEfl.h"
+#endif
+
+#if USE(ACCELERATED_COMPOSITING)
+#include "NotImplemented.h"
 #endif
 
@@ -143 +148 @@
     WebCore::ViewportArguments viewportArguments;
     Ewk_History* history;
+    OwnPtr<WebCore::PageClientEfl> pageClient;
     struct {
         Ewk_Menu menu;
@@ -717 +723 @@
     priv->soupSession = WebCore::ResourceHandle::defaultSession();
 
+    priv->pageClient = adoptPtr(new WebCore::PageClientEfl(smartData->self));
+
     return priv;
 }
@@ -3925 +3933 @@
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect)
+{
+    notImplemented();
+    return false;
+}
+
+WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView)
+{
+    notImplemented();
+    return 0;
+}
+#endif
+
 namespace EWKPrivate {
 
@@ -3934 +3956 @@
 }
 
+WebCore::PlatformPageClient corePageClient(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
+    return priv->pageClient.get();
+}
+
 } // namespace EWKPrivate