Attachment 121988 Details for Bug 75947 – Patch

[patch] Patch

bug-75947-20120111171443.patch (text/plain), 5.28 KB, created by Ryuan Choi on 2012-01-11 00:14:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ryuan Choi

Created: 2012-01-11 00:14:45 PST

Size: 5.28 KB

patch

obsolete

>Subversion Revision: 104675
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 064d7ff769e6ef601ed4c728fcd78cc73ea4b712..0d28c75818c604c9258ca285f8e719d64939e6c5 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,24 @@
>+2012-01-11  Ryuan Choi  <ryuan.choi@samsung.com>
>+
>+        [EFL][WK2] Rename viewObject to viewWidget
>+        https://bugs.webkit.org/show_bug.cgi?id=75947
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rename viewObject to viewWidget for the EFL port to use WidgetBackingStore
>+        which calls viewWidget().
>+
>+        * UIProcess/API/efl/PageClientImpl.cpp:
>+        (WebKit::PageClientImpl::PageClientImpl):
>+        (WebKit::PageClientImpl::setViewNeedsDisplay):
>+        (WebKit::PageClientImpl::viewSize):
>+        * UIProcess/API/efl/PageClientImpl.h:
>+        (WebKit::PageClientImpl::create):
>+        (WebKit::PageClientImpl::viewWidget):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/efl/WebPageProxyEfl.cpp:
>+        (WebKit::WebPageProxy::viewWidget):
>+
> 2012-01-10  Mark Rowe  <mrowe@apple.com>
> 
>         REGRESSION (r104377): All pages print blank on Snow Leopard
>diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
>index aaee9563d571f0fe52cc6cd01f021efc2577c8a1..9d9d09dfee374b3f5ebe346fdf92efe2e1ec0a19 100644
>--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
>+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
>@@ -37,8 +37,8 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-PageClientImpl::PageClientImpl(WebContext* context, WebPageGroup* pageGroup, Evas_Object* viewObject)
>-    : m_viewObject(viewObject)
>+PageClientImpl::PageClientImpl(WebContext* context, WebPageGroup* pageGroup, Evas_Object* viewWidget)
>+    : m_viewWidget(viewWidget)
> {
>     m_page = context->createWebPage(this, pageGroup);
>     m_page->initializeWebPage();
>@@ -56,7 +56,7 @@ PassOwnPtr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
> 
> void PageClientImpl::setViewNeedsDisplay(const WebCore::IntRect& rect)
> {
>-    evas_object_image_data_update_add(m_viewObject, rect.x(), rect.y(), rect.width(), rect.height());
>+    evas_object_image_data_update_add(m_viewWidget, rect.x(), rect.y(), rect.width(), rect.height());
> }
> 
> void PageClientImpl::displayView()
>@@ -72,7 +72,7 @@ void PageClientImpl::scrollView(const WebCore::IntRect& scrollRect, const WebCor
> WebCore::IntSize PageClientImpl::viewSize()
> {
>     int width, height;
>-    evas_object_geometry_get(m_viewObject, 0, 0, &width, &height);
>+    evas_object_geometry_get(m_viewWidget, 0, 0, &width, &height);
>     return IntSize(width, height);
> }
> 
>diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
>index 01a2483c76588dd4f9f8ef5cf96f33bb4b721eda..2522153d447ec74986c7398b37605605979307e7 100644
>--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
>+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
>@@ -33,13 +33,13 @@ namespace WebKit {
> 
> class PageClientImpl : public PageClient {
> public:
>-    static PassOwnPtr<PageClientImpl> create(WebContext* context, WebPageGroup* pageGroup, Evas_Object* viewObject)
>+    static PassOwnPtr<PageClientImpl> create(WebContext* context, WebPageGroup* pageGroup, Evas_Object* viewWidget)
>     {
>-        return adoptPtr(new PageClientImpl(context, pageGroup, viewObject));
>+        return adoptPtr(new PageClientImpl(context, pageGroup, viewWidget));
>     }
>     ~PageClientImpl();
> 
>-    Evas_Object* viewObject() const { return m_viewObject; }
>+    Evas_Object* viewWidget() const { return m_viewWidget; }
> 
>     WebPageProxy* page() const { return m_page.get(); }
> 
>@@ -100,7 +100,7 @@ private:
> 
> private:
>     RefPtr<WebPageProxy> m_page;
>-    Evas_Object* m_viewObject;
>+    Evas_Object* m_viewWidget;
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
>index cf5130419c67ed82dcb3776d67cf7ac34c811c79..20a6195d808a8b8ced61cbee0e9198b3bdb4937f 100644
>--- a/Source/WebKit2/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
>@@ -107,6 +107,12 @@ class WKView;
> #endif
> #endif
> 
>+#if PLATFORM(GTK)
>+typedef GtkWidget* PlatformWidget;
>+#elif PLATFORM(EFL)
>+typedef Evas_Object* PlatformWidget;
>+#endif
>+
> namespace WebKit {
> 
> class NativeWebKeyboardEvent;
>@@ -358,11 +364,8 @@ public:
> 
>     HWND nativeWindow() const;
> #endif
>-#if PLATFORM(GTK)
>-    GtkWidget* viewWidget();
>-#endif
>-#if PLATFORM(EFL)
>-    Evas_Object* viewObject();
>+#if USE(CAIRO)
>+    PlatformWidget viewWidget();
> #endif
> #if USE(TILED_BACKING_STORE)
>     void setFixedVisibleContentRect(const WebCore::IntRect&);
>diff --git a/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp b/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
>index ae314b8578521360640f268539ab47f3e5c8a6a9..b076b4ef6933598445acf27d57601c18ad147119 100644
>--- a/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
>+++ b/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp
>@@ -33,9 +33,9 @@
> 
> namespace WebKit {
> 
>-Evas_Object* WebPageProxy::viewObject()
>+Evas_Object* WebPageProxy::viewWidget()
> {
>-    return static_cast<PageClientImpl*>(m_pageClient)->viewObject();
>+    return static_cast<PageClientImpl*>(m_pageClient)->viewWidget();
> }
> 
> String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)

Actions: View | Formatted Diff | Diff

Attachments on bug 75947: 121933 | 121988