Modified: trunk/Source/WebKit2/ChangeLog (135998 => 135999)
--- trunk/Source/WebKit2/ChangeLog 2012-11-28 12:49:22 UTC (rev 135998)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-28 12:56:26 UTC (rev 135999)
@@ -1,3 +1,21 @@
+2012-11-28 Mikhail Pozdnyakov <[email protected]>
+
+ [EFL][WK2][AC] No need to export GL properties from EwkViewImpl class
+ https://bugs.webkit.org/show_bug.cgi?id=103505
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ No need to export GL data members from EwkViewImpl class,
+ those are internal implementation objects not used by anyone outside the class.
+
+ * UIProcess/API/efl/EwkViewImpl.cpp:
+ (EwkViewImpl::displayTimerFired):
+ (EwkViewImpl::createGLSurface):
+ * UIProcess/API/efl/EwkViewImpl.h:
+ (EwkViewImpl):
+ (EwkViewImpl::evasGLContext):
+ (EwkViewImpl::evasGLSurface):
+
2012-11-28 Joone Hur <[email protected]>
[EFL][WK2][AC] Clear the viewport with white color
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (135998 => 135999)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-11-28 12:49:22 UTC (rev 135998)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-11-28 12:56:26 UTC (rev 135999)
@@ -361,7 +361,7 @@
#if USE(COORDINATED_GRAPHICS)
Ewk_View_Smart_Data* sd = smartData();
- evas_gl_make_current(evasGL(), evasGLSurface(), evasGLContext());
+ evas_gl_make_current(m_evasGL.get(), evasGLSurface(), evasGLContext());
// 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);
@@ -635,7 +635,7 @@
}
if (!m_evasGLContext) {
- m_evasGLContext = EvasGLContext::create(evasGL());
+ m_evasGLContext = EvasGLContext::create(m_evasGL.get());
if (!m_evasGLContext) {
WARN("Failed to create GLContext.");
return false;
@@ -653,17 +653,17 @@
};
// Replaces if non-null, and frees existing surface after (OwnPtr).
- m_evasGLSurface = EvasGLSurface::create(evasGL(), &evasGLConfig, viewSize);
+ m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, viewSize);
if (!m_evasGLSurface)
return false;
Evas_Native_Surface nativeSurface;
- evas_gl_native_surface_get(evasGL(), evasGLSurface(), &nativeSurface);
+ evas_gl_native_surface_get(m_evasGL.get(), evasGLSurface(), &nativeSurface);
evas_object_image_native_surface_set(sd->image, &nativeSurface);
- evas_gl_make_current(evasGL(), evasGLSurface(), evasGLContext());
+ evas_gl_make_current(m_evasGL.get(), evasGLSurface(), evasGLContext());
- Evas_GL_API* gl = evas_gl_api_get(evasGL());
+ 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);
gl->glClearColor(1.0, 1.0, 1.0, 0);
gl->glClear(GL_COLOR_BUFFER_BIT);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h (135998 => 135999)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-11-28 12:49:22 UTC (rev 135998)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-11-28 12:56:26 UTC (rev 135999)
@@ -203,11 +203,6 @@
void setScrollPosition(WebCore::IntPoint position) { m_scrollPosition = position; }
const WebCore::IntPoint scrollPosition() const { return m_scrollPosition; }
#endif
-#if USE(ACCELERATED_COMPOSITING)
- Evas_GL* evasGL() { return m_evasGL.get(); }
- Evas_GL_Context* evasGLContext() { return m_evasGLContext ? m_evasGLContext->context() : 0; }
- Evas_GL_Surface* evasGLSurface() { return m_evasGLSurface ? m_evasGLSurface->surface() : 0; }
-#endif
// FIXME: needs refactoring (split callback invoke)
void informURLChange();
@@ -218,6 +213,11 @@
WKImageRef 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<EwkViewImpl>*);
