Title: [135514] trunk/Source/WebKit2
- Revision
- 135514
- Author
- [email protected]
- Date
- 2012-11-22 05:52:25 -0800 (Thu, 22 Nov 2012)
Log Message
[WK2][EFL] No need to remove surface before replacing
https://bugs.webkit.org/show_bug.cgi?id=103055
Rubberstamped by Simon Hausmann.
The surface is stored in a OwnPtr which automatically
frees the existing surface after replacing it with a new
one. For some reason, this also fixes resizing issues on
my Nvidia driver.
* UIProcess/API/efl/EwkViewImpl.cpp:
(EwkViewImpl::createGLSurface):
* UIProcess/API/efl/EwkViewImpl.h:
* UIProcess/API/efl/ewk_view.cpp:
(_ewk_view_smart_calculate):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135513 => 135514)
--- trunk/Source/WebKit2/ChangeLog 2012-11-22 13:52:04 UTC (rev 135513)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-22 13:52:25 UTC (rev 135514)
@@ -1,3 +1,21 @@
+2012-11-22 Kenneth Rohde Christiansen <[email protected]>
+
+ [WK2][EFL] No need to remove surface before replacing
+ https://bugs.webkit.org/show_bug.cgi?id=103055
+
+ Rubberstamped by Simon Hausmann.
+
+ The surface is stored in a OwnPtr which automatically
+ frees the existing surface after replacing it with a new
+ one. For some reason, this also fixes resizing issues on
+ my Nvidia driver.
+
+ * UIProcess/API/efl/EwkViewImpl.cpp:
+ (EwkViewImpl::createGLSurface):
+ * UIProcess/API/efl/EwkViewImpl.h:
+ * UIProcess/API/efl/ewk_view.cpp:
+ (_ewk_view_smart_calculate):
+
2012-11-22 Christophe Dumez <[email protected]>
WebKitTestRunner needs layoutTestController.setCacheModel
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp (135513 => 135514)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-11-22 13:52:04 UTC (rev 135513)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.cpp 2012-11-22 13:52:25 UTC (rev 135514)
@@ -642,7 +642,7 @@
EVAS_GL_MULTISAMPLE_NONE
};
- ASSERT(!m_evasGLSurface);
+ // Replaces if non-null, and frees existing surface after (OwnPtr).
m_evasGLSurface = EvasGLSurface::create(evasGL(), &evasGLConfig, viewSize);
if (!m_evasGLSurface)
return false;
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h (135513 => 135514)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-11-22 13:52:04 UTC (rev 135513)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h 2012-11-22 13:52:25 UTC (rev 135514)
@@ -207,7 +207,6 @@
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; }
- void clearEvasGLSurface() { m_evasGLSurface.clear(); }
#endif
// FIXME: needs refactoring (split callback invoke)
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (135513 => 135514)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-11-22 13:52:04 UTC (rev 135513)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-11-22 13:52:25 UTC (rev 135514)
@@ -387,10 +387,6 @@
impl->page()->drawingArea()->setSize(IntSize(width, height), IntSize());
#if USE(ACCELERATED_COMPOSITING)
- // Recreate surface if needed.
- if (impl->evasGLSurface())
- impl->clearEvasGLSurface();
-
if (width && height)
impl->createGLSurface(IntSize(width, height));
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes