[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2a3a6ca91cfdb92c5a08e403b0509971d0842a25
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 21:54:49 2009 +0000

    2009-10-15  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Oliver Hunt.
    
            [Qt] Build fix for QtWebKit after r49649.
    
            Change JSC::HasNonDefaultMark to OverridesMarkChildren in createStructure function.
    
            * bridge/qt/qt_runtime.h:
            (JSC::Bindings::QtRuntimeMethod::createStructure):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4974c91..dd707ba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-15  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        [Qt] Build fix for QtWebKit after r49649.
+
+        Change JSC::HasNonDefaultMark to OverridesMarkChildren in createStructure function.
+
+        * bridge/qt/qt_runtime.h:
+        (JSC::Bindings::QtRuntimeMethod::createStructure):
+
 2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed - build fix.
diff --git a/WebCore/bridge/qt/qt_runtime.h b/WebCore/bridge/qt/qt_runtime.h
index a9c4e9e..f2ce954 100644
--- a/WebCore/bridge/qt/qt_runtime.h
+++ b/WebCore/bridge/qt/qt_runtime.h
@@ -151,7 +151,7 @@ public:
 
     static PassRefPtr<Structure> createStructure(JSValue prototype)
     {
-        return Structure::create(prototype, TypeInfo(ObjectType,  JSC::OverridesGetOwnPropertySlot | JSC::HasNonDefaultMark));
+        return Structure::create(prototype, TypeInfo(ObjectType,  OverridesGetOwnPropertySlot | OverridesMarkChildren));
     }
 
 protected:

-- 
WebKit Debian packaging