Title: [101937] trunk/Source/WebKit/efl
- Revision
- 101937
- Author
- [email protected]
- Date
- 2011-12-03 15:32:14 -0800 (Sat, 03 Dec 2011)
Log Message
[EFL] Revise ewk_view_fixed_layout_size_set
https://bugs.webkit.org/show_bug.cgi?id=73401
Patch by ChangSeok Oh <[email protected]> on 2011-12-03
Reviewed by Eric Seidel.
Improve readability and replace forceLayout to setNeedsLayout,
since it sometimes causes double drawing.
* ewk/ewk_view.cpp:
(ewk_view_fixed_layout_size_set):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (101936 => 101937)
--- trunk/Source/WebKit/efl/ChangeLog 2011-12-03 23:11:14 UTC (rev 101936)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-12-03 23:32:14 UTC (rev 101937)
@@ -1,3 +1,16 @@
+2011-12-03 ChangSeok Oh <[email protected]>
+
+ [EFL] Revise ewk_view_fixed_layout_size_set
+ https://bugs.webkit.org/show_bug.cgi?id=73401
+
+ Reviewed by Eric Seidel.
+
+ Improve readability and replace forceLayout to setNeedsLayout,
+ since it sometimes causes double drawing.
+
+ * ewk/ewk_view.cpp:
+ (ewk_view_fixed_layout_size_set):
+
2011-12-02 JungJik Lee <[email protected]>
[EFL] Remove entry pointer before freeing it from matrix.
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (101936 => 101937)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-12-03 23:11:14 UTC (rev 101936)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-12-03 23:32:14 UTC (rev 101937)
@@ -1159,22 +1159,23 @@
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
WebCore::FrameView* view = priv->mainFrame->view();
- if (width <= 0 && height <= 0) {
+ if (!view)
+ return;
+
+ WebCore::IntSize layoutSize(width, height);
+ if (layoutSize.width() <= 0 && layoutSize.height() <= 0) {
if (!view->useFixedLayout())
return;
view->setUseFixedLayout(false);
} else {
- WebCore::IntSize size = view->fixedLayoutSize();
- if (size.width() == width && size.height() == height)
+ WebCore::IntSize fixedLayoutSize = view->fixedLayoutSize();
+ if (fixedLayoutSize == layoutSize)
return;
- if (view)
- view->setFixedLayoutSize(WebCore::IntSize(width, height));
+ view->setFixedLayoutSize(layoutSize);
+ view->setUseFixedLayout(true);
}
- if (!view)
- return;
- view->setUseFixedLayout(true);
- view->forceLayout();
+ view->setNeedsLayout();
}
void ewk_view_fixed_layout_size_get(const Evas_Object* ewkView, Evas_Coord* width, Evas_Coord* height)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
