Title: [128844] trunk/Source/WebKit2
- Revision
- 128844
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-17 20:04:10 -0700 (Mon, 17 Sep 2012)
Log Message
[EFL][WK2] Regression (r128163)
https://bugs.webkit.org/show_bug.cgi?id=96610
Patch by Regina Chung <heejin.r.ch...@samsung.com> on 2012-09-17
Reviewed by Gyuyoung Kim.
While removing compile warnings r128163 changed the logic of code for entering
accelerated compositing mode, resulting in never being able to enter it.
Changed back to the correct code and fixed the compile warning by using an
appropriate EINA macro.
* UIProcess/API/efl/ewk_view.cpp:
(ewk_view_accelerated_compositing_mode_enter): Changed EINA_SAFETY_ON_NULL_RETURN_VAL to *if* condition statement.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128843 => 128844)
--- trunk/Source/WebKit2/ChangeLog 2012-09-18 02:55:06 UTC (rev 128843)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-18 03:04:10 UTC (rev 128844)
@@ -1,3 +1,18 @@
+2012-09-17 Regina Chung <heejin.r.ch...@samsung.com>
+
+ [EFL][WK2] Regression (r128163)
+ https://bugs.webkit.org/show_bug.cgi?id=96610
+
+ Reviewed by Gyuyoung Kim.
+
+ While removing compile warnings r128163 changed the logic of code for entering
+ accelerated compositing mode, resulting in never being able to enter it.
+ Changed back to the correct code and fixed the compile warning by using an
+ appropriate EINA macro.
+
+ * UIProcess/API/efl/ewk_view.cpp:
+ (ewk_view_accelerated_compositing_mode_enter): Changed EINA_SAFETY_ON_NULL_RETURN_VAL to *if* condition statement.
+
2012-09-17 Sam Weinig <s...@webkit.org>
Fix the Snow Leopard build.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (128843 => 128844)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-09-18 02:55:06 UTC (rev 128843)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp 2012-09-18 03:04:10 UTC (rev 128844)
@@ -498,7 +498,10 @@
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
- EINA_SAFETY_ON_NULL_RETURN_VAL(priv->evasGl, false);
+ if (priv->evasGl) {
+ EINA_LOG_DOM_WARN(_ewk_log_dom, "Accelerated compositing mode already entered.");
+ return false;
+ }
Evas* evas = evas_object_evas_get(ewkView);
priv->evasGl = evas_gl_new(evas);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
