OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge WebKit at r71558: Initial merge by git.
[android-x86/external-webkit.git]
/
WebCore
/
svg
/
SVGStringList.cpp
diff --git
a/WebCore/svg/SVGStringList.cpp
b/WebCore/svg/SVGStringList.cpp
index
9f4809f
..
3eb392a
100644
(file)
--- a/
WebCore/svg/SVGStringList.cpp
+++ b/
WebCore/svg/SVGStringList.cpp
@@
-23,29
+23,31
@@
#if ENABLE(SVG)
#include "SVGStringList.h"
#if ENABLE(SVG)
#include "SVGStringList.h"
+#include "SVGElement.h"
#include "SVGParserUtilities.h"
namespace WebCore {
#include "SVGParserUtilities.h"
namespace WebCore {
-SVGStringList::SVGStringList(const QualifiedName& attributeName)
- : SVGList<String>(attributeName)
+void SVGStringList::commitChange(SVGElement* contextElement)
{
{
+ ASSERT(contextElement);
+ contextElement->invalidateSVGAttributes();
+ contextElement->svgAttributeChanged(m_attributeName);
}
}
-void SVGStringList::reset(const String& str)
+void SVGStringList::reset(const String& str
ing
)
{
{
-
ExceptionCode ec = 0
;
+
parse(string, ' ')
;
- parse(str, ' ');
- if (
numberOfItems() == 0
)
- append
Item(String(""), ec); // Create empty string...
+ // Add empty string, if list is empty.
+ if (
isEmpty()
)
+ append
(String(""));
}
void SVGStringList::parse(const String& data, UChar delimiter)
{
// TODO : more error checking/reporting
}
void SVGStringList::parse(const String& data, UChar delimiter)
{
// TODO : more error checking/reporting
- ExceptionCode ec = 0;
- clear(ec);
+ clear();
const UChar* ptr = data.characters();
const UChar* end = ptr + data.length();
const UChar* ptr = data.characters();
const UChar* end = ptr + data.length();
@@
-55,7
+57,7
@@
void SVGStringList::parse(const String& data, UChar delimiter)
ptr++;
if (ptr == start)
break;
ptr++;
if (ptr == start)
break;
- append
Item(String(start, ptr - start), ec
);
+ append
(String(start, ptr - start)
);
skipOptionalSpacesOrDelimiter(ptr, end, delimiter);
}
}
skipOptionalSpacesOrDelimiter(ptr, end, delimiter);
}
}