Diff
Modified: trunk/Source/WebKit2/ChangeLog (149901 => 149902)
--- trunk/Source/WebKit2/ChangeLog 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-10 20:34:16 UTC (rev 149902)
@@ -1,3 +1,27 @@
+2013-05-10 Jesus Sanchez-Palencia <[email protected]>
+
+ [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 <[email protected]>
REGRESSION (r149439): Video turns blank upon entering full screen for the first time
Modified: trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -136,11 +136,6 @@
return toImpl(viewRef)->drawsTransparentBackground();
}
-void WKViewSetThemePath(WKViewRef viewRef, WKStringRef theme)
-{
- toImpl(viewRef)->setThemePath(toImpl(theme)->string());
-}
-
void WKViewSuspendActiveDOMObjectsAndAnimations(WKViewRef viewRef)
{
toImpl(viewRef)->suspendActiveDOMObjectsAndAnimations();
Modified: trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h 2013-05-10 20:34:16 UTC (rev 149902)
@@ -84,8 +84,6 @@
WK_EXPORT WKPageRef WKViewGetPage(WKViewRef);
-WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef);
-
WK_EXPORT void WKViewSetDrawsBackground(WKViewRef, bool);
WK_EXPORT bool WKViewGetDrawsBackground(WKViewRef);
Modified: trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -43,3 +43,8 @@
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());
+}
Modified: trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.h (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.h 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/API/C/efl/WKViewEfl.h 2013-05-10 20:34:16 UTC (rev 149902)
@@ -38,6 +38,8 @@
WK_EXPORT WKImageRef WKViewCreateSnapshot(WKViewRef);
+WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -122,11 +122,6 @@
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);
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-05-10 20:34:16 UTC (rev 149902)
@@ -81,8 +81,6 @@
void setDrawsTransparentBackground(bool);
bool drawsTransparentBackground() const;
- void setThemePath(const String&);
-
void suspendActiveDOMObjectsAndAnimations();
void resumeActiveDOMObjectsAndAnimations();
Modified: trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -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;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -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>
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -107,5 +107,9 @@
context->downloadManager()->registerDownloadJob(toAPI(download), m_ewkView);
}
+void WebViewEfl::setThemePath(const String& theme)
+{
+ m_page->setThemePath(theme);
+}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h (149901 => 149902)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2013-05-10 20:34:16 UTC (rev 149902)
@@ -38,6 +38,7 @@
EwkView* ewkView() { return m_ewkView; }
void paintToCairoSurface(cairo_surface_t*);
+ void setThemePath(const String&);
private:
WebViewEfl(WebContext*, WebPageGroup*);
Modified: trunk/Tools/ChangeLog (149901 => 149902)
--- trunk/Tools/ChangeLog 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Tools/ChangeLog 2013-05-10 20:34:16 UTC (rev 149902)
@@ -1,3 +1,14 @@
+2013-05-10 Jesus Sanchez-Palencia <[email protected]>
+
+ [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 <[email protected]>
I accidentally the Java testing.
Modified: trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp (149901 => 149902)
--- trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2013-05-10 19:24:07 UTC (rev 149901)
+++ trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2013-05-10 20:34:16 UTC (rev 149902)
@@ -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;
