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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e1bd9e291355d0874b525fc054597a6cb74a4295
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 17:35:52 2009 +0000

    2009-10-16  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Change EmptyPluginHalterClient in SVGImage to be non-static, to
            match changes made http://trac.webkit.org/changeset/49385.
            https://bugs.webkit.org/show_bug.cgi?id=30403
    
            Run the following layout test sequence:
              LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-07-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t.svg
              LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t.svg
              LayoutTests/svg/carto.net/scrollbar.svg
              LayoutTests/svg/carto.net/selectionlist.svg
    
            selectionlist.svg should not crash.
    
            * svg/graphics/SVGImage.cpp:
            (WebCore::SVGImage::dataChanged): Made EmptyPluginHalterClient non-static.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ce3c074..83ed1d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2009-10-16  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change EmptyPluginHalterClient in SVGImage to be non-static, to
+        match changes made http://trac.webkit.org/changeset/49385.
+        https://bugs.webkit.org/show_bug.cgi?id=30403
+
+        Run the following layout test sequence:
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-01-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-03-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-04-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-05-b.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-06-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-07-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-08-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-09-t.svg
+          LayoutTests/svg/W3C-SVG-1.1/struct-image-10-t.svg
+          LayoutTests/svg/carto.net/scrollbar.svg
+          LayoutTests/svg/carto.net/selectionlist.svg
+
+        selectionlist.svg should not crash.
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::dataChanged): Made EmptyPluginHalterClient non-static.
+
 2009-10-16  Victor Wang  <victorw at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/svg/graphics/SVGImage.cpp b/WebCore/svg/graphics/SVGImage.cpp
index dc63582..0a506f8 100644
--- a/WebCore/svg/graphics/SVGImage.cpp
+++ b/WebCore/svg/graphics/SVGImage.cpp
@@ -239,14 +239,13 @@ bool SVGImage::dataChanged(bool allDataReceived)
         static DragClient* dummyDragClient = 0;
 #endif
         static InspectorClient* dummyInspectorClient = new EmptyInspectorClient;
-        static PluginHalterClient* dummyPluginHalterClient = new EmptyPluginHalterClient;
 
         m_chromeClient.set(new SVGImageChromeClient(this));
         
         // FIXME: If this SVG ends up loading itself, we might leak the world.
         // The comment said that the Cache code does not know about CachedImages
         // holding Frames and won't know to break the cycle. But 
-        m_page.set(new Page(m_chromeClient.get(), dummyContextMenuClient, dummyEditorClient, dummyDragClient, dummyInspectorClient, dummyPluginHalterClient));
+        m_page.set(new Page(m_chromeClient.get(), dummyContextMenuClient, dummyEditorClient, dummyDragClient, dummyInspectorClient, 0));
         m_page->settings()->setJavaScriptEnabled(false);
         m_page->settings()->setPluginsEnabled(false);
 

-- 
WebKit Debian packaging