[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[krit at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4d40e5d4347ddde7819fa03f00f6a0a7af11d77f
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 15:57:07 2010 +0000

    2010-08-07  Dirk Schulze  <krit at webkit.org>
    
            Unreviewed build-fix.
    
            Come up with a more efficient way to represent Path segments
            https://bugs.webkit.org/show_bug.cgi?id=41159
    
            Landed wrong version of the patch.
    
            * svg/SVGPathByteStreamSource.cpp:
            (WebCore::SVGPathByteStreamSource::SVGPathByteStreamSource):
            (WebCore::SVGPathByteStreamSource::hasMoreData):
            * svg/SVGPathByteStreamSource.h:
            (WebCore::SVGPathByteStreamSource::moveToNextToken):
            * svg/SVGPathParserFactory.cpp:
            (WebCore::SVGPathParserFactory::buildSVGPathSegListFromByteStream):
            (WebCore::SVGPathParserFactory::createSVGPathByteStreamFromString):
            * svg/SVGPathParserFactory.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f83799e..61b7c0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,24 @@
 2010-08-07  Dirk Schulze  <krit at webkit.org>
 
+        Unreviewed build-fix.
+
+        Come up with a more efficient way to represent Path segments
+        https://bugs.webkit.org/show_bug.cgi?id=41159
+
+        Landed wrong version of the patch.
+
+        * svg/SVGPathByteStreamSource.cpp:
+        (WebCore::SVGPathByteStreamSource::SVGPathByteStreamSource):
+        (WebCore::SVGPathByteStreamSource::hasMoreData):
+        * svg/SVGPathByteStreamSource.h:
+        (WebCore::SVGPathByteStreamSource::moveToNextToken):
+        * svg/SVGPathParserFactory.cpp:
+        (WebCore::SVGPathParserFactory::buildSVGPathSegListFromByteStream):
+        (WebCore::SVGPathParserFactory::createSVGPathByteStreamFromString):
+        * svg/SVGPathParserFactory.h:
+
+2010-08-07  Dirk Schulze  <krit at webkit.org>
+
         Reviewed by Nikolas Zimmermann.
 
         Come up with a more efficient way to represent Path segments
diff --git a/WebCore/svg/SVGPathByteStreamSource.cpp b/WebCore/svg/SVGPathByteStreamSource.cpp
index 3c2b2bb..684843f 100644
--- a/WebCore/svg/SVGPathByteStreamSource.cpp
+++ b/WebCore/svg/SVGPathByteStreamSource.cpp
@@ -22,16 +22,14 @@
 #if ENABLE(SVG)
 #include "SVGPathByteStreamSource.h"
 
-#include "PlatformString.h"
-
 namespace WebCore {
 
 SVGPathByteStreamSource::SVGPathByteStreamSource(SVGPathByteStream* stream)
     : m_stream(stream)
-    , m_streamCurrent(stream->begin())
-    , m_streamEnd(stream->end())
 {
     ASSERT(stream);
+    m_streamCurrent = stream->begin();
+    m_streamEnd = stream->end();
 }
 
 SVGPathByteStreamSource::~SVGPathByteStreamSource()
@@ -40,7 +38,7 @@ SVGPathByteStreamSource::~SVGPathByteStreamSource()
 
 bool SVGPathByteStreamSource::hasMoreData() const
 {
-    return (m_streamCurrent < m_streamEnd);
+    return m_streamCurrent < m_streamEnd;
 }
 
 bool SVGPathByteStreamSource::parseFloat(float& result)
diff --git a/WebCore/svg/SVGPathByteStreamSource.h b/WebCore/svg/SVGPathByteStreamSource.h
index c3a85ea..f3d5e58 100644
--- a/WebCore/svg/SVGPathByteStreamSource.h
+++ b/WebCore/svg/SVGPathByteStreamSource.h
@@ -38,7 +38,7 @@ public:
     virtual ~SVGPathByteStreamSource();
 
     virtual bool hasMoreData() const;
-    virtual bool moveToNextToken();
+    virtual bool moveToNextToken() { return true; }
     virtual bool parseFloat(float& result);
     virtual bool parseFlag(bool& result);
     virtual bool parseSVGSegmentType(SVGPathSegType&);
@@ -47,6 +47,9 @@ public:
 private:
     SVGPathByteStreamSource(SVGPathByteStream*);
 
+#if COMPILER(MSVC)
+#pragma warning(disable: 4701)
+#endif
     template<typename DataType, typename ByteType>
     DataType readType()
     {
diff --git a/WebCore/svg/SVGPathParserFactory.cpp b/WebCore/svg/SVGPathParserFactory.cpp
index 9d32e89..4adb279 100644
--- a/WebCore/svg/SVGPathParserFactory.cpp
+++ b/WebCore/svg/SVGPathParserFactory.cpp
@@ -153,6 +153,8 @@ bool SVGPathParserFactory::buildSVGPathSegListFromByteStream(SVGPathByteStream*
 {
     ASSERT(stream);
     ASSERT(result);
+    if (stream->isEmpty())
+        return false; 
 
     SVGPathSegListBuilder* builder = globalSVGPathSegListBuilder();
     builder->setCurrentSVGPathSegList(result);
@@ -172,8 +174,10 @@ bool SVGPathParserFactory::buildSVGPathSegListFromByteStream(SVGPathByteStream*
 
 PassOwnPtr<SVGPathByteStream> SVGPathParserFactory::createSVGPathByteStreamFromString(const String& d, PathParsingMode parsingMode, bool& ok)
 {
-    if (d.isEmpty())
-        return false;
+    if (d.isEmpty()) {
+        ok = false;
+        return PassOwnPtr<SVGPathByteStream>();
+    }
 
     SVGPathByteStreamBuilder* builder = globalSVGPathByteStreamBuilder();
     OwnPtr<SVGPathByteStream> stream = SVGPathByteStream::create();
diff --git a/WebCore/svg/SVGPathParserFactory.h b/WebCore/svg/SVGPathParserFactory.h
index 5954562..dc61c66 100644
--- a/WebCore/svg/SVGPathParserFactory.h
+++ b/WebCore/svg/SVGPathParserFactory.h
@@ -26,7 +26,7 @@
 #include "SVGPathConsumer.h"
 #include "SVGPathSegList.h"
 #include "SVGPathByteStream.h"
-#include <OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 

-- 
WebKit Debian packaging