summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings/js/JSHTMLDocumentCustom.cpp')
-rw-r--r--WebCore/bindings/js/JSHTMLDocumentCustom.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/bindings/js/JSHTMLDocumentCustom.cpp b/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
index 7fde002..de0e96f 100644
--- a/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
@@ -51,16 +51,16 @@ using namespace HTMLNames;
bool JSHTMLDocument::canGetItemsForName(ExecState*, HTMLDocument* document, const Identifier& propertyName)
{
- AtomicStringImpl* atomicPropertyName = AtomicString::find(propertyName);
+ AtomicStringImpl* atomicPropertyName = findAtomicString(propertyName);
return atomicPropertyName && (document->hasNamedItem(atomicPropertyName) || document->hasExtraNamedItem(atomicPropertyName));
}
-JSValue JSHTMLDocument::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue JSHTMLDocument::nameGetter(ExecState* exec, JSValue slotBase, const Identifier& propertyName)
{
- JSHTMLDocument* thisObj = static_cast<JSHTMLDocument*>(asObject(slot.slotBase()));
+ JSHTMLDocument* thisObj = static_cast<JSHTMLDocument*>(asObject(slotBase));
HTMLDocument* document = static_cast<HTMLDocument*>(thisObj->impl());
- String name = propertyName;
+ String name = identifierToString(propertyName);
RefPtr<HTMLCollection> collection = document->documentNamedItems(name);
unsigned length = collection->length();
@@ -137,14 +137,14 @@ static inline void documentWrite(ExecState* exec, const ArgList& args, HTMLDocum
size_t size = args.size();
UString firstString = args.at(0).toString(exec);
- SegmentedString segmentedString = String(firstString);
+ SegmentedString segmentedString = ustringToString(firstString);
if (size != 1) {
if (!size)
segmentedString.clear();
else {
for (size_t i = 1; i < size; ++i) {
UString subsequentString = args.at(i).toString(exec);
- segmentedString.append(SegmentedString(String(subsequentString)));
+ segmentedString.append(SegmentedString(ustringToString(subsequentString)));
}
}
}