- Revision
- 116964
- Author
- [email protected]
- Date
- 2012-05-14 10:45:05 -0700 (Mon, 14 May 2012)
Log Message
[EFL] Remove ewk_view_core_page_get().
https://bugs.webkit.org/show_bug.cgi?id=86326
Reviewed by Antonio Gomes.
Right now, we have both ewk_view_core_page_get() and
EWKPrivate::corePage() doing the same thing, but the latter is
better encapsulated.
Remove the former then.
* WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
(WebCore::AcceleratedCompositingContext::syncLayersNow): Add
missing ewk_private.h and use EWKPrivate::corePage().
* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::createWindow): Use
EWKPrivate::corePage().
* ewk/ewk_private.h: Remove ewk_view_core_page_get() declaration.
* ewk/ewk_view.cpp:
(_Ewk_View_Private_Data):
(EWKPrivate::corePage): Fix coding style while here.
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (116963 => 116964)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-14 17:32:43 UTC (rev 116963)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-14 17:45:05 UTC (rev 116964)
@@ -1,3 +1,27 @@
+2012-05-14 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Remove ewk_view_core_page_get().
+ https://bugs.webkit.org/show_bug.cgi?id=86326
+
+ Reviewed by Antonio Gomes.
+
+ Right now, we have both ewk_view_core_page_get() and
+ EWKPrivate::corePage() doing the same thing, but the latter is
+ better encapsulated.
+
+ Remove the former then.
+
+ * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
+ (WebCore::AcceleratedCompositingContext::syncLayersNow): Add
+ missing ewk_private.h and use EWKPrivate::corePage().
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (WebCore::ChromeClientEfl::createWindow): Use
+ EWKPrivate::corePage().
+ * ewk/ewk_private.h: Remove ewk_view_core_page_get() declaration.
+ * ewk/ewk_view.cpp:
+ (_Ewk_View_Private_Data):
+ (EWKPrivate::corePage): Fix coding style while here.
+
2012-05-11 Dominik Röttsches <[email protected]>
[EFL][DRT] Input Attribute Placeholder RefTests failing
Modified: trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp (116963 => 116964)
--- trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp 2012-05-14 17:32:43 UTC (rev 116963)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp 2012-05-14 17:45:05 UTC (rev 116964)
@@ -29,6 +29,7 @@
#include "PageClientEfl.h"
#include "TextureMapperGL.h"
#include "TextureMapperLayer.h"
+#include "ewk_private.h"
namespace WebCore {
@@ -69,7 +70,7 @@
if (m_rootGraphicsLayer)
m_rootGraphicsLayer->syncCompositingStateForThisLayerOnly();
- ewk_view_core_page_get(m_view)->mainFrame()->view()->syncCompositingStateIncludingSubframes();
+ EWKPrivate::corePage(m_view)->mainFrame()->view()->syncCompositingStateIncludingSubframes();
}
void AcceleratedCompositingContext::renderLayers()
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (116963 => 116964)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2012-05-14 17:32:43 UTC (rev 116963)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2012-05-14 17:45:05 UTC (rev 116964)
@@ -149,7 +149,7 @@
if (!newView)
return 0;
- return ewk_view_core_page_get(newView);
+ return EWKPrivate::corePage(newView);
}
void ChromeClientEfl::show()
Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (116963 => 116964)
--- trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-05-14 17:32:43 UTC (rev 116963)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-05-14 17:45:05 UTC (rev 116964)
@@ -154,7 +154,6 @@
void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
void ewk_view_scroll(Evas_Object* ewkView, Evas_Coord deltaX, Evas_Coord deltaY, Evas_Coord scrollX, Evas_Coord scrollY, Evas_Coord scrollWidth, Evas_Coord scrollHeight, Evas_Coord centerX, Evas_Coord centerY, Evas_Coord centerW, Evas_Coord centerHeight);
-WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView);
WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* ewkView, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer);
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (116963 => 116964)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-05-14 17:32:43 UTC (rev 116963)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-05-14 17:45:05 UTC (rev 116964)
@@ -3515,13 +3515,6 @@
_ewk_view_smart_changed(smartData);
}
-WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView)
-{
- EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
- EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
- return priv->page.get();
-}
-
/**
* Creates a new frame for given url and owner element.
*
@@ -4283,7 +4276,7 @@
namespace EWKPrivate {
-WebCore::Page *corePage(const Evas_Object *ewkView)
+WebCore::Page* corePage(const Evas_Object* ewkView)
{
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
