Modified: trunk/Source/WebKit2/ChangeLog (140960 => 140961)
--- trunk/Source/WebKit2/ChangeLog 2013-01-28 10:25:32 UTC (rev 140960)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-28 10:27:46 UTC (rev 140961)
@@ -1,3 +1,19 @@
+2013-01-28 Kenneth Rohde Christiansen <[email protected]>
+
+ [WK2][EFL] Remove unneeded private methods
+ https://bugs.webkit.org/show_bug.cgi?id=107693
+
+ Reviewed by Andreas Kling.
+
+ Care has been taken to verify that the wrappers can
+ never be null when called.
+
+ * UIProcess/API/efl/EwkViewImpl.cpp:
+ (EwkViewImpl::displayTimerFired):
+ (EwkViewImpl::createGLSurface):
+ * UIProcess/API/efl/EwkViewImpl.h:
+ (EwkViewImpl):
+
2013-01-28 Renata Hodovan <[email protected]>
[WK2] Putting QtWebProcess into a chrooted sandbox
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (140960 => 140961)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-01-28 10:25:32 UTC (rev 140960)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-01-28 10:27:46 UTC (rev 140961)
@@ -379,14 +379,14 @@
if (m_pendingSurfaceResize) {
// Create a GL surface here so that Evas has no chance of painting to an empty GL surface.
- createGLSurface(IntSize(sd->view.w, sd->view.h));
- if (!m_evasGLSurface)
+ if (!createGLSurface(IntSize(sd->view.w, sd->view.h)))
return;
m_pendingSurfaceResize = false;
- } else
- evas_gl_make_current(m_evasGL.get(), evasGLSurface(), evasGLContext());
+ }
+ evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context());
+
// We are supposed to clip to the actual viewport, nothing less.
IntRect viewport(sd->view.x, sd->view.y, sd->view.w, sd->view.h);
@@ -676,10 +676,10 @@
return false;
Evas_Native_Surface nativeSurface;
- evas_gl_native_surface_get(m_evasGL.get(), evasGLSurface(), &nativeSurface);
+ evas_gl_native_surface_get(m_evasGL.get(), m_evasGLSurface->surface(), &nativeSurface);
evas_object_image_native_surface_set(sd->image, &nativeSurface);
- evas_gl_make_current(m_evasGL.get(), evasGLSurface(), evasGLContext());
+ evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context());
Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
gl->glViewport(0, 0, viewSize.width() + sd->view.x, viewSize.height() + sd->view.y);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h (140960 => 140961)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2013-01-28 10:25:32 UTC (rev 140960)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2013-01-28 10:27:46 UTC (rev 140961)
@@ -215,11 +215,6 @@
PassRefPtr<cairo_surface_t> takeSnapshot();
private:
-#if USE(ACCELERATED_COMPOSITING)
- Evas_GL_Context* evasGLContext() { return m_evasGLContext ? m_evasGLContext->context() : 0; }
- Evas_GL_Surface* evasGLSurface() { return m_evasGLSurface ? m_evasGLSurface->surface() : 0; }
-#endif
-
inline Ewk_View_Smart_Data* smartData() const;
void displayTimerFired(WebCore::Timer<EwkView>*);
