[WK2][CoordinatedGraphics] WKViewSetThemePath is EFL specific

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

Patch by Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> on 2013-05-10
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

WKViewSetThemePath was moved to WKViewEfl.h since it is EFL specific.

* UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
* UIProcess/API/C/CoordinatedGraphics/WKView.h:
* UIProcess/API/C/efl/WKViewEfl.cpp:
(WKViewSetThemePath):
* UIProcess/API/C/efl/WKViewEfl.h:
* UIProcess/CoordinatedGraphics/WebView.cpp:
* UIProcess/CoordinatedGraphics/WebView.h:
(WebView):
* UIProcess/efl/ViewClientEfl.cpp:
* UIProcess/efl/WebInspectorProxyEfl.cpp:
* UIProcess/efl/WebViewEfl.cpp:
(WebKit::WebViewEfl::setThemePath):
* UIProcess/efl/WebViewEfl.h:
(WebViewEfl):

Tools:

WKViewSetThemePath was moved to WKViewEfl.h.

* TestWebKitAPI/efl/PlatformWebView.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149902 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 10390de6
2013-05-10 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
[WK2][CoordinatedGraphics] WKViewSetThemePath is EFL specific
https://bugs.webkit.org/show_bug.cgi?id=115928
Reviewed by Kenneth Rohde Christiansen.
WKViewSetThemePath was moved to WKViewEfl.h since it is EFL specific.
* UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
* UIProcess/API/C/CoordinatedGraphics/WKView.h:
* UIProcess/API/C/efl/WKViewEfl.cpp:
(WKViewSetThemePath):
* UIProcess/API/C/efl/WKViewEfl.h:
* UIProcess/CoordinatedGraphics/WebView.cpp:
* UIProcess/CoordinatedGraphics/WebView.h:
(WebView):
* UIProcess/efl/ViewClientEfl.cpp:
* UIProcess/efl/WebInspectorProxyEfl.cpp:
* UIProcess/efl/WebViewEfl.cpp:
(WebKit::WebViewEfl::setThemePath):
* UIProcess/efl/WebViewEfl.h:
(WebViewEfl):
2013-05-10 Jer Noble <jer.noble@apple.com>
REGRESSION (r149439): Video turns blank upon entering full screen for the first time
......
......@@ -136,11 +136,6 @@ bool WKViewGetDrawsTransparentBackground(WKViewRef viewRef)
return toImpl(viewRef)->drawsTransparentBackground();
}
void WKViewSetThemePath(WKViewRef viewRef, WKStringRef theme)
{
toImpl(viewRef)->setThemePath(toImpl(theme)->string());
}
void WKViewSuspendActiveDOMObjectsAndAnimations(WKViewRef viewRef)
{
toImpl(viewRef)->suspendActiveDOMObjectsAndAnimations();
......
......@@ -84,8 +84,6 @@ WK_EXPORT void WKViewPaintToCurrentGLContext(WKViewRef);
WK_EXPORT WKPageRef WKViewGetPage(WKViewRef);
WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef);
WK_EXPORT void WKViewSetDrawsBackground(WKViewRef, bool);
WK_EXPORT bool WKViewGetDrawsBackground(WKViewRef);
......
......@@ -43,3 +43,8 @@ WKImageRef WKViewCreateSnapshot(WKViewRef viewRef)
EwkView* ewkView = static_cast<WebViewEfl*>(toImpl(viewRef))->ewkView();
return WKImageCreateFromCairoSurface(ewkView->takeSnapshot().get(), 0 /* options */);
}
void WKViewSetThemePath(WKViewRef viewRef, WKStringRef theme)
{
static_cast<WebViewEfl*>(toImpl(viewRef))->setThemePath(toImpl(theme)->string());
}
......@@ -38,6 +38,8 @@ WK_EXPORT void WKViewPaintToCairoSurface(WKViewRef, cairo_surface_t*);
WK_EXPORT WKImageRef WKViewCreateSnapshot(WKViewRef);
WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef);
#ifdef __cplusplus
}
#endif
......
......@@ -122,11 +122,6 @@ void WebView::paintToCurrentGLContext()
scene->paintToCurrentGLContext(transformToScene().toTransformationMatrix(), /* opacity */ 1, viewport);
}
void WebView::setThemePath(const String& theme)
{
m_page->setThemePath(theme);
}
void WebView::setDrawsBackground(bool drawsBackground)
{
m_page->setDrawsBackground(drawsBackground);
......
......@@ -81,8 +81,6 @@ public:
void setDrawsTransparentBackground(bool);
bool drawsTransparentBackground() const;
void setThemePath(const String&);
void suspendActiveDOMObjectsAndAnimations();
void resumeActiveDOMObjectsAndAnimations();
......
......@@ -31,6 +31,7 @@
#include "WebViewportAttributes.h"
#include <WebKit2/WKString.h>
#include <WebKit2/WKView.h>
#include <WebKit2/WKViewEfl.h>
using namespace EwkViewCallbacks;
using namespace WebCore;
......
......@@ -41,6 +41,7 @@
#include <WebKit2/WKPageGroup.h>
#include <WebKit2/WKPreferencesPrivate.h>
#include <WebKit2/WKString.h>
#include <WebKit2/WKViewEfl.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
......
......@@ -107,5 +107,9 @@ void WebViewEfl::handleDownloadRequest(DownloadProxy* download)
context->downloadManager()->registerDownloadJob(toAPI(download), m_ewkView);
}
void WebViewEfl::setThemePath(const String& theme)
{
m_page->setThemePath(theme);
}
} // namespace WebKit
......@@ -38,6 +38,7 @@ public:
EwkView* ewkView() { return m_ewkView; }
void paintToCairoSurface(cairo_surface_t*);
void setThemePath(const String&);
private:
WebViewEfl(WebContext*, WebPageGroup*);
......
2013-05-10 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
[WK2][CoordinatedGraphics] WKViewSetThemePath is EFL specific
https://bugs.webkit.org/show_bug.cgi?id=115928
Reviewed by Kenneth Rohde Christiansen.
WKViewSetThemePath was moved to WKViewEfl.h.
* TestWebKitAPI/efl/PlatformWebView.cpp:
2013-05-10 Andreas Kling <akling@apple.com>
I accidentally the Java testing.
......
......@@ -31,6 +31,7 @@
#include "EWebKit2.h"
#include <WebKit2/WKAPICast.h>
#include <WebKit2/WKRetainPtr.h>
#include <WebKit2/WKViewEfl.h>
#include <Ecore_Evas.h>
extern bool useX11Window;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment