[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ea7f9f765b59210c6848b61ca86499f75de340d6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 16:06:13 2010 +0000

    2010-07-19  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Fix some EFL theme issues
            https://bugs.webkit.org/show_bug.cgi?id=42569
    
            Keep a pointer to theme filename and check for it correctly.
            Reduce the scope of some variables.
            Don't test for platformWidget() since we are not using it.
    
            No new tests, no new functionality.
    
            * platform/efl/WidgetEfl.cpp:
            (WebCore::Widget::applyCursor):
            (WebCore::Widget::setCursor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0310263..09906ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Antonio Gomes.
 
+        [EFL] Fix some EFL theme issues
+        https://bugs.webkit.org/show_bug.cgi?id=42569
+
+        Keep a pointer to theme filename and check for it correctly.
+        Reduce the scope of some variables.
+        Don't test for platformWidget() since we are not using it.
+
+        No new tests, no new functionality.
+
+        * platform/efl/WidgetEfl.cpp:
+        (WebCore::Widget::applyCursor):
+        (WebCore::Widget::setCursor):
+
+2010-07-19  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
         [EFL] Add ifdef to compile code just on presence of Ecore_X
         https://bugs.webkit.org/show_bug.cgi?id=42567
 
diff --git a/WebCore/platform/efl/WidgetEfl.cpp b/WebCore/platform/efl/WidgetEfl.cpp
index 48d97b0..d6a4d08 100644
--- a/WebCore/platform/efl/WidgetEfl.cpp
+++ b/WebCore/platform/efl/WidgetEfl.cpp
@@ -229,21 +229,16 @@ void Widget::applyFallbackCursor()
 
 void Widget::applyCursor()
 {
-    const char *file = 0;
-    Evas_Coord x, y;
-
-    String theme = edjeThemeRecursive();
-    if (!theme.isNull())
-        file = edjeThemeRecursive().utf8().data();
+    CString file = edjeThemeRecursive().utf8();
 
     m_data->m_cursorObject = edje_object_add(evas());
-    if (file && !edje_object_file_set(m_data->m_cursorObject, file, m_data->m_cursorGroup.utf8().data())) {
+    if (!file.isNull() && !edje_object_file_set(m_data->m_cursorObject, file.data(), m_data->m_cursorGroup.utf8().data())) {
         evas_object_del(m_data->m_cursorObject);
         m_data->m_cursorObject = 0;
         ecore_evas_object_cursor_set(ecoreEvas(), 0, 0, 0, 0);
         applyFallbackCursor();
     } else {
-        Evas_Coord w, h;
+        Evas_Coord x, y, w, h;
         const char *d;
 
         edje_object_size_min_get(m_data->m_cursorObject, &w, &h);
@@ -266,7 +261,7 @@ void Widget::applyCursor()
 
 void Widget::setCursor(const Cursor& cursor)
 {
-    if (!platformWidget() || !evas())
+    if (!evas())
          return;
 
     const char *group = cursor.impl();

-- 
WebKit Debian packaging