Title: [89327] trunk/Source/WebKit/efl
- Revision
- 89327
- Author
- [email protected]
- Date
- 2011-06-20 18:33:33 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Ryuan Choi <[email protected]>
Reviewed by Antonio Gomes.
[EFL] ChromeClientEfl doesn't need to check whether m_view is null.
https://bugs.webkit.org/show_bug.cgi?id=62978
Remove unnecessary check routines of m_view because ChromeClientEfl have
valid m_view always.
* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::ChromeClientEfl): Add ASSERT(m_view)
(WebCore::ChromeClientEfl::windowRect):
(WebCore::ChromeClientEfl::setWindowRect):
(WebCore::ChromeClientEfl::pageRect):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (89326 => 89327)
--- trunk/Source/WebKit/efl/ChangeLog 2011-06-21 01:22:07 UTC (rev 89326)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-06-21 01:33:33 UTC (rev 89327)
@@ -1,3 +1,19 @@
+2011-06-20 Ryuan Choi <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] ChromeClientEfl doesn't need to check whether m_view is null.
+ https://bugs.webkit.org/show_bug.cgi?id=62978
+
+ Remove unnecessary check routines of m_view because ChromeClientEfl have
+ valid m_view always.
+
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (WebCore::ChromeClientEfl::ChromeClientEfl): Add ASSERT(m_view)
+ (WebCore::ChromeClientEfl::windowRect):
+ (WebCore::ChromeClientEfl::setWindowRect):
+ (WebCore::ChromeClientEfl::pageRect):
+
2011-06-20 Ryosuke Niwa <[email protected]>
EFL build fix after r89293.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (89326 => 89327)
--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2011-06-21 01:22:07 UTC (rev 89326)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2011-06-21 01:33:33 UTC (rev 89327)
@@ -76,6 +76,7 @@
ChromeClientEfl::ChromeClientEfl(Evas_Object* view)
: m_view(view)
{
+ ASSERT(m_view);
}
ChromeClientEfl::~ChromeClientEfl()
@@ -101,9 +102,6 @@
Ecore_Evas* ee = 0;
int x, y, w, h;
- if (!m_view)
- return FloatRect();
-
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view));
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
return FloatRect(x, y, w, h);
@@ -111,15 +109,12 @@
void ChromeClientEfl::setWindowRect(const FloatRect& rect)
{
- Ecore_Evas* ee = 0;
- IntRect intrect = IntRect(rect);
-
- if (!m_view)
- return;
-
if (!ewk_view_setting_enable_auto_resize_window_get(m_view))
return;
+ Ecore_Evas* ee = 0;
+ IntRect intrect = IntRect(rect);
+
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view));
ecore_evas_move(ee, intrect.x(), intrect.y());
ecore_evas_resize(ee, intrect.width(), intrect.height());
@@ -127,9 +122,6 @@
FloatRect ChromeClientEfl::pageRect()
{
- if (!m_view)
- return FloatRect();
-
return ewk_view_page_rect_get(m_view);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
