Changeset 89327 in webkit

Timestamp:

Jun 20, 2011 6:33:33 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-20 Ryuan Choi <​ryuan.choi@samsung.com>

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):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientEfl.cpp (modified) (4 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-06-20  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        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  <rniwa@webkit.org>
 

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -77 +77 @@
     : m_view(view)
 {
+    ASSERT(m_view);
 }
 
@@ -101 +102 @@
     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));
@@ -112 +110 @@
 void ChromeClientEfl::setWindowRect(const FloatRect& rect)
 {
+    if (!ewk_view_setting_enable_auto_resize_window_get(m_view))
+        return;
+
     Ecore_Evas* ee = 0;
     IntRect intrect = IntRect(rect);
-
-    if (!m_view)
-        return;
-
-    if (!ewk_view_setting_enable_auto_resize_window_get(m_view))
-        return;
 
     ee = ecore_evas_ecore_evas_get(evas_object_evas_get(m_view));
@@ -128 +123 @@
 FloatRect ChromeClientEfl::pageRect()
 {
-    if (!m_view)
-        return FloatRect();
-
     return ewk_view_page_rect_get(m_view);
 }