[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 9402c8fdb335ffdb69b4ca88e048e474941f1558
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 10 23:33:32 2002 +0000

            Reviewed by Trey.
    
    	- fixed 3123727 - SJ: Viewmaster arm sometimes doesn't animate on
    	http://www.pixar.com/howwedoit/
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::KHTMLPart): Don't call KHTMLPart::init at all...
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::KWQKHTMLPart): Call it here instead so that signal
    	connections happen properly.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2990 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 691fe82..4777f17 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-12-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3123727 - SJ: Viewmaster arm sometimes doesn't animate on
+	http://www.pixar.com/howwedoit/
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::KHTMLPart): Don't call KHTMLPart::init at all...
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::KWQKHTMLPart): Call it here instead so that signal
+	connections happen properly.
+
 2002-12-10  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3116996.  My hack to make selects ignore fixed CSS
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 691fe82..4777f17 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-12-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3123727 - SJ: Viewmaster arm sometimes doesn't animate on
+	http://www.pixar.com/howwedoit/
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::KHTMLPart): Don't call KHTMLPart::init at all...
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::KWQKHTMLPart): Call it here instead so that signal
+	connections happen properly.
+
 2002-12-10  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3116996.  My hack to make selects ignore fixed CSS
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5e41a6e..9c5f014 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -138,10 +138,7 @@ KHTMLPart::KHTMLPart( QWidget *parentWidget, const char *widgetname, QObject *pa
     d = 0;
     KHTMLFactory::registerPart( this );
     setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
-#if APPLE_CHANGES
-    // The widget is made outside this class in our case.
-    init( 0, prof );
-#else
+#if !APPLE_CHANGES
     init( new KHTMLView( this, parentWidget, widgetname ), prof );
 #endif
 }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 7b95465..c7f6e3d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -120,6 +120,9 @@ KWQKHTMLPart::KWQKHTMLPart()
     , _ownsView(false)
     , _mouseDownView(nil)
 {
+    // The widget is made outside this class in our case.
+    KHTMLPart::init( 0, DefaultGUI );
+
     Cache::init();
     mutableInstances().prepend(this);
     d->m_redirectionTimer.setMonitor(redirectionTimerMonitor, this);

-- 
WebKit Debian packaging