[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[tkent at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit f8f35bd50e298b19a63c5403a9549fe473edcb25
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 10:32:30 2011 +0000

    Unreviewed, trivial fix.
    
    Fix a Chromium-only assertion failure by r76491.
    https://bugs.webkit.org/show_bug.cgi?id=38982
    
    Separate icon loading from the FileChooser constructor in order to avoid
    ref() before adoptRef().
    
    * platform/FileChooser.cpp:
    (WebCore::FileChooser::FileChooser):
    (WebCore::FileChooser::initialize):
    (WebCore::FileChooser::create):
    * platform/FileChooser.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index be0964e..06d8d8a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-24  Kent Tamura  <tkent at chromium.org>
+
+        Unreviewed, trivial fix.
+
+        Fix a Chromium-only assertion failure by r76491.
+        https://bugs.webkit.org/show_bug.cgi?id=38982
+
+        Separate icon loading from the FileChooser constructor in order to avoid
+        ref() before adoptRef().
+
+        * platform/FileChooser.cpp:
+        (WebCore::FileChooser::FileChooser):
+        (WebCore::FileChooser::initialize):
+        (WebCore::FileChooser::create):
+        * platform/FileChooser.h:
+
 2011-01-24  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/Source/WebCore/platform/FileChooser.cpp b/Source/WebCore/platform/FileChooser.cpp
index 90dd567..7e6d4ae 100644
--- a/Source/WebCore/platform/FileChooser.cpp
+++ b/Source/WebCore/platform/FileChooser.cpp
@@ -42,13 +42,19 @@ inline FileChooser::FileChooser(FileChooserClient* client, const Vector<String>&
     , m_isInitializing(true)
 {
     m_filenames = initialFilenames;
+}
+
+void FileChooser::initialize()
+{
     loadIcon();
     m_isInitializing = false;
 }
 
 PassRefPtr<FileChooser> FileChooser::create(FileChooserClient* client, const Vector<String>& initialFilenames)
 {
-    return adoptRef(new FileChooser(client, initialFilenames));
+    RefPtr<FileChooser> chooser(adoptRef(new FileChooser(client, initialFilenames)));
+    chooser->initialize();
+    return chooser;
 }
 
 FileChooser::~FileChooser()
diff --git a/Source/WebCore/platform/FileChooser.h b/Source/WebCore/platform/FileChooser.h
index fa25406..ac5e0e6 100644
--- a/Source/WebCore/platform/FileChooser.h
+++ b/Source/WebCore/platform/FileChooser.h
@@ -81,6 +81,7 @@ public:
 
 private:
     FileChooser(FileChooserClient*, const Vector<String>& initialFilenames);
+    void initialize();
     void loadIcon();
 
     FileChooserClient* m_client;

-- 
WebKit Debian packaging