Commit f4b05b29 authored by darin's avatar darin

Reviewed by Tim Hatcher.

        - put more into the WebCore namespace
        - removed unused code for plain text fields

        Put more classes, class templates, enums, functions, and constants into
        the WebCore namespace, including all the headers in the platform directory.

        Removed lots of unneeded "WebCore::" qualifiers and "using" directives.

        Added some "WebCore::" qualifiers in a few places.

        Removed "uses WebCore::" in headers that we said we'd remove "when
        everything is in the WebCore namespace".

        * bindings/js/JSDOMParser.cpp:
        * bindings/js/JSHTMLElementWrapperFactory.cpp:
        * bindings/js/JSXSLTProcessor.cpp:
        * bindings/js/kjs_binding.cpp:
        * bindings/js/kjs_css.cpp:
        * bindings/js/kjs_dom.cpp:
        * bindings/js/kjs_dom.h:
        * bindings/js/kjs_events.cpp:
        * bindings/js/kjs_proxy.h:
        * bindings/js/kjs_window.h:
        * bindings/objc/DOM.mm:
        * bridge/History.h:
        * bridge/JavaAppletWidget.h:
        * bridge/mac/FormDataMac.h:
        * bridge/mac/FormDataMac.mm:
        * bridge/mac/WebCoreAXObject.mm:
        * bridge/mac/WebCoreEncodings.mm:
        * bridge/mac/WebCoreFrameBridge.h:
        * bridge/mac/WebCoreIconDatabaseBridge.mm:
        * bridge/mac/WebCorePageState.h:
        * bridge/mac/WebCoreScriptDebugger.mm:
        * bridge/mac/WebCoreSettings.h:
        * css/CSSGrammar.y:
        * css/CSSPageRule.cpp:
        * css/CSSPageRule.h:
        * css/MediaList.cpp:
        * css/cssstyleselector.h:
        * dom/Clipboard.h:
        * dom/Document.cpp:
        * dom/Document.h:
        * dom/EventTargetNode.h:
        * dom/Node.cpp:
        * dom/Node.h:
        * dom/Position.h:
        * dom/Range.cpp:
        * dom/XMLTokenizer.cpp:
        * editing/AppendNodeCommand.h:
        * editing/ApplyStyleCommand.cpp:
        * editing/BreakBlockquoteCommand.cpp:
        * editing/BreakBlockquoteCommand.h:
        * editing/CompositeEditCommand.cpp:
        * editing/CompositeEditCommand.h:
        * editing/CreateLinkCommand.h:
        * editing/DeleteFromTextNodeCommand.h:
        * editing/DeleteSelectionCommand.h:
        * editing/FormatBlockCommand.h:
        * editing/HTMLInterchange.cpp:
        * editing/HTMLInterchange.h:
        * editing/IndentOutdentCommand.h:
        * editing/InsertIntoTextNodeCommand.h:
        * editing/InsertLineBreakCommand.h:
        * editing/InsertListCommand.h:
        * editing/InsertNodeBeforeCommand.h:
        * editing/InsertTextCommand.cpp:
        * editing/InsertTextCommand.h:
        * editing/JSEditor.cpp:
        * editing/JSEditor.h:
        * editing/JoinTextNodesCommand.h:
        * editing/MergeIdenticalElementsCommand.cpp:
        * editing/MergeIdenticalElementsCommand.h:
        * editing/ModifySelectionListLevel.h:
        * editing/MoveSelectionCommand.h:
        * editing/RebalanceWhitespaceCommand.h:
        * editing/RemoveNodeAttributeCommand.h:
        * editing/RemoveNodeCommand.h:
        * editing/RemoveNodePreservingChildrenCommand.h:
        * editing/ReplaceSelectionCommand.h:
        * editing/SetNodeAttributeCommand.h:
        * editing/SplitElementCommand.cpp:
        * editing/SplitElementCommand.h:
        * editing/SplitTextNodeCommand.cpp:
        * editing/SplitTextNodeCommand.h:
        * editing/SplitTextNodeContainingElementCommand.h:
        * editing/TypingCommand.cpp:
        * editing/TypingCommand.h:
        * editing/UnlinkCommand.h:
        * editing/VisiblePosition.cpp:
        * editing/WrapContentsInDummySpanCommand.cpp:
        * editing/WrapContentsInDummySpanCommand.h:
        * editing/markup.cpp:
        * editing/markup.h:
        * html/HTMLAnchorElement.cpp:
        * html/HTMLBodyElement.cpp:
        * html/HTMLButtonElement.h:
        * html/HTMLCollection.h:
        * html/HTMLDocument.h:
        * html/HTMLEmbedElement.cpp:
        * html/HTMLFormElement.cpp:
        * html/HTMLFormElement.h:
        * html/HTMLFrameElement.cpp:
        * html/HTMLFrameSetElement.cpp:
        * html/HTMLKeygenElement.cpp:
        * html/HTMLLabelElement.cpp:
        * html/HTMLObjectElement.cpp:
        * html/HTMLObjectElement.h:
        * html/HTMLTableElement.cpp:
        * html/HTMLTablePartElement.cpp:
        * icon/IconDatabase.h:
        * kcanvas/KCanvasPath.h:
        * kcanvas/KCanvasResources.cpp:
        * kcanvas/KCanvasResources.h:
        * kcanvas/KCanvasTreeDebug.cpp:
        * kcanvas/KCanvasTreeDebug.h:
        * kcanvas/RenderSVGContainer.cpp:
        * kcanvas/RenderSVGText.h:
        * kcanvas/device/KRenderingPaintServer.h:
        * kcanvas/device/KRenderingPaintServerGradient.h:
        * kcanvas/device/KRenderingPaintServerSolid.cpp:
        * ksvg2/misc/SVGImageLoader.cpp:
        * ksvg2/svg/SVGElement.cpp:
        * ksvg2/svg/SVGElement.h:
        * ksvg2/svg/SVGForeignObjectElement.cpp:
        * ksvg2/svg/SVGForeignObjectElement.h:
        * ksvg2/svg/SVGImageElement.cpp:
        * ksvg2/svg/SVGPoint.h:
        * ksvg2/svg/SVGStylable.h:
        * ksvg2/svg/SVGTRefElement.cpp:
        * ksvg2/svg/SVGTRefElement.h:
        * ksvg2/svg/SVGTSpanElement.cpp:
        * ksvg2/svg/SVGTSpanElement.h:
        * ksvg2/svg/SVGTextElement.h:
        * ksvg2/svg/svgpathparser.cpp:
        * ksvg2/svg/svgpathparser.h:
        * loader/Cache.h:
        * loader/DocLoader.h:
        * loader/LoaderFunctions.h:
        * loader/mac/LoaderFunctionsMac.mm:
        * page/Frame.h:
        * page/FrameView.h:
        * page/Page.h:
        * page/Settings.h:
        * platform/AffineTransform.cpp:
        * platform/AffineTransform.h:
        * platform/Arena.cpp:
        * platform/Arena.h:
        * platform/CookieJar.h:
        * platform/DeprecatedCString.cpp:
        * platform/DeprecatedCString.h:
        * platform/DeprecatedPtrList.h:
        * platform/DeprecatedPtrListImpl.cpp:
        * platform/DeprecatedPtrListImpl.h:
        * platform/DeprecatedPtrQueue.h:
        * platform/DeprecatedString.cpp:
        * platform/DeprecatedString.h:
        * platform/DeprecatedStringList.cpp:
        * platform/DeprecatedStringList.h:
        * platform/DeprecatedValueList.h:
        * platform/DeprecatedValueListImpl.cpp:
        * platform/DeprecatedValueListImpl.h:
        * platform/FileButton.h:
        * platform/FloatPoint.h:
        * platform/FloatRect.h:
        * platform/FloatSize.h:
        * platform/FontData.h:
        * platform/FontFallbackList.h:
        * platform/GraphicsContext.h:
        * platform/IntPoint.h:
        * platform/IntRect.h:
        * platform/IntSize.h:
        * platform/KURL.cpp:
        * platform/KURL.h:
        * platform/ListBox.h:
        * platform/Logging.cpp:
        * platform/Logging.h:
        * platform/Pen.h:
        * platform/PopUpButton.h:
        * platform/RegularExpression.cpp:
        * platform/RegularExpression.h:
        * platform/SSLKeyGenerator.h:
        * platform/ScrollBar.h:
        * platform/SegmentedString.h:
        * platform/Shared.h:
        * platform/Slider.h:
        * platform/StringImpl.h:
        * platform/TextBox.h:
        * platform/TextField.h:
        * platform/TextStream.cpp:
        * platform/TextStream.h:
        * platform/TransferJob.h:
        * platform/TransferJobClient.h:
        * platform/Widget.h:
        * platform/cg/AffineTransformCG.cpp:
        * platform/mac/ClipboardMac.h:
        * platform/mac/ClipboardMac.mm:
        * platform/mac/DeprecatedStringListMac.mm:
        * platform/mac/FontCacheMac.mm:
        * platform/mac/KURLMac.mm:
        * platform/mac/ListBoxMac.mm:
        * platform/mac/PopUpButtonMac.mm:
        * platform/mac/SSLKeyGeneratorMac.mm:
        * platform/mac/TextBoxMac.mm:
        * platform/mac/TextFieldMac.mm:
        * platform/mac/WebCoreTextArea.h:
        * platform/mac/WebCoreTextArea.mm:
        * platform/mac/WebCoreTextField.h:
        * platform/mac/WebCoreTextField.mm:
        * rendering/DeprecatedRenderSelect.h:
        * rendering/RenderArena.cpp:
        * rendering/RenderArena.h:
        * rendering/RenderBlock.cpp:
        * rendering/RenderBox.cpp:
        * rendering/RenderContainer.cpp:
        * rendering/RenderFlexibleBox.cpp:
        * rendering/RenderFlow.cpp:
        * rendering/RenderLayer.cpp:
        * rendering/RenderLineEdit.cpp:
        * rendering/RenderObject.h:
        * rendering/RenderStyle.cpp:
        * rendering/RenderStyle.h:
        * rendering/RenderText.cpp:
        * rendering/RenderTextFragment.cpp:
        * rendering/RenderTheme.h:
        * rendering/RenderTreeAsText.cpp:
        * rendering/RenderTreeAsText.h:
        * rendering/RenderView.h:
        * rendering/bidi.h:
        * xml/XSLStyleSheet.cpp:
        * xml/XSLTProcessor.cpp:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7e95087c
2006-07-09 Darin Adler <darin@apple.com>
Reviewed by Tim Hatcher.
- put more into the WebCore namespace
- removed unused code for plain text fields
Put more classes, class templates, enums, functions, and constants into
the WebCore namespace, including all the headers in the platform directory.
Removed lots of unneeded "WebCore::" qualifiers and "using" directives.
Added some "WebCore::" qualifiers in a few places.
Removed "uses WebCore::" in headers that we said we'd remove "when
everything is in the WebCore namespace".
* bindings/js/JSDOMParser.cpp:
* bindings/js/JSHTMLElementWrapperFactory.cpp:
* bindings/js/JSXSLTProcessor.cpp:
* bindings/js/kjs_binding.cpp:
* bindings/js/kjs_css.cpp:
* bindings/js/kjs_dom.cpp:
* bindings/js/kjs_dom.h:
* bindings/js/kjs_events.cpp:
* bindings/js/kjs_proxy.h:
* bindings/js/kjs_window.h:
* bindings/objc/DOM.mm:
* bridge/History.h:
* bridge/JavaAppletWidget.h:
* bridge/mac/FormDataMac.h:
* bridge/mac/FormDataMac.mm:
* bridge/mac/WebCoreAXObject.mm:
* bridge/mac/WebCoreEncodings.mm:
* bridge/mac/WebCoreFrameBridge.h:
* bridge/mac/WebCoreIconDatabaseBridge.mm:
* bridge/mac/WebCorePageState.h:
* bridge/mac/WebCoreScriptDebugger.mm:
* bridge/mac/WebCoreSettings.h:
* css/CSSGrammar.y:
* css/CSSPageRule.cpp:
* css/CSSPageRule.h:
* css/MediaList.cpp:
* css/cssstyleselector.h:
* dom/Clipboard.h:
* dom/Document.cpp:
* dom/Document.h:
* dom/EventTargetNode.h:
* dom/Node.cpp:
* dom/Node.h:
* dom/Position.h:
* dom/Range.cpp:
* dom/XMLTokenizer.cpp:
* editing/AppendNodeCommand.h:
* editing/ApplyStyleCommand.cpp:
* editing/BreakBlockquoteCommand.cpp:
* editing/BreakBlockquoteCommand.h:
* editing/CompositeEditCommand.cpp:
* editing/CompositeEditCommand.h:
* editing/CreateLinkCommand.h:
* editing/DeleteFromTextNodeCommand.h:
* editing/DeleteSelectionCommand.h:
* editing/FormatBlockCommand.h:
* editing/HTMLInterchange.cpp:
* editing/HTMLInterchange.h:
* editing/IndentOutdentCommand.h:
* editing/InsertIntoTextNodeCommand.h:
* editing/InsertLineBreakCommand.h:
* editing/InsertListCommand.h:
* editing/InsertNodeBeforeCommand.h:
* editing/InsertTextCommand.cpp:
* editing/InsertTextCommand.h:
* editing/JSEditor.cpp:
* editing/JSEditor.h:
* editing/JoinTextNodesCommand.h:
* editing/MergeIdenticalElementsCommand.cpp:
* editing/MergeIdenticalElementsCommand.h:
* editing/ModifySelectionListLevel.h:
* editing/MoveSelectionCommand.h:
* editing/RebalanceWhitespaceCommand.h:
* editing/RemoveNodeAttributeCommand.h:
* editing/RemoveNodeCommand.h:
* editing/RemoveNodePreservingChildrenCommand.h:
* editing/ReplaceSelectionCommand.h:
* editing/SetNodeAttributeCommand.h:
* editing/SplitElementCommand.cpp:
* editing/SplitElementCommand.h:
* editing/SplitTextNodeCommand.cpp:
* editing/SplitTextNodeCommand.h:
* editing/SplitTextNodeContainingElementCommand.h:
* editing/TypingCommand.cpp:
* editing/TypingCommand.h:
* editing/UnlinkCommand.h:
* editing/VisiblePosition.cpp:
* editing/WrapContentsInDummySpanCommand.cpp:
* editing/WrapContentsInDummySpanCommand.h:
* editing/markup.cpp:
* editing/markup.h:
* html/HTMLAnchorElement.cpp:
* html/HTMLBodyElement.cpp:
* html/HTMLButtonElement.h:
* html/HTMLCollection.h:
* html/HTMLDocument.h:
* html/HTMLEmbedElement.cpp:
* html/HTMLFormElement.cpp:
* html/HTMLFormElement.h:
* html/HTMLFrameElement.cpp:
* html/HTMLFrameSetElement.cpp:
* html/HTMLKeygenElement.cpp:
* html/HTMLLabelElement.cpp:
* html/HTMLObjectElement.cpp:
* html/HTMLObjectElement.h:
* html/HTMLTableElement.cpp:
* html/HTMLTablePartElement.cpp:
* icon/IconDatabase.h:
* kcanvas/KCanvasPath.h:
* kcanvas/KCanvasResources.cpp:
* kcanvas/KCanvasResources.h:
* kcanvas/KCanvasTreeDebug.cpp:
* kcanvas/KCanvasTreeDebug.h:
* kcanvas/RenderSVGContainer.cpp:
* kcanvas/RenderSVGText.h:
* kcanvas/device/KRenderingPaintServer.h:
* kcanvas/device/KRenderingPaintServerGradient.h:
* kcanvas/device/KRenderingPaintServerSolid.cpp:
* ksvg2/misc/SVGImageLoader.cpp:
* ksvg2/svg/SVGElement.cpp:
* ksvg2/svg/SVGElement.h:
* ksvg2/svg/SVGForeignObjectElement.cpp:
* ksvg2/svg/SVGForeignObjectElement.h:
* ksvg2/svg/SVGImageElement.cpp:
* ksvg2/svg/SVGPoint.h:
* ksvg2/svg/SVGStylable.h:
* ksvg2/svg/SVGTRefElement.cpp:
* ksvg2/svg/SVGTRefElement.h:
* ksvg2/svg/SVGTSpanElement.cpp:
* ksvg2/svg/SVGTSpanElement.h:
* ksvg2/svg/SVGTextElement.h:
* ksvg2/svg/svgpathparser.cpp:
* ksvg2/svg/svgpathparser.h:
* loader/Cache.h:
* loader/DocLoader.h:
* loader/LoaderFunctions.h:
* loader/mac/LoaderFunctionsMac.mm:
* page/Frame.h:
* page/FrameView.h:
* page/Page.h:
* page/Settings.h:
* platform/AffineTransform.cpp:
* platform/AffineTransform.h:
* platform/Arena.cpp:
* platform/Arena.h:
* platform/CookieJar.h:
* platform/DeprecatedCString.cpp:
* platform/DeprecatedCString.h:
* platform/DeprecatedPtrList.h:
* platform/DeprecatedPtrListImpl.cpp:
* platform/DeprecatedPtrListImpl.h:
* platform/DeprecatedPtrQueue.h:
* platform/DeprecatedString.cpp:
* platform/DeprecatedString.h:
* platform/DeprecatedStringList.cpp:
* platform/DeprecatedStringList.h:
* platform/DeprecatedValueList.h:
* platform/DeprecatedValueListImpl.cpp:
* platform/DeprecatedValueListImpl.h:
* platform/FileButton.h:
* platform/FloatPoint.h:
* platform/FloatRect.h:
* platform/FloatSize.h:
* platform/FontData.h:
* platform/FontFallbackList.h:
* platform/GraphicsContext.h:
* platform/IntPoint.h:
* platform/IntRect.h:
* platform/IntSize.h:
* platform/KURL.cpp:
* platform/KURL.h:
* platform/ListBox.h:
* platform/Logging.cpp:
* platform/Logging.h:
* platform/Pen.h:
* platform/PopUpButton.h:
* platform/RegularExpression.cpp:
* platform/RegularExpression.h:
* platform/SSLKeyGenerator.h:
* platform/ScrollBar.h:
* platform/SegmentedString.h:
* platform/Shared.h:
* platform/Slider.h:
* platform/StringImpl.h:
* platform/TextBox.h:
* platform/TextField.h:
* platform/TextStream.cpp:
* platform/TextStream.h:
* platform/TransferJob.h:
* platform/TransferJobClient.h:
* platform/Widget.h:
* platform/cg/AffineTransformCG.cpp:
* platform/mac/ClipboardMac.h:
* platform/mac/ClipboardMac.mm:
* platform/mac/DeprecatedStringListMac.mm:
* platform/mac/FontCacheMac.mm:
* platform/mac/KURLMac.mm:
* platform/mac/ListBoxMac.mm:
* platform/mac/PopUpButtonMac.mm:
* platform/mac/SSLKeyGeneratorMac.mm:
* platform/mac/TextBoxMac.mm:
* platform/mac/TextFieldMac.mm:
* platform/mac/WebCoreTextArea.h:
* platform/mac/WebCoreTextArea.mm:
* platform/mac/WebCoreTextField.h:
* platform/mac/WebCoreTextField.mm:
* rendering/DeprecatedRenderSelect.h:
* rendering/RenderArena.cpp:
* rendering/RenderArena.h:
* rendering/RenderBlock.cpp:
* rendering/RenderBox.cpp:
* rendering/RenderContainer.cpp:
* rendering/RenderFlexibleBox.cpp:
* rendering/RenderFlow.cpp:
* rendering/RenderLayer.cpp:
* rendering/RenderLineEdit.cpp:
* rendering/RenderObject.h:
* rendering/RenderStyle.cpp:
* rendering/RenderStyle.h:
* rendering/RenderText.cpp:
* rendering/RenderTextFragment.cpp:
* rendering/RenderTheme.h:
* rendering/RenderTreeAsText.cpp:
* rendering/RenderTreeAsText.h:
* rendering/RenderView.h:
* rendering/bidi.h:
* xml/XSLStyleSheet.cpp:
* xml/XSLTProcessor.cpp:
2006-07-09 Geoffrey Garen <ggaren@apple.com>
Reviewed by Beth.
......
......@@ -40,7 +40,7 @@ KJS_DEFINE_PROTOTYPE(DOMParserProto)
KJS_IMPLEMENT_PROTOFUNC(DOMParserProtoFunc)
KJS_IMPLEMENT_PROTOTYPE("DOMParser",DOMParserProto,DOMParserProtoFunc)
DOMParserConstructorImp::DOMParserConstructorImp(ExecState *exec, WebCore::Document *d)
DOMParserConstructorImp::DOMParserConstructorImp(ExecState *exec, Document *d)
: doc(d)
{
setPrototype(exec->lexicalInterpreter()->builtinObjectPrototype());
......@@ -64,7 +64,7 @@ const ClassInfo JSDOMParser::info = { "DOMParser", 0, &DOMParserTable, 0 };
@end
*/
JSDOMParser::JSDOMParser(ExecState *exec, WebCore::Document *d)
JSDOMParser::JSDOMParser(ExecState *exec, Document *d)
: doc(d)
{
setPrototype(DOMParserProto::self(exec));
......
......@@ -177,7 +177,7 @@ FOR_EACH_TAG(CREATE_WRAPPER_FUNCTION)
DOMNode* createJSHTMLWrapper(ExecState* exec, PassRefPtr<HTMLElement> element)
{
static HashMap<WebCore::AtomicStringImpl*, CreateHTMLElementWrapperFunction> map;
static HashMap<AtomicStringImpl*, CreateHTMLElementWrapperFunction> map;
if (map.isEmpty()) {
#define ADD_TO_HASH_MAP(tag, name) map.set(tag##Tag.localName().impl(), create##name##Wrapper);
FOR_EACH_TAG(ADD_TO_HASH_MAP)
......
......@@ -90,7 +90,7 @@ JSValue *XSLTProcessorProtoFunc::callAsFunction(ExecState *exec, JSObject *thisO
JSValue *nodeVal = args[0];
JSValue *docVal = args[1];
if (nodeVal->isObject(&DOMNode::info) && docVal->isObject(&JSDocument::info)) {
WebCore::Node* node = static_cast<DOMNode *>(nodeVal)->impl();
Node* node = static_cast<DOMNode *>(nodeVal)->impl();
Document* doc = static_cast<Document*>(static_cast<JSDocument *>(docVal)->impl());
return toJS(exec, processor.transformToFragment(node, doc).get());
}
......
......@@ -48,7 +48,7 @@ UString DOMObject::toString(ExecState *) const
}
typedef HashMap<void*, DOMObject*> DOMObjectMap;
typedef HashMap<WebCore::Node*, DOMNode*> NodeMap;
typedef HashMap<Node*, DOMNode*> NodeMap;
typedef HashMap<Document*, NodeMap*> NodePerDocMap;
static DOMObjectMap *domObjects()
......@@ -93,7 +93,7 @@ void ScriptInterpreter::forgetDOMObject(void* objectHandle)
domObjects()->remove(objectHandle);
}
DOMNode *ScriptInterpreter::getDOMNodeForDocument(WebCore::Document *document, WebCore::Node *node)
DOMNode *ScriptInterpreter::getDOMNodeForDocument(Document *document, Node *node)
{
if (!document)
return static_cast<DOMNode *>(domObjects()->get(node));
......@@ -103,7 +103,7 @@ DOMNode *ScriptInterpreter::getDOMNodeForDocument(WebCore::Document *document, W
return NULL;
}
void ScriptInterpreter::forgetDOMNodeForDocument(WebCore::Document *document, WebCore::Node *node)
void ScriptInterpreter::forgetDOMNodeForDocument(Document *document, Node *node)
{
if (!document) {
domObjects()->remove(node);
......@@ -114,7 +114,7 @@ void ScriptInterpreter::forgetDOMNodeForDocument(WebCore::Document *document, We
documentDict->remove(node);
}
void ScriptInterpreter::putDOMNodeForDocument(WebCore::Document *document, WebCore::Node *nodeHandle, DOMNode *nodeWrapper)
void ScriptInterpreter::putDOMNodeForDocument(Document *document, Node *nodeHandle, DOMNode *nodeWrapper)
{
if (!document) {
domObjects()->set(nodeHandle, nodeWrapper);
......@@ -128,7 +128,7 @@ void ScriptInterpreter::putDOMNodeForDocument(WebCore::Document *document, WebCo
documentDict->set(nodeHandle, nodeWrapper);
}
void ScriptInterpreter::forgetAllDOMNodesForDocument(WebCore::Document *document)
void ScriptInterpreter::forgetAllDOMNodesForDocument(Document *document)
{
assert(document);
NodePerDocMap::iterator it = domNodesPerDocument()->find(document);
......@@ -184,7 +184,7 @@ ExecState *ScriptInterpreter::globalExec()
return Interpreter::globalExec();
}
void ScriptInterpreter::updateDOMNodeDocument(WebCore::Node *node, WebCore::Document *oldDoc, WebCore::Document *newDoc)
void ScriptInterpreter::updateDOMNodeDocument(Node *node, Document *oldDoc, Document *newDoc)
{
DOMNode *cachedObject = getDOMNodeForDocument(oldDoc, node);
if (cachedObject) {
......
......@@ -234,7 +234,7 @@ JSValue* DOMCSSStyleDeclarationProtoFunc::callAsFunction(ExecState* exec, JSObje
DOMExceptionTranslator exception(exec);
CSSStyleDeclaration &styleDecl = *static_cast<DOMCSSStyleDeclaration*>(thisObj)->impl();
UString str = args[0]->toString(exec);
WebCore::String s = str;
String s = str;
switch (id) {
case DOMCSSStyleDeclaration::GetPropertyValue:
......@@ -261,7 +261,7 @@ JSValue* DOMCSSStyleDeclarationProtoFunc::callAsFunction(ExecState* exec, JSObje
JSValue* toJS(ExecState* exec, CSSStyleDeclaration *s)
{
return cacheDOMObject<CSSStyleDeclaration, WebCore::JSCSSStyleDeclaration>(exec, s);
return cacheDOMObject<CSSStyleDeclaration, JSCSSStyleDeclaration>(exec, s);
}
// -------------------------------------------------------------------------
......@@ -279,13 +279,13 @@ const ClassInfo DOMStyleSheet::info = { "StyleSheet", 0, &DOMStyleSheetTable, 0
@end
*/
DOMStyleSheet::DOMStyleSheet(ExecState* exec, WebCore::StyleSheet* ss)
DOMStyleSheet::DOMStyleSheet(ExecState* exec, StyleSheet* ss)
: m_impl(ss)
{
setPrototype(exec->lexicalInterpreter()->builtinObjectPrototype());
}
DOMStyleSheet::DOMStyleSheet(WebCore::StyleSheet *ss)
DOMStyleSheet::DOMStyleSheet(StyleSheet *ss)
: m_impl(ss)
{
}
......@@ -361,7 +361,7 @@ const ClassInfo DOMStyleSheetList::info = { "StyleSheetList", 0, &DOMStyleSheetL
*/
KJS_IMPLEMENT_PROTOFUNC(DOMStyleSheetListFunc) // not really a proto, but doesn't matter
DOMStyleSheetList::DOMStyleSheetList(ExecState* exec, WebCore::StyleSheetList* ssl, WebCore::Document* doc)
DOMStyleSheetList::DOMStyleSheetList(ExecState* exec, StyleSheetList* ssl, Document* doc)
: m_impl(ssl)
, m_doc(doc)
{
......@@ -647,7 +647,7 @@ JSValue* DOMCSSStyleSheetProtoFunc::callAsFunction(ExecState* exec, JSObject* th
KJS_IMPLEMENT_PROTOFUNC(DOMCSSRuleFunc) // Not a proto, but doesn't matter
DOMCSSRule::DOMCSSRule(ExecState* exec, WebCore::CSSRule* r)
DOMCSSRule::DOMCSSRule(ExecState* exec, CSSRule* r)
: m_impl(r)
{
}
......@@ -861,7 +861,7 @@ const ClassInfo DOMCSSValue::info = { "CSSValue", 0, &DOMCSSValueTable, 0 };
KJS_IMPLEMENT_PROTOFUNC(DOMCSSValueProtoFunc)
KJS_IMPLEMENT_PROTOTYPE("DOMCSSValue", DOMCSSValueProto, DOMCSSValueProtoFunc)
DOMCSSValue::DOMCSSValue(ExecState* exec, WebCore::CSSValue* v)
DOMCSSValue::DOMCSSValue(ExecState* exec, CSSValue* v)
: m_impl(v)
{
setPrototype(DOMCSSValueProto::self(exec));
......@@ -986,7 +986,7 @@ const ClassInfo DOMRect::info = { "Rect", 0, &DOMRectTable, 0 };
left DOMRect::Left DontDelete|ReadOnly
@end
*/
DOMRect::DOMRect(ExecState* exec, WebCore::RectImpl* r)
DOMRect::DOMRect(ExecState* exec, RectImpl* r)
: m_rect(r)
{
setPrototype(exec->lexicalInterpreter()->builtinObjectPrototype());
......
......@@ -107,13 +107,13 @@ KJS_IMPLEMENT_PROTOTYPE("DOMNode", DOMNodeProto, DOMNodeProtoFunc)
const ClassInfo DOMNode::info = { "Node", 0, &DOMNodeTable, 0 };
DOMNode::DOMNode(ExecState* exec, WebCore::Node* n)
DOMNode::DOMNode(ExecState* exec, Node* n)
: m_impl(n)
{
setPrototype(DOMNodeProto::self(exec));
}
DOMNode::DOMNode(WebCore::Node* n)
DOMNode::DOMNode(Node* n)
: m_impl(n)
{
}
......@@ -127,7 +127,7 @@ void DOMNode::mark()
{
assert(!marked());
WebCore::Node* node = m_impl.get();
Node* node = m_impl.get();
// Nodes in the document are kept alive by ScriptInterpreter::mark,
// so we have no special responsibilities and can just call the base class here.
......@@ -138,12 +138,12 @@ void DOMNode::mark()
// This is a node outside the document, so find the root of the tree it is in,
// and start marking from there.
WebCore::Node* root = node;
for (WebCore::Node* current = m_impl.get(); current; current = current->parentNode()) {
Node* root = node;
for (Node* current = m_impl.get(); current; current = current->parentNode()) {
root = current;
}
static HashSet<WebCore::Node*> markingRoots;
static HashSet<Node*> markingRoots;
// If we're already marking this tree, then we can simply mark this wrapper
// by calling the base class; our caller is iterating the tree.
......@@ -154,7 +154,7 @@ void DOMNode::mark()
// Mark the whole tree; use the global set of roots to avoid reentering.
markingRoots.add(root);
for (WebCore::Node* nodeToMark = root; nodeToMark; nodeToMark = nodeToMark->traverseNextNode()) {
for (Node* nodeToMark = root; nodeToMark; nodeToMark = nodeToMark->traverseNextNode()) {
DOMNode *wrapper = ScriptInterpreter::getDOMNodeForDocument(m_impl->document(), nodeToMark);
if (wrapper) {
if (!wrapper->marked())
......@@ -209,7 +209,7 @@ bool DOMNode::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName
JSValue* DOMNode::getValueProperty(ExecState* exec, int token) const
{
WebCore::Node& node = *m_impl;
Node& node = *m_impl;
switch (token) {
case NodeName:
return jsStringOrNull(node.nodeName());
......@@ -255,7 +255,7 @@ void DOMNode::put(ExecState* exec, const Identifier& propertyName, JSValue* valu
void DOMNode::putValueProperty(ExecState* exec, int token, JSValue* value, int /*attr*/)
{
DOMExceptionTranslator exception(exec);
WebCore::Node& node = *m_impl;
Node& node = *m_impl;
switch (token) {
case NodeValue:
node.setNodeValue(value->toString(exec), exception);
......@@ -289,7 +289,7 @@ JSValue* DOMNodeProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, co
if (!thisObj->inherits(&DOMNode::info))
return throwError(exec, TypeError);
DOMExceptionTranslator exception(exec);
WebCore::Node& node = *static_cast<DOMNode*>(thisObj)->impl();
Node& node = *static_cast<DOMNode*>(thisObj)->impl();
switch (id) {
case DOMNode::HasAttributes:
return jsBoolean(node.hasAttributes());
......@@ -343,7 +343,7 @@ EventTargetNode *toEventTargetNode(JSValue* val)
return static_cast<EventTargetNode*>(static_cast<DOMEventTargetNode*>(val)->impl());
}
WebCore::Node* toNode(JSValue* val)
Node* toNode(JSValue* val)
{
if (!val || !val->isObject(&DOMNode::info))
return 0;
......@@ -399,7 +399,7 @@ onunload DOMEventTargetNode::OnUnload DontDelete
@end
*/
DOMEventTargetNode::DOMEventTargetNode(ExecState* exec, WebCore::Node* n)
DOMEventTargetNode::DOMEventTargetNode(ExecState* exec, Node* n)
: JSNode(exec, n)
{
setPrototype(DOMEventTargetNodeProto::self(exec));
......@@ -646,7 +646,7 @@ void DOMEventTargetNode::setListener(ExecState* exec, const AtomicString &eventT
JSValue* DOMEventTargetNode::getListener(const AtomicString &eventType) const
{
WebCore::EventListener *listener = EventTargetNodeCast(impl())->getHTMLEventListener(eventType);
EventListener *listener = EventTargetNodeCast(impl())->getHTMLEventListener(eventType);
JSEventListener *jsListener = static_cast<JSEventListener*>(listener);
if (jsListener && jsListener->listenerObj())
return jsListener->listenerObj();
......@@ -710,7 +710,7 @@ KJS_IMPLEMENT_PROTOFUNC(DOMNodeListFunc)
const ClassInfo DOMNodeList::info = { "NodeList", 0, &DOMNodeListTable, 0 };
DOMNodeList::DOMNodeList(ExecState* exec, WebCore::NodeList *l)
DOMNodeList::DOMNodeList(ExecState* exec, NodeList *l)
: m_impl(l)
{
setPrototype(exec->lexicalInterpreter()->builtinObjectPrototype());
......@@ -791,7 +791,7 @@ JSValue* DOMNodeListFunc::callAsFunction(ExecState* exec, JSObject* thisObj, con
{
if (!thisObj->inherits(&KJS::DOMNodeList::info))
return throwError(exec, TypeError);
WebCore::NodeList &list = *static_cast<DOMNodeList*>(thisObj)->impl();
NodeList &list = *static_cast<DOMNodeList*>(thisObj)->impl();
if (id == DOMNodeList::Item)
return toJS(exec, list.item(args[0]->toInt32(exec)));
......@@ -940,7 +940,7 @@ JSValue* toJS(ExecState* exec, Document *n)
return ret;
if (n->isHTMLDocument())
ret = new WebCore::JSHTMLDocument(exec, static_cast<HTMLDocument*>(n));
ret = new JSHTMLDocument(exec, static_cast<HTMLDocument*>(n));
else
ret = new JSDocument(exec, n);
......@@ -954,7 +954,7 @@ JSValue* toJS(ExecState* exec, Document *n)
return ret;
}
bool checkNodeSecurity(ExecState* exec, WebCore::Node* n)
bool checkNodeSecurity(ExecState* exec, Node* n)
{
if (!n)
return false;
......@@ -964,9 +964,9 @@ bool checkNodeSecurity(ExecState* exec, WebCore::Node* n)
return win && win->isSafeScript(exec);
}
JSValue* toJS(ExecState* exec, PassRefPtr<WebCore::Node> node)
JSValue* toJS(ExecState* exec, PassRefPtr<Node> node)
{
WebCore::Node* n = node.get();
Node* n = node.get();
DOMNode* ret = 0;
if (!n)
return jsNull();
......@@ -977,45 +977,45 @@ JSValue* toJS(ExecState* exec, PassRefPtr<WebCore::Node> node)
return ret;
switch (n->nodeType()) {
case WebCore::Node::ELEMENT_NODE:
case Node::ELEMENT_NODE:
if (n->isHTMLElement())
ret = createJSHTMLWrapper(exec, static_pointer_cast<WebCore::HTMLElement>(node));
ret = createJSHTMLWrapper(exec, static_pointer_cast<HTMLElement>(node));
#if SVG_SUPPORT
else if (n->isSVGElement())
ret = createJSSVGWrapper(exec, static_pointer_cast<WebCore::SVGElement>(node));
ret = createJSSVGWrapper(exec, static_pointer_cast<SVGElement>(node));
#endif
else
ret = new JSElement(exec, static_cast<Element*>(n));
break;
case WebCore::Node::ATTRIBUTE_NODE:
case Node::ATTRIBUTE_NODE:
ret = new JSAttr(exec, static_cast<Attr*>(n));
break;
case WebCore::Node::TEXT_NODE:
case WebCore::Node::CDATA_SECTION_NODE:
case Node::TEXT_NODE:
case Node::CDATA_SECTION_NODE:
ret = new JSText(exec, static_cast<Text*>(n));
break;
case WebCore::Node::ENTITY_NODE:
case Node::ENTITY_NODE:
ret = new JSEntity(exec, static_cast<Entity*>(n));
break;
case WebCore::Node::PROCESSING_INSTRUCTION_NODE:
case Node::PROCESSING_INSTRUCTION_NODE:
ret = new JSProcessingInstruction(exec, static_cast<ProcessingInstruction*>(n));
break;
case WebCore::Node::COMMENT_NODE:
case Node::COMMENT_NODE:
ret = new JSCharacterData(exec, static_cast<CharacterData*>(n));
break;
case WebCore::Node::DOCUMENT_NODE:
case Node::DOCUMENT_NODE:
// we don't want to cache the document itself in the per-document dictionary
return toJS(exec, static_cast<Document*>(n));
case WebCore::Node::DOCUMENT_TYPE_NODE:
case Node::DOCUMENT_TYPE_NODE:
ret = new JSDocumentType(exec, static_cast<DocumentType*>(n));