Diff
Modified: trunk/Source/WebKit2/ChangeLog (139936 => 139937)
--- trunk/Source/WebKit2/ChangeLog 2013-01-17 00:48:14 UTC (rev 139936)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-17 01:11:15 UTC (rev 139937)
@@ -1,3 +1,31 @@
+2013-01-16 Jaehun Lim <[email protected]>
+
+ [EFL][WK2] PageUIClientEfl should keep in sync with WKPageUIClient
+ https://bugs.webkit.org/show_bug.cgi?id=107060
+
+ Reviewed by Benjamin Poulain.
+
+ Rearrange the order of functions in PageUIClientEfl.
+ Rename closePage() to close().
+
+ * UIProcess/API/efl/EwkViewImpl.cpp:
+ (EwkViewImpl::close):
+ * UIProcess/API/efl/EwkViewImpl.h:
+ (EwkViewImpl):
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+ (WebKit::PageUIClientEfl::close):
+ (WebKit::PageUIClientEfl::takeFocus):
+ (WebKit::PageUIClientEfl::focus):
+ (WebKit::PageUIClientEfl::unfocus):
+ (WebKit::PageUIClientEfl::getWindowFrame):
+ (WebKit::PageUIClientEfl::setWindowFrame):
+ (WebKit::PageUIClientEfl::createNewPage):
+ (WebKit::PageUIClientEfl::showColorPicker):
+ (WebKit::PageUIClientEfl::hideColorPicker):
+ * UIProcess/efl/PageUIClientEfl.h:
+ (PageUIClientEfl):
+
2013-01-16 Brady Eidson <[email protected]>
Synchronous XMLHTTPRequests need to go to the NetworkProcess.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (139936 => 139937)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2013-01-17 00:48:14 UTC (rev 139936)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2013-01-17 01:11:15 UTC (rev 139937)
@@ -937,7 +937,7 @@
return static_cast<WKPageRef>(WKRetain(newViewImpl->page()));
}
-void EwkViewImpl::closePage()
+void EwkViewImpl::close()
{
Ewk_View_Smart_Data* sd = smartData();
ASSERT(sd->api);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h (139936 => 139937)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2013-01-17 00:48:14 UTC (rev 139936)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2013-01-17 01:11:15 UTC (rev 139937)
@@ -175,7 +175,7 @@
#endif
WKPageRef createNewPage(PassRefPtr<EwkUrlRequest>, WebKit::ImmutableDictionary* windowFeatures);
- void closePage();
+ void close();
void requestPopupMenu(WebKit::WebPopupMenuProxyEfl*, const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebKit::WebPopupItem>& items, int32_t selectedIndex);
void closePopupMenu();
Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (139936 => 139937)
--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-01-17 00:48:14 UTC (rev 139936)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-01-17 01:11:15 UTC (rev 139937)
@@ -45,17 +45,68 @@
return static_cast<PageUIClientEfl*>(const_cast<void*>(clientInfo));
}
-void PageUIClientEfl::closePage(WKPageRef, const void* clientInfo)
+PageUIClientEfl::PageUIClientEfl(EwkViewImpl* viewImpl)
+ : m_viewImpl(viewImpl)
{
- toPageUIClientEfl(clientInfo)->m_viewImpl->closePage();
+ WKPageRef pageRef = m_viewImpl->wkPage();
+ ASSERT(pageRef);
+
+ WKPageUIClient uiClient;
+ memset(&uiClient, 0, sizeof(WKPageUIClient));
+ uiClient.version = kWKPageUIClientCurrentVersion;
+ uiClient.clientInfo = this;
+ uiClient.close = close;
+ uiClient.takeFocus = takeFocus;
+ uiClient.focus = focus;
+ uiClient.unfocus = unfocus;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
+ uiClient.runJavaScriptConfirm = runJavaScriptConfirm;
+ uiClient.runJavaScriptPrompt = runJavaScriptPrompt;
+ uiClient.toolbarsAreVisible = toolbarsAreVisible;
+ uiClient.setToolbarsAreVisible = setToolbarsAreVisible;
+ uiClient.menuBarIsVisible = menuBarIsVisible;
+ uiClient.setMenuBarIsVisible = setMenuBarIsVisible;
+ uiClient.statusBarIsVisible = statusBarIsVisible;
+ uiClient.setStatusBarIsVisible = setStatusBarIsVisible;
+ uiClient.isResizable = isResizable;
+ uiClient.setIsResizable = setIsResizable;
+ uiClient.getWindowFrame = getWindowFrame;
+ uiClient.setWindowFrame = setWindowFrame;
+#if ENABLE(SQL_DATABASE)
+ uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
+#endif
+ uiClient.runOpenPanel = runOpenPanel;
+ uiClient.createNewPage = createNewPage;
+#if ENABLE(INPUT_TYPE_COLOR)
+ uiClient.showColorPicker = showColorPicker;
+ uiClient.hideColorPicker = hideColorPicker;
+#endif
+
+ WKPageSetPageUIClient(pageRef, &uiClient);
}
-WKPageRef PageUIClientEfl::createNewPage(WKPageRef, WKURLRequestRef wkRequest, WKDictionaryRef wkWindowFeatures, WKEventModifiers, WKEventMouseButton, const void* clientInfo)
+
+void PageUIClientEfl::close(WKPageRef, const void* clientInfo)
{
- RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
- return toPageUIClientEfl(clientInfo)->m_viewImpl->createNewPage(request, toImpl(wkWindowFeatures));
+ toPageUIClientEfl(clientInfo)->m_viewImpl->close();
}
+void PageUIClientEfl::takeFocus(WKPageRef, WKFocusDirection, const void* clientInfo)
+{
+ // FIXME: this is only a partial implementation.
+ evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
+}
+
+void PageUIClientEfl::focus(WKPageRef, const void* clientInfo)
+{
+ evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), true);
+}
+
+void PageUIClientEfl::unfocus(WKPageRef, const void* clientInfo)
+{
+ evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
+}
+
void PageUIClientEfl::runJavaScriptAlert(WKPageRef, WKStringRef alertText, WKFrameRef, const void* clientInfo)
{
toPageUIClientEfl(clientInfo)->m_viewImpl->requestJSAlertPopup(WKEinaSharedString(alertText));
@@ -128,20 +179,15 @@
features->setResizable(resizable);
}
-#if ENABLE(INPUT_TYPE_COLOR)
-void PageUIClientEfl::showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo)
+WKRect PageUIClientEfl::getWindowFrame(WKPageRef, const void* clientInfo)
{
- PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
- WebCore::Color color = WebCore::Color(WebKit::toWTFString(initialColor));
- pageUIClient->m_viewImpl->requestColorPicker(listener, color);
+ return toPageUIClientEfl(clientInfo)->m_viewImpl->windowGeometry();
}
-void PageUIClientEfl::hideColorPicker(WKPageRef, const void* clientInfo)
+void PageUIClientEfl::setWindowFrame(WKPageRef, WKRect frame, const void* clientInfo)
{
- PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
- pageUIClient->m_viewImpl->dismissColorPicker();
+ toPageUIClientEfl(clientInfo)->m_viewImpl->setWindowGeometry(frame);
}
-#endif
#if ENABLE(SQL_DATABASE)
unsigned long long PageUIClientEfl::exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef databaseName, WKStringRef displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage, const void* clientInfo)
@@ -151,78 +197,32 @@
}
#endif
-void PageUIClientEfl::focus(WKPageRef, const void* clientInfo)
+void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
{
- evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), true);
+ EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
+ RefPtr<EwkFileChooserRequest> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
+ viewImpl->smartCallback<FileChooserRequest>().call(fileChooserRequest.get());
}
-void PageUIClientEfl::unfocus(WKPageRef, const void* clientInfo)
+WKPageRef PageUIClientEfl::createNewPage(WKPageRef, WKURLRequestRef wkRequest, WKDictionaryRef wkWindowFeatures, WKEventModifiers, WKEventMouseButton, const void* clientInfo)
{
- evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
+ RefPtr<EwkUrlRequest> request = EwkUrlRequest::create(wkRequest);
+ return toPageUIClientEfl(clientInfo)->m_viewImpl->createNewPage(request, toImpl(wkWindowFeatures));
}
-void PageUIClientEfl::takeFocus(WKPageRef, WKFocusDirection, const void* clientInfo)
+#if ENABLE(INPUT_TYPE_COLOR)
+void PageUIClientEfl::showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo)
{
- // FIXME: this is only a partial implementation.
- evas_object_focus_set(toPageUIClientEfl(clientInfo)->m_viewImpl->view(), false);
+ PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
+ WebCore::Color color = WebCore::Color(WebKit::toWTFString(initialColor));
+ pageUIClient->m_viewImpl->requestColorPicker(listener, color);
}
-WKRect PageUIClientEfl::getWindowFrame(WKPageRef, const void* clientInfo)
+void PageUIClientEfl::hideColorPicker(WKPageRef, const void* clientInfo)
{
- return toPageUIClientEfl(clientInfo)->m_viewImpl->windowGeometry();
+ PageUIClientEfl* pageUIClient = toPageUIClientEfl(clientInfo);
+ pageUIClient->m_viewImpl->dismissColorPicker();
}
-
-void PageUIClientEfl::setWindowFrame(WKPageRef, WKRect frame, const void* clientInfo)
-{
- toPageUIClientEfl(clientInfo)->m_viewImpl->setWindowGeometry(frame);
-}
-
-void PageUIClientEfl::runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef parameters, WKOpenPanelResultListenerRef listener, const void* clientInfo)
-{
- EwkViewImpl* viewImpl = toPageUIClientEfl(clientInfo)->m_viewImpl;
- RefPtr<EwkFileChooserRequest> fileChooserRequest = EwkFileChooserRequest::create(toImpl(parameters), toImpl(listener));
- viewImpl->smartCallback<FileChooserRequest>().call(fileChooserRequest.get());
-}
-
-PageUIClientEfl::PageUIClientEfl(EwkViewImpl* viewImpl)
- : m_viewImpl(viewImpl)
-{
- WKPageRef pageRef = m_viewImpl->wkPage();
- ASSERT(pageRef);
-
- WKPageUIClient uiClient;
- memset(&uiClient, 0, sizeof(WKPageUIClient));
- uiClient.version = kWKPageUIClientCurrentVersion;
- uiClient.clientInfo = this;
- uiClient.close = closePage;
- uiClient.createNewPage = createNewPage;
- uiClient.runJavaScriptAlert = runJavaScriptAlert;
- uiClient.runJavaScriptConfirm = runJavaScriptConfirm;
- uiClient.runJavaScriptPrompt = runJavaScriptPrompt;
- uiClient.toolbarsAreVisible = toolbarsAreVisible;
- uiClient.setToolbarsAreVisible = setToolbarsAreVisible;
- uiClient.menuBarIsVisible = menuBarIsVisible;
- uiClient.setMenuBarIsVisible = setMenuBarIsVisible;
- uiClient.statusBarIsVisible = statusBarIsVisible;
- uiClient.setStatusBarIsVisible = setStatusBarIsVisible;
- uiClient.isResizable = isResizable;
- uiClient.setIsResizable = setIsResizable;
- uiClient.takeFocus = takeFocus;
- uiClient.focus = focus;
- uiClient.unfocus = unfocus;
- uiClient.getWindowFrame = getWindowFrame;
- uiClient.setWindowFrame = setWindowFrame;
- uiClient.runOpenPanel = runOpenPanel;
-#if ENABLE(SQL_DATABASE)
- uiClient.exceededDatabaseQuota = exceededDatabaseQuota;
#endif
-#if ENABLE(INPUT_TYPE_COLOR)
- uiClient.showColorPicker = showColorPicker;
- uiClient.hideColorPicker = hideColorPicker;
-#endif
-
- WKPageSetPageUIClient(pageRef, &uiClient);
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h (139936 => 139937)
--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h 2013-01-17 00:48:14 UTC (rev 139936)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.h 2013-01-17 01:11:15 UTC (rev 139937)
@@ -45,8 +45,10 @@
private:
explicit PageUIClientEfl(EwkViewImpl*);
- static void closePage(WKPageRef, const void*);
- static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
+ static void close(WKPageRef, const void*);
+ static void takeFocus(WKPageRef, WKFocusDirection, const void*);
+ static void focus(WKPageRef, const void*);
+ static void unfocus(WKPageRef, const void*);
static void runJavaScriptAlert(WKPageRef, WKStringRef, WKFrameRef, const void*);
static bool runJavaScriptConfirm(WKPageRef, WKStringRef, WKFrameRef, const void*);
static WKStringRef runJavaScriptPrompt(WKPageRef, WKStringRef, WKStringRef, WKFrameRef, const void*);
@@ -58,19 +60,17 @@
static void setStatusBarIsVisible(WKPageRef, bool, const void* clientInfo);
static bool isResizable(WKPageRef, const void* clientInfo);
static void setIsResizable(WKPageRef, bool, const void* clientInfo);
+ static WKRect getWindowFrame(WKPageRef, const void*);
+ static void setWindowFrame(WKPageRef, WKRect, const void*);
+#if ENABLE(SQL_DATABASE)
+ static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
+#endif
+ static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
+ static WKPageRef createNewPage(WKPageRef, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
#if ENABLE(INPUT_TYPE_COLOR)
static void showColorPicker(WKPageRef, WKStringRef initialColor, WKColorPickerResultListenerRef, const void*);
static void hideColorPicker(WKPageRef, const void*);
#endif
-#if ENABLE(SQL_DATABASE)
- static unsigned long long exceededDatabaseQuota(WKPageRef, WKFrameRef, WKSecurityOriginRef, WKStringRef, WKStringRef, unsigned long long currentQuota, unsigned long long, unsigned long long, unsigned long long, const void*);
-#endif
- static void focus(WKPageRef, const void*);
- static void unfocus(WKPageRef, const void*);
- static void takeFocus(WKPageRef, WKFocusDirection, const void*);
- static WKRect getWindowFrame(WKPageRef, const void*);
- static void setWindowFrame(WKPageRef, WKRect, const void*);
- static void runOpenPanel(WKPageRef, WKFrameRef, WKOpenPanelParametersRef, WKOpenPanelResultListenerRef, const void*);
EwkViewImpl* m_viewImpl;
};
