[EFL][WK2] Rename EwkViewImpl class to EwkView

https://bugs.webkit.org/show_bug.cgi?id=107719

Reviewed by Andreas Kling.

Rename EwkViewImpl class to EwkView, due to ewk view
refactoring plan (https://bugs.webkit.org/show_bug.cgi?id=107662#c1).

* PlatformEfl.cmake:
* UIProcess/API/C/efl/WKView.cpp:
(WKViewCreate):
(WKViewCreateWithFixedLayout):
(WKViewGetPage):
(WKViewCreateSnapshot):
* UIProcess/API/efl/EwkView.cpp: Renamed from Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp.
(pageViewMap):
(EwkView::addToPageViewMap):
(EwkView::removeFromPageViewMap):
(EwkView::viewFromPageViewMap):
(EwkView::EwkView):
(EwkView::~EwkView):
(EwkView::smartData):
(EwkView::fromEvasObject):
(EwkView::wkPage):
(EwkView::setCursor):
(EwkView::setDeviceScaleFactor):
(EwkView::deviceScaleFactor):
(EwkView::transformFromScene):
(EwkView::transformToScene):
(EwkView::transformToScreen):
(EwkView::layerTreeRenderer):
(EwkView::displayTimerFired):
(EwkView::update):
(EwkView::enterFullScreen):
(EwkView::exitFullScreen):
(EwkView::windowGeometry):
(EwkView::setWindowGeometry):
(EwkView::setImageData):
(EwkView::size):
(EwkView::isFocused):
(EwkView::isVisible):
(EwkView::title):
(EwkView::inputMethodContext):
(EwkView::themePath):
(EwkView::setThemePath):
(EwkView::customTextEncodingName):
(EwkView::setCustomTextEncodingName):
(EwkView::setMouseEventsEnabled):
(EwkView::setTouchEventsEnabled):
(EwkView::informIconChange):
(EwkView::createGLSurface):
(EwkView::enterAcceleratedCompositingMode):
(EwkView::exitAcceleratedCompositingMode):
(EwkView::requestColorPicker):
(EwkView::dismissColorPicker):
(EwkView::showContextMenu):
(EwkView::hideContextMenu):
(EwkView::requestPopupMenu):
(EwkView::closePopupMenu):
(EwkView::requestJSAlertPopup):
(EwkView::requestJSConfirmPopup):
(EwkView::requestJSPromptPopup):
(EwkView::informDatabaseQuotaReached):
(EwkView::informURLChange):
(EwkView::windowFeatures):
(EwkView::createNewPage):
(EwkView::close):
(EwkView::onMouseDown):
(EwkView::onMouseUp):
(EwkView::onMouseMove):
(EwkView::feedTouchEvents):
(EwkView::onTouchDown):
(EwkView::onTouchUp):
(EwkView::onTouchMove):
(EwkView::onFaviconChanged):
(EwkView::takeSnapshot):
* UIProcess/API/efl/EwkView.h: Renamed from Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h.
(WebKit):
(WebCore):
(EwkView):
(EwkView::view):
(EwkView::page):
(EwkView::ewkContext):
(EwkView::settings):
(EwkView::backForwardList):
(EwkView::url):
(EwkView::faviconURL):
(EwkView::mouseEventsEnabled):
(EwkView::touchEventsEnabled):
(EwkView::setNeedsSurfaceResize):
(EwkView::smartCallback):
(EwkView::pageClient):
(EwkView::setPageScaleFactor):
(EwkView::pageScaleFactor):
(EwkView::setPagePosition):
(EwkView::pagePosition):
(EwkView::isHardwareAccelerated):
(EwkView::setDrawsBackground):
(EwkView::evasGLContext):
(EwkView::evasGLSurface):
* UIProcess/API/efl/ewk_context_menu.cpp:
(EwkContextMenu::EwkContextMenu):
* UIProcess/API/efl/ewk_context_menu_private.h:
(EwkContextMenu::create):
(EwkContextMenu):
* UIProcess/API/efl/ewk_download_job.cpp:
(EwkDownloadJob::EwkDownloadJob):
(EwkDownloadJob::view):
* UIProcess/API/efl/ewk_download_job_private.h:
(EwkDownloadJob::create):
(EwkDownloadJob):
* UIProcess/API/efl/ewk_popup_menu.cpp:
(EwkPopupMenu::EwkPopupMenu):
(EwkPopupMenu::close):
* UIProcess/API/efl/ewk_popup_menu_private.h:
(EwkPopupMenu::create):
(EwkPopupMenu):
* UIProcess/API/efl/ewk_settings.cpp:
(EwkSettings::preferences):
* UIProcess/API/efl/ewk_settings_private.h:
(EwkSettings::create):
(EwkSettings::EwkSettings):
(EwkSettings):
* UIProcess/API/efl/ewk_view.cpp:
(createEwkView):
(ewk_view_base_add):
* UIProcess/API/efl/ewk_view.h:
* UIProcess/API/efl/ewk_view_private.h:
* UIProcess/API/efl/ewk_window_features.cpp:
(EwkWindowFeatures::EwkWindowFeatures):
(EwkWindowFeatures::setToolbarVisible):
(EwkWindowFeatures::setStatusBarVisible):
(EwkWindowFeatures::setMenuBarVisible):
(EwkWindowFeatures::setResizable):
* UIProcess/API/efl/ewk_window_features_private.h:
(EwkWindowFeatures::create):
(EwkWindowFeatures):
* UIProcess/cairo/BackingStoreCairo.cpp:
(WebKit::BackingStore::incorporateUpdate):
* UIProcess/efl/ContextHistoryClientEfl.cpp:
(WebKit::ContextHistoryClientEfl::didNavigateWithNavigationData):
(WebKit::ContextHistoryClientEfl::didPerformClientRedirect):
(WebKit::ContextHistoryClientEfl::didPerformServerRedirect):
(WebKit::ContextHistoryClientEfl::didUpdateHistoryTitle):
* UIProcess/efl/ContextMenuClientEfl.cpp:
(ContextMenuClientEfl::ContextMenuClientEfl):
* UIProcess/efl/ContextMenuClientEfl.h:
(WebKit::ContextMenuClientEfl::create):
(ContextMenuClientEfl):
* UIProcess/efl/DownloadManagerEfl.cpp:
(WebKit::DownloadManagerEfl::decideDestinationWithSuggestedFilename):
(WebKit::DownloadManagerEfl::didFail):
(WebKit::DownloadManagerEfl::didCancel):
(WebKit::DownloadManagerEfl::didFinish):
(WebKit::DownloadManagerEfl::registerDownload):
* UIProcess/efl/DownloadManagerEfl.h:
(DownloadManagerEfl):
* UIProcess/efl/FindClientEfl.cpp:
(WebKit::FindClientEfl::didFindString):
(WebKit::FindClientEfl::didFailToFindString):
(WebKit::FindClientEfl::FindClientEfl):
* UIProcess/efl/FindClientEfl.h:
(WebKit::FindClientEfl::create):
(FindClientEfl):
* UIProcess/efl/FormClientEfl.cpp:
(WebKit::FormClientEfl::willSubmitForm):
(WebKit::FormClientEfl::FormClientEfl):
* UIProcess/efl/FormClientEfl.h:
(WebKit::FormClientEfl::create):
(FormClientEfl):
* UIProcess/efl/InputMethodContextEfl.cpp:
(WebKit::InputMethodContextEfl::InputMethodContextEfl):
(WebKit::InputMethodContextEfl::onIMFInputSequenceComplete):
(WebKit::InputMethodContextEfl::onIMFPreeditSequenceChanged):
(WebKit::InputMethodContextEfl::updateTextInputState):
* UIProcess/efl/InputMethodContextEfl.h:
(WebKit::InputMethodContextEfl::create):
(InputMethodContextEfl):
* UIProcess/efl/PageClientBase.cpp:
(WebKit::PageClientBase::PageClientBase):
(WebKit::PageClientBase::view):
(WebKit::PageClientBase::createDrawingAreaProxy):
(WebKit::PageClientBase::setViewNeedsDisplay):
(WebKit::PageClientBase::viewSize):
(WebKit::PageClientBase::isViewFocused):
(WebKit::PageClientBase::isViewVisible):
(WebKit::PageClientBase::processDidCrash):
(WebKit::PageClientBase::didRelaunchProcess):
(WebKit::PageClientBase::toolTipChanged):
(WebKit::PageClientBase::setCursor):
(WebKit::PageClientBase::createPopupMenuProxy):
(WebKit::PageClientBase::createContextMenuProxy):
(WebKit::PageClientBase::enterAcceleratedCompositingMode):
(WebKit::PageClientBase::exitAcceleratedCompositingMode):
(WebKit::PageClientBase::updateTextInputState):
(WebKit::PageClientBase::handleDownloadRequest):
* UIProcess/efl/PageClientBase.h:
(PageClientBase):
* UIProcess/efl/PageClientDefaultImpl.cpp:
(WebKit::PageClientDefaultImpl::PageClientDefaultImpl):
(WebKit::PageClientDefaultImpl::updateViewportSize):
(WebKit::PageClientDefaultImpl::convertToDeviceSpace):
(WebKit::PageClientDefaultImpl::convertToUserSpace):
(WebKit::PageClientDefaultImpl::didChangeContentsSize):
* UIProcess/efl/PageClientDefaultImpl.h:
(WebKit::PageClientDefaultImpl::create):
(PageClientDefaultImpl):
* UIProcess/efl/PageClientLegacyImpl.cpp:
(WebKit::PageClientLegacyImpl::PageClientLegacyImpl):
(WebKit::PageClientLegacyImpl::didCommitLoad):
(WebKit::PageClientLegacyImpl::updateViewportSize):
(WebKit::PageClientLegacyImpl::didChangeViewportProperties):
(WebKit::PageClientLegacyImpl::didChangeContentsSize):
(WebKit::PageClientLegacyImpl::pageDidRequestScroll):
(WebKit::PageClientLegacyImpl::didRenderFrame):
(WebKit::PageClientLegacyImpl::pageTransitionViewportReady):
* UIProcess/efl/PageClientLegacyImpl.h:
(WebKit::PageClientLegacyImpl::create):
(PageClientLegacyImpl):
* UIProcess/efl/PageLoadClientEfl.cpp:
(WebKit::PageLoadClientEfl::didReceiveTitleForFrame):
(WebKit::PageLoadClientEfl::didReceiveIntentForFrame):
(WebKit::PageLoadClientEfl::registerIntentServiceForFrame):
(WebKit::PageLoadClientEfl::didChangeProgress):
(WebKit::PageLoadClientEfl::didFinishLoadForFrame):
(WebKit::PageLoadClientEfl::didFailLoadWithErrorForFrame):
(WebKit::PageLoadClientEfl::didStartProvisionalLoadForFrame):
(WebKit::PageLoadClientEfl::didReceiveServerRedirectForProvisionalLoadForFrame):
(WebKit::PageLoadClientEfl::didFailProvisionalLoadWithErrorForFrame):
(WebKit::PageLoadClientEfl::didCommitLoadForFrame):
(WebKit::PageLoadClientEfl::didChangeBackForwardList):
(WebKit::PageLoadClientEfl::didSameDocumentNavigationForFrame):
(WebKit::PageLoadClientEfl::didReceiveAuthenticationChallengeInFrame):
(WebKit::PageLoadClientEfl::PageLoadClientEfl):
* UIProcess/efl/PageLoadClientEfl.h:
(WebKit::PageLoadClientEfl::create):
(PageLoadClientEfl):
(WebKit::PageLoadClientEfl::view):
* UIProcess/efl/PagePolicyClientEfl.cpp:
(WebKit::PagePolicyClientEfl::decidePolicyForNavigationAction):
(WebKit::PagePolicyClientEfl::decidePolicyForNewWindowAction):
(WebKit::PagePolicyClientEfl::PagePolicyClientEfl):
* UIProcess/efl/PagePolicyClientEfl.h:
(WebKit::PagePolicyClientEfl::create):
(PagePolicyClientEfl):
* UIProcess/efl/PageUIClientEfl.cpp:
(WebKit::PageUIClientEfl::PageUIClientEfl):
(WebKit::PageUIClientEfl::close):
(WebKit::PageUIClientEfl::takeFocus):
(WebKit::PageUIClientEfl::focus):
(WebKit::PageUIClientEfl::unfocus):
(WebKit::PageUIClientEfl::runJavaScriptAlert):
(WebKit::PageUIClientEfl::runJavaScriptConfirm):
(WebKit::PageUIClientEfl::runJavaScriptPrompt):
(WebKit::PageUIClientEfl::toolbarsAreVisible):
(WebKit::PageUIClientEfl::setToolbarsAreVisible):
(WebKit::PageUIClientEfl::menuBarIsVisible):
(WebKit::PageUIClientEfl::setMenuBarIsVisible):
(WebKit::PageUIClientEfl::statusBarIsVisible):
(WebKit::PageUIClientEfl::setStatusBarIsVisible):
(WebKit::PageUIClientEfl::isResizable):
(WebKit::PageUIClientEfl::setIsResizable):
(WebKit::PageUIClientEfl::getWindowFrame):
(WebKit::PageUIClientEfl::setWindowFrame):
(WebKit::PageUIClientEfl::exceededDatabaseQuota):
(WebKit::PageUIClientEfl::runOpenPanel):
(WebKit::PageUIClientEfl::createNewPage):
(WebKit::PageUIClientEfl::showColorPicker):
(WebKit::PageUIClientEfl::hideColorPicker):
* UIProcess/efl/PageUIClientEfl.h:
(WebKit::PageUIClientEfl::create):
(PageUIClientEfl):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
(WebKit::PageViewportControllerClientEfl::PageViewportControllerClientEfl):
(WebKit::PageViewportControllerClientEfl::drawingArea):
(WebKit::PageViewportControllerClientEfl::updateViewportSize):
(WebKit::PageViewportControllerClientEfl::didChangeContentsSize):
(WebKit::PageViewportControllerClientEfl::setViewportPosition):
(WebKit::PageViewportControllerClientEfl::setPageScaleFactor):
(WebKit::PageViewportControllerClientEfl::didResumeContent):
(WebKit::PageViewportControllerClientEfl::didChangeVisibleContents):
* UIProcess/efl/PageViewportControllerClientEfl.h:
(WebKit::PageViewportControllerClientEfl::create):
(PageViewportControllerClientEfl):
* UIProcess/efl/VibrationClientEfl.cpp:
(VibrationClientEfl::vibrateCallback):
(VibrationClientEfl::cancelVibrationCallback):
(VibrationClientEfl::create):
(VibrationClientEfl::VibrationClientEfl):
(VibrationClientEfl::~VibrationClientEfl):
* UIProcess/efl/VibrationClientEfl.h:
(VibrationClientEfl):
* UIProcess/efl/WebContextMenuProxyEfl.cpp:
(WebKit::WebContextMenuProxyEfl::WebContextMenuProxyEfl):
(WebKit::WebContextMenuProxyEfl::showContextMenu):
(WebKit::WebContextMenuProxyEfl::hideContextMenu):
* UIProcess/efl/WebContextMenuProxyEfl.h:
(WebKit::WebContextMenuProxyEfl::create):
(WebContextMenuProxyEfl):
* UIProcess/efl/WebFullScreenManagerProxyEfl.cpp:
(WebKit::WebFullScreenManagerProxy::enterFullScreen):
(WebKit::WebFullScreenManagerProxy::exitFullScreen):
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::viewWidget):
* UIProcess/efl/WebPopupMenuProxyEfl.cpp:
(WebKit::WebPopupMenuProxyEfl::WebPopupMenuProxyEfl):
(WebKit::WebPopupMenuProxyEfl::showPopupMenu):
(WebKit::WebPopupMenuProxyEfl::hidePopupMenu):
* UIProcess/efl/WebPopupMenuProxyEfl.h:
(WebKit::WebPopupMenuProxyEfl::create):
(WebPopupMenuProxyEfl):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140686 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f00f182c
This diff is collapsed.
......@@ -40,7 +40,7 @@ list(APPEND WebKit2_SOURCES
UIProcess/API/C/soup/WKCookieManagerSoup.cpp
UIProcess/API/C/soup/WKSoupRequestManager.cpp
UIProcess/API/efl/EwkViewImpl.cpp
UIProcess/API/efl/EwkView.cpp
UIProcess/API/efl/EvasGLContext.cpp
UIProcess/API/efl/EvasGLSurface.cpp
UIProcess/API/efl/SnapshotImageGL.cpp
......
......@@ -20,7 +20,7 @@
#include "config.h"
#include "WKView.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "WKAPICast.h"
#include "ewk_view_private.h"
#include <WebKit2/WKImageCairo.h>
......@@ -29,24 +29,24 @@ using namespace WebKit;
WKViewRef WKViewCreate(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
{
return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkViewImpl::LegacyBehavior));
return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkView::LegacyBehavior));
}
WKViewRef WKViewCreateWithFixedLayout(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
{
return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkViewImpl::DefaultBehavior));
return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkView::DefaultBehavior));
}
WKPageRef WKViewGetPage(WKViewRef viewRef)
{
EwkViewImpl* viewImpl = EwkViewImpl::fromEvasObject(toImpl(viewRef));
EwkView* view = EwkView::fromEvasObject(toImpl(viewRef));
return viewImpl->wkPage();
return view->wkPage();
}
WKImageRef WKViewCreateSnapshot(WKViewRef viewRef)
{
EwkViewImpl* viewImpl = EwkViewImpl::fromEvasObject(toImpl(viewRef));
EwkView* view = EwkView::fromEvasObject(toImpl(viewRef));
return WKImageCreateFromCairoSurface(viewImpl->takeSnapshot().get(), 0 /* options */);
return WKImageCreateFromCairoSurface(view->takeSnapshot().get(), 0 /* options */);
}
......@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef EwkViewImpl_h
#define EwkViewImpl_h
#ifndef EwkView_h
#define EwkView_h
#include "EwkViewCallbacks.h"
#include "ImmutableDictionary.h"
......@@ -96,18 +96,18 @@ typedef struct _Evas_GL_Surface Evas_GL_Surface;
typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data;
class EwkViewImpl {
class EwkView {
public:
enum ViewBehavior {
LegacyBehavior,
DefaultBehavior
};
EwkViewImpl(Evas_Object* view, PassRefPtr<EwkContext> context, PassRefPtr<WebKit::WebPageGroup> pageGroup, ViewBehavior);
~EwkViewImpl();
EwkView(Evas_Object* view, PassRefPtr<EwkContext> context, PassRefPtr<WebKit::WebPageGroup> pageGroup, ViewBehavior);
~EwkView();
static EwkViewImpl* fromEvasObject(const Evas_Object* view);
Evas_Object* view() { return m_view; }
static EwkView* fromEvasObject(const Evas_Object* view);
Evas_Object* view() { return m_evasObject; }
WKPageRef wkPage();
WebKit::WebPageProxy* page() { return m_pageProxy.get(); }
......@@ -149,8 +149,8 @@ public:
void update(const WebCore::IntRect& rect = WebCore::IntRect());
static void addToPageViewMap(EwkViewImpl* viewImpl);
static void removeFromPageViewMap(EwkViewImpl* viewImpl);
static void addToPageViewMap(EwkView* view);
static void removeFromPageViewMap(EwkView* view);
static const Evas_Object* viewFromPageViewMap(const WKPageRef);
#if ENABLE(FULLSCREEN_API)
......@@ -191,7 +191,7 @@ public:
template<EwkViewCallbacks::CallbackType callbackType>
EwkViewCallbacks::CallBack<callbackType> smartCallback() const
{
return EwkViewCallbacks::CallBack<callbackType>(m_view);
return EwkViewCallbacks::CallBack<callbackType>(m_evasObject);
}
unsigned long long informDatabaseQuotaReached(const String& databaseName, const String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage);
......@@ -221,7 +221,7 @@ private:
#endif
inline Ewk_View_Smart_Data* smartData() const;
void displayTimerFired(WebCore::Timer<EwkViewImpl>*);
void displayTimerFired(WebCore::Timer<EwkView>*);
#if USE(COORDINATED_GRAPHICS)
WebKit::LayerTreeRenderer* layerTreeRenderer();
......@@ -241,7 +241,7 @@ private:
static void onFaviconChanged(const char* pageURL, void* eventInfo);
// Note, initialization order matters.
Evas_Object* m_view;
Evas_Object* m_evasObject;
RefPtr<EwkContext> m_context;
#if USE(ACCELERATED_COMPOSITING)
OwnPtr<Evas_GL> m_evasGL;
......@@ -277,7 +277,7 @@ private:
#if ENABLE(TOUCH_EVENTS)
bool m_touchEventsEnabled;
#endif
WebCore::Timer<EwkViewImpl> m_displayTimer;
WebCore::Timer<EwkView> m_displayTimer;
OwnPtr<EwkContextMenu> m_contextMenu;
OwnPtr<EwkPopupMenu> m_popupMenu;
OwnPtr<WebKit::InputMethodContextEfl> m_inputMethodContext;
......@@ -288,4 +288,4 @@ private:
bool m_setDrawsBackground;
};
#endif // EwkViewImpl_h
#endif // EwkView_h
......@@ -27,7 +27,7 @@
#include "ewk_context_menu.h"
#include "APIObject.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "WebContextMenuItemData.h"
#include "WebContextMenuProxyEfl.h"
#include "ewk_context_menu_item.h"
......@@ -36,8 +36,8 @@
using namespace WebKit;
EwkContextMenu::EwkContextMenu(EwkViewImpl* viewImpl, WebContextMenuProxyEfl* contextMenuProxy, const Vector<WebKit::WebContextMenuItemData>& items)
: m_viewImpl(viewImpl)
EwkContextMenu::EwkContextMenu(EwkView* view, WebContextMenuProxyEfl* contextMenuProxy, const Vector<WebKit::WebContextMenuItemData>& items)
: m_viewImpl(view)
, m_contextMenuProxy(contextMenuProxy)
, m_contextMenuItems(0)
{
......
......@@ -37,11 +37,11 @@ class WebContextMenuItemData;
class WebContextMenuProxyEfl;
}
class EwkViewImpl;
class EwkView;
class EwkContextMenu {
public:
static PassOwnPtr<EwkContextMenu> create(EwkViewImpl* viewImpl, WebKit::WebContextMenuProxyEfl* contextMenuProxy, const Vector<WebKit::WebContextMenuItemData>& items)
static PassOwnPtr<EwkContextMenu> create(EwkView* viewImpl, WebKit::WebContextMenuProxyEfl* contextMenuProxy, const Vector<WebKit::WebContextMenuItemData>& items)
{
return adoptPtr(new EwkContextMenu(viewImpl, contextMenuProxy, items));
}
......@@ -68,9 +68,9 @@ public:
private:
EwkContextMenu();
EwkContextMenu(Eina_List* items);
EwkContextMenu(EwkViewImpl* viewImpl, WebKit::WebContextMenuProxyEfl*, const Vector<WebKit::WebContextMenuItemData>& items);
EwkContextMenu(EwkView* viewImpl, WebKit::WebContextMenuProxyEfl*, const Vector<WebKit::WebContextMenuItemData>& items);
EwkViewImpl* m_viewImpl;
EwkView* m_viewImpl;
WebKit::WebContextMenuProxyEfl* m_contextMenuProxy;
Eina_List* m_contextMenuItems;
};
......
......@@ -36,7 +36,7 @@
using namespace WebKit;
EwkDownloadJob::EwkDownloadJob(WebKit::DownloadProxy* download, EwkViewImpl* viewImpl)
EwkDownloadJob::EwkDownloadJob(WebKit::DownloadProxy* download, EwkView* viewImpl)
: m_downloadProxy(download)
, m_viewImpl(viewImpl)
, m_state(EWK_DOWNLOAD_JOB_STATE_NOT_STARTED)
......@@ -59,7 +59,7 @@ uint64_t EwkDownloadJob::id() const
* Returns the view this download is attached to.
* The view is needed to send notification signals.
*/
EwkViewImpl* EwkDownloadJob::viewImpl() const
EwkView* EwkDownloadJob::view() const
{
return m_viewImpl;
}
......
......@@ -38,19 +38,19 @@ namespace WebKit {
class DownloadProxy;
}
class EwkViewImpl;
class EwkView;
class EwkDownloadJob : public EwkObject {
public:
EWK_OBJECT_DECLARE(EwkDownloadJob)
static PassRefPtr<EwkDownloadJob> create(WebKit::DownloadProxy* download, EwkViewImpl* viewImpl)
static PassRefPtr<EwkDownloadJob> create(WebKit::DownloadProxy* download, EwkView* viewImpl)
{
return adoptRef(new EwkDownloadJob(download, viewImpl));
}
uint64_t id() const;
EwkViewImpl* viewImpl() const;
EwkView* view() const;
Ewk_Download_Job_State state() const;
void setState(Ewk_Download_Job_State);
......@@ -72,10 +72,10 @@ public:
void incrementReceivedData(uint64_t length);
private:
EwkDownloadJob(WebKit::DownloadProxy* download, EwkViewImpl* viewImpl);
EwkDownloadJob(WebKit::DownloadProxy* download, EwkView* view);
WebKit::DownloadProxy* m_downloadProxy;
EwkViewImpl* m_viewImpl;
EwkView* m_viewImpl;
Ewk_Download_Job_State m_state;
mutable RefPtr<EwkUrlRequest> m_request;
RefPtr<EwkUrlResponse> m_response;
......
......@@ -27,15 +27,15 @@
#include "config.h"
#include "ewk_popup_menu.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "WebPopupMenuProxyEfl.h"
#include "ewk_popup_menu_item_private.h"
#include "ewk_popup_menu_private.h"
using namespace WebKit;
EwkPopupMenu::EwkPopupMenu(EwkViewImpl* viewImpl, WebPopupMenuProxyEfl* popupMenuProxy, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex)
: m_viewImpl(viewImpl)
EwkPopupMenu::EwkPopupMenu(EwkView* view, WebPopupMenuProxyEfl* popupMenuProxy, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex)
: m_view(view)
, m_popupMenuProxy(popupMenuProxy)
, m_popupMenuItems(0)
, m_selectedIndex(selectedIndex)
......@@ -54,7 +54,7 @@ EwkPopupMenu::~EwkPopupMenu()
void EwkPopupMenu::close()
{
m_viewImpl->closePopupMenu();
m_view->closePopupMenu();
}
const Eina_List* EwkPopupMenu::items() const
......
......@@ -36,13 +36,13 @@ class WebPopupItem;
class WebPopupMenuProxyEfl;
}
class EwkViewImpl;
class EwkView;
class EwkPopupMenu {
public:
static PassOwnPtr<EwkPopupMenu> create(EwkViewImpl* viewImpl, WebKit::WebPopupMenuProxyEfl* popupMenuProxy, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex)
static PassOwnPtr<EwkPopupMenu> create(EwkView* view, WebKit::WebPopupMenuProxyEfl* popupMenuProxy, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex)
{
return adoptPtr(new EwkPopupMenu(viewImpl, popupMenuProxy, items, selectedIndex));
return adoptPtr(new EwkPopupMenu(view, popupMenuProxy, items, selectedIndex));
}
~EwkPopupMenu();
......@@ -54,9 +54,9 @@ public:
unsigned selectedIndex() const;
private:
EwkPopupMenu(EwkViewImpl* viewImpl, WebKit::WebPopupMenuProxyEfl*, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex);
EwkPopupMenu(EwkView* viewImpl, WebKit::WebPopupMenuProxyEfl*, const Vector<WebKit::WebPopupItem>& items, unsigned selectedIndex);
EwkViewImpl* m_viewImpl;
EwkView* m_view;
WebKit::WebPopupMenuProxyEfl* m_popupMenuProxy;
Eina_List* m_popupMenuItems;
unsigned m_selectedIndex;
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include "ewk_settings.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "ewk_settings_private.h"
#include <WebKit2/WebPageGroup.h>
#include <WebKit2/WebPageProxy.h>
......@@ -45,12 +45,12 @@ using namespace WebKit;
const WebKit::WebPreferences* EwkSettings::preferences() const
{
return m_viewImpl->page()->pageGroup()->preferences();
return m_view->page()->pageGroup()->preferences();
}
WebKit::WebPreferences* EwkSettings::preferences()
{
return m_viewImpl->page()->pageGroup()->preferences();
return m_view->page()->pageGroup()->preferences();
}
#if ENABLE(SPELLCHECK)
......
......@@ -32,14 +32,14 @@
namespace WebKit {
class WebPreferences;
}
class EwkViewImpl;
class EwkView;
/**
* \struct Ewk_Settings
* @brief Contains the settings data.
*/
class EwkSettings {
public:
static PassOwnPtr<EwkSettings> create(EwkViewImpl* viewImpl)
static PassOwnPtr<EwkSettings> create(EwkView* viewImpl)
{
return adoptPtr(new EwkSettings(viewImpl));
}
......@@ -48,13 +48,13 @@ public:
WebKit::WebPreferences* preferences();
private:
explicit EwkSettings(EwkViewImpl* viewImpl)
: m_viewImpl(viewImpl)
explicit EwkSettings(EwkView* viewImpl)
: m_view(viewImpl)
{
ASSERT(m_viewImpl);
ASSERT(m_view);
}
EwkViewImpl* m_viewImpl;
EwkView* m_view;
};
#endif // ewk_settings_private_h
......@@ -21,7 +21,7 @@
#include "config.h"
#include "ewk_view.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "FindClientEfl.h"
#include "FormClientEfl.h"
#include "InputMethodContextEfl.h"
......@@ -126,7 +126,7 @@ static const char EWK_VIEW_TYPE_STR[] = "EWK2_View";
EINA_LOG_CRIT("smart data is null"); \
return __VA_ARGS__; \
} \
EwkViewImpl* impl = smartData->priv; \
EwkView* impl = smartData->priv; \
do { \
if (!impl) { \
EINA_LOG_CRIT("no private data for object %p (%s)", \
......@@ -136,7 +136,7 @@ static const char EWK_VIEW_TYPE_STR[] = "EWK2_View";
} while (0)
#define EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, ...) \
EwkViewImpl* impl = 0; \
EwkView* impl = 0; \
do { \
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, __VA_ARGS__); \
impl = smartData->priv; \
......@@ -505,7 +505,7 @@ static inline Evas_Smart* createEwkViewSmartClass(void)
return smart;
}
static inline Evas_Object* createEwkView(Evas* canvas, Evas_Smart* smart, PassRefPtr<EwkContext> context, WKPageGroupRef pageGroupRef = 0, EwkViewImpl::ViewBehavior behavior = EwkViewImpl::DefaultBehavior)
static inline Evas_Object* createEwkView(Evas* canvas, Evas_Smart* smart, PassRefPtr<EwkContext> context, WKPageGroupRef pageGroupRef = 0, EwkView::ViewBehavior behavior = EwkView::DefaultBehavior)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(smart, 0);
......@@ -524,7 +524,7 @@ static inline Evas_Object* createEwkView(Evas* canvas, Evas_Smart* smart, PassRe
// Default WebPageGroup is created in WebContext constructor if the pageGroupRef is 0,
// so we do not need to create it here.
smartData->priv = new EwkViewImpl(ewkView, context, toImpl(pageGroupRef), behavior);
smartData->priv = new EwkView(ewkView, context, toImpl(pageGroupRef), behavior);
return ewkView;
}
......@@ -532,7 +532,7 @@ static inline Evas_Object* createEwkView(Evas* canvas, Evas_Smart* smart, PassRe
* @internal
* Constructs a ewk_view Evas_Object with WKType parameters.
*/
Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef, EwkViewImpl::ViewBehavior behavior)
Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef, EwkView::ViewBehavior behavior)
{
return createEwkView(canvas, createEwkViewSmartClass(), contextRef ? EwkContext::create(toImpl(contextRef)) : EwkContext::defaultContext(), pageGroupRef, behavior);
}
......
......@@ -202,7 +202,7 @@ struct Ewk_View_Smart_Class {
*/
#define EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION(name) EWK_VIEW_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NAME_VERSION(name))
typedef struct EwkViewImpl EwkViewImpl;
typedef struct EwkView EwkView;
/**
* @brief Contains an internal View data.
*
......@@ -214,7 +214,7 @@ struct Ewk_View_Smart_Data {
const Ewk_View_Smart_Class* api; /**< reference to casted class instance */
Evas_Object* self; /**< reference to owner object */
Evas_Object* image; /**< reference to evas_object_image for drawing web contents */
EwkViewImpl* priv; /**< should never be accessed, c++ stuff */
EwkView* priv; /**< should never be accessed, c++ stuff */
struct {
Evas_Coord x, y, w, h; /**< last used viewport */
} view;
......
......@@ -21,10 +21,10 @@
#ifndef ewk_view_private_h
#define ewk_view_private_h
#include "EwkViewImpl.h"
#include "EwkView.h"
#include <Evas.h>
#include <WebKit2/WKBase.h>
Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef, WKPageGroupRef, EwkViewImpl::ViewBehavior);
Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef, WKPageGroupRef, EwkView::ViewBehavior);
#endif // ewk_view_private_h
......@@ -32,8 +32,8 @@
using namespace WebKit;
EwkWindowFeatures::EwkWindowFeatures(ImmutableDictionary* windowFeatures, EwkViewImpl* viewImpl)
: m_viewImpl(viewImpl)
EwkWindowFeatures::EwkWindowFeatures(ImmutableDictionary* windowFeatures, EwkView* view)
: m_view(view)
, m_geometry(0, 0, 100, 100)
, m_toolbarVisible(true)
, m_statusBarVisible(true)
......@@ -73,25 +73,25 @@ T1 EwkWindowFeatures::getWindowFeatureValue(ImmutableDictionary* windowFeatures,
void EwkWindowFeatures::setToolbarVisible(bool toolbarVisible)
{
m_toolbarVisible = toolbarVisible;
m_viewImpl->smartCallback<EwkViewCallbacks::ToolbarVisible>().call(&toolbarVisible);
m_view->smartCallback<EwkViewCallbacks::ToolbarVisible>().call(&toolbarVisible);
}
void EwkWindowFeatures::setStatusBarVisible(bool statusBarVisible)
{
m_statusBarVisible = statusBarVisible;
m_viewImpl->smartCallback<EwkViewCallbacks::StatusBarVisible>().call(&statusBarVisible);
m_view->smartCallback<EwkViewCallbacks::StatusBarVisible>().call(&statusBarVisible);
}
void EwkWindowFeatures::setMenuBarVisible(bool menuBarVisible)
{
m_menuBarVisible = menuBarVisible;
m_viewImpl->smartCallback<EwkViewCallbacks::MenuBarVisible>().call(&menuBarVisible);
m_view->smartCallback<EwkViewCallbacks::MenuBarVisible>().call(&menuBarVisible);
}
void EwkWindowFeatures::setResizable(bool resizable)
{
m_resizable = resizable;
m_viewImpl->smartCallback<EwkViewCallbacks::WindowResizable>().call(&resizable);
m_view->smartCallback<EwkViewCallbacks::WindowResizable>().call(&resizable);
}
Eina_Bool ewk_window_features_toolbar_visible_get(const Ewk_Window_Features* window_features)
......
......@@ -26,20 +26,20 @@
#ifndef ewk_window_features_private_h
#define ewk_window_features_private_h
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "ImmutableDictionary.h"
#include "WindowFeatures.h"
#include "ewk_object_private.h"
#include <WebCore/FloatRect.h>
#include <wtf/RefCounted.h>
class EwkViewImpl;
class EwkView;
class EwkWindowFeatures : public EwkObject {
public:
EWK_OBJECT_DECLARE(EwkWindowFeatures)
static PassRefPtr<EwkWindowFeatures> create(WebKit::ImmutableDictionary* windowFeatures, EwkViewImpl* viewImpl)
static PassRefPtr<EwkWindowFeatures> create(WebKit::ImmutableDictionary* windowFeatures, EwkView* viewImpl)
{
return adoptRef(new EwkWindowFeatures(windowFeatures, viewImpl));
}
......@@ -69,11 +69,11 @@ public:
void setFullScreen(bool fullScreen) { m_fullScreen = fullScreen; }
private:
EwkWindowFeatures(WebKit::ImmutableDictionary* windowFeatures, EwkViewImpl* viewImpl);
EwkWindowFeatures(WebKit::ImmutableDictionary* windowFeatures, EwkView* viewImpl);
template <typename T1, typename T2>
static T1 getWindowFeatureValue(WebKit::ImmutableDictionary* windowFeatures, const String& featureName);
EwkViewImpl* m_viewImpl;
EwkView* m_view;
WebCore::FloatRect m_geometry;
bool m_toolbarVisible;
......
......@@ -34,7 +34,7 @@
#include <cairo.h>
#if PLATFORM(EFL)
#include "EwkViewImpl.h"
#include "EwkView.h"
#endif
using namespace WebCore;
......@@ -71,8 +71,8 @@ void BackingStore::incorporateUpdate(ShareableBitmap* bitmap, const UpdateInfo&
#if PLATFORM(EFL)
// Update ewk_view with new backingStore image.
EwkViewImpl* viewImpl = EwkViewImpl::fromEvasObject(m_webPageProxy->viewWidget());
viewImpl->setImageData(cairo_image_surface_get_data(m_backingStore->cairoSurface()), m_size);
EwkView* view = EwkView::fromEvasObject(m_webPageProxy->viewWidget());
view->setImageData(cairo_image_surface_get_data(m_backingStore->cairoSurface()), m_size);
#endif
}
......
......@@ -27,7 +27,7 @@
#include "ContextHistoryClientEfl.h"
#include "DownloadProxy.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "WKAPICast.h"
#include "WKContext.h"
#include "WKEinaSharedString.h"
......@@ -54,7 +54,7 @@ void ContextHistoryClientEfl::didNavigateWithNavigationData(WKContextRef, WKPage
return;
RefPtr<EwkNavigationData> navigationDataEwk = EwkNavigationData::create(navigationData);
historyClient->m_navigate(EwkViewImpl::viewFromPageViewMap(page), navigationDataEwk.get(), historyClient->m_userData);
historyClient->m_navigate(EwkView::viewFromPageViewMap(page), navigationDataEwk.get(), historyClient->m_userData);
}
void ContextHistoryClientEfl::didPerformClientRedirect(WKContextRef, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef, const void* clientInfo)
......@@ -67,7 +67,7 @@ void ContextHistoryClientEfl::didPerformClientRedirect(WKContextRef, WKPageRef p
WKEinaSharedString sourceURLString(sourceURL);
WKEinaSharedString destinationURLString(destinationURL);
historyClient->m_clientRedirect(EwkViewImpl::viewFromPageViewMap(page), sourceURLString, destinationURLString, historyClient->m_userData);
historyClient->m_clientRedirect(EwkView::viewFromPageViewMap(page), sourceURLString, destinationURLString, historyClient->m_userData);
}
void ContextHistoryClientEfl::didPerformServerRedirect(WKContextRef, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef, const void* clientInfo)
......@@ -80,7 +80,7 @@ void ContextHistoryClientEfl::didPerformServerRedirect(WKContextRef, WKPageRef p
WKEinaSharedString sourceURLString(sourceURL);
WKEinaSharedString destinationURLString(destinationURL);
historyClient->m_serverRedirect(EwkViewImpl::viewFromPageViewMap(page), sourceURLString, destinationURLString, historyClient->m_userData);
historyClient->m_serverRedirect(EwkView::viewFromPageViewMap(page), sourceURLString, destinationURLString, historyClient->m_userData);
}
void ContextHistoryClientEfl::didUpdateHistoryTitle(WKContextRef, WKPageRef page, WKStringRef title, WKURLRef URL, WKFrameRef, const void* clientInfo)
......@@ -93,7 +93,7 @@ void ContextHistoryClientEfl::didUpdateHistoryTitle(WKContextRef, WKPageRef page
WKEinaSharedString titleString(title);
WKEinaSharedString stringURL(URL);
historyClient->m_titleUpdated(EwkViewImpl::viewFromPageViewMap(page), titleString, stringURL, historyClient->m_userData);
historyClient->m_titleUpdated(EwkView::viewFromPageViewMap(page), titleString, stringURL, historyClient->m_userData);
}
void ContextHistoryClientEfl::populateVisitedLinks(WKContextRef, const void* clientInfo)
......
......@@ -26,7 +26,7 @@
#include "config.h"
#include "ContextMenuClientEfl.h"
#include "EwkViewImpl.h"
#include "EwkView.h"
#include "NotImplemented.h"
#include "WKArray.h"
#include "WKPage.h"
......@@ -40,10 +40,10 @@ static inline ContextMenuClientEfl* toContextClientEfl(const void* clientInfo)
return static_cast<ContextMenuClientEfl*>(const_cast<void*>(clientInfo));
}
ContextMenuClientEfl::ContextMenuClientEfl(EwkViewImpl* viewImpl)
: m_viewImpl(viewImpl)
ContextMenuClientEfl::ContextMenuClientEfl(EwkView*