[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 e00680b17242f2b821416a6e52247ec38e01ba89
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 15:52:44 2010 +0000

    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
    
            No new tests since there's no new functionality.
    
            * platform/efl/WidgetEfl.cpp:
            (WebCore::Widget::setEvasObject):
            Add #ifdef HAVE_ECORE_X to it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a92080..0310263 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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
+
+        No new tests since there's no new functionality.
+
+        * platform/efl/WidgetEfl.cpp:
+        (WebCore::Widget::setEvasObject):
+        Add #ifdef HAVE_ECORE_X to it.
+
 2010-07-19  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/efl/WidgetEfl.cpp b/WebCore/platform/efl/WidgetEfl.cpp
index 725e56f..48d97b0 100644
--- a/WebCore/platform/efl/WidgetEfl.cpp
+++ b/WebCore/platform/efl/WidgetEfl.cpp
@@ -347,7 +347,9 @@ void Widget::setEvasObject(Evas_Object *o)
     m_data->m_evasObject = o;
     if (!o) {
         m_data->m_evas = 0;
+#ifdef HAVE_ECORE_X
         m_data->m_isUsingEcoreX = false;
+#endif
         return;
     }
 

-- 
WebKit Debian packaging