Reviewed by Darin and Oliver.

        - change Document to hold onto Frame* instead of FrameView*

        This is an architectural cleanup and a prerequisite to fixing citibank login
        in an architecturally sound way.

        Some fixups for the page cache:

        * history/CachedPage.cpp:
        (WebCore::CachedPage::restore): Add an assert that the document's view
        matches the cached page's view - this needs to be true by the time this
        function is called.
        (WebCore::CachedPage::clear): Change assert to require frame matching, not
        view matching.
        * history/CachedPage.h:
        (WebCore::CachedPage::view): Add a way to get the view out.
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::begin): pass Frame, not FrameView, when creating document
        (WebCore::FrameLoader::open): restore view based on CachedPage, not Document.

        Remaining changes are just straightforward updates based on which
        pointer is held or passed:

        * dom/DOMImplementation.cpp:
        (WebCore::DOMImplementation::createDocument):
        (WebCore::DOMImplementation::createHTMLDocument):
        * dom/DOMImplementation.h:
        * dom/Document.cpp:
        (WebCore::Document::Document):
        (WebCore::Document::view):
        (WebCore::Document::frame):
        (WebCore::Document::recalcStyle):
        (WebCore::Document::updateLayout):
        (WebCore::Document::attach):
        (WebCore::Document::detach):
        (WebCore::Document::createTokenizer):
        (WebCore::Document::recalcStyleSelector):
        (WebCore::Document::setInPageCache):
        (WebCore::Document::applyXSLTransform):
        * dom/Document.h:
        * html/HTMLDocument.cpp:
        (WebCore::HTMLDocument::HTMLDocument):
        * html/HTMLDocument.h:
        * html/HTMLViewSourceDocument.cpp:
        (WebCore::HTMLViewSourceDocument::HTMLViewSourceDocument):
        * html/HTMLViewSourceDocument.h:
        * ksvg2/svg/SVGDocument.cpp:
        (WebCore::SVGDocument::SVGDocument):
        * ksvg2/svg/SVGDocument.h:
        * loader/ImageDocument.cpp:
        (WebCore::ImageDocument::ImageDocument):
        * loader/ImageDocument.h:
        * loader/PluginDocument.cpp:
        (WebCore::PluginDocument::PluginDocument):
        * loader/PluginDocument.h:
        * loader/TextDocument.cpp:
        (WebCore::TextDocument::TextDocument):
        * loader/TextDocument.h:
        * xml/XSLTProcessor.cpp:
        (WebCore::XSLTProcessor::createDocumentFromSource):
        (WebCore::XSLTProcessor::transformToDocument):
        * xml/XSLTProcessor.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8f7de0b346f37b7910201a1e297a1293bafa82f4..75bb7b6c852de209568acfe67ea2849f89a2104e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,69 @@
+2007-04-28  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin and Oliver.
+
+        - change Document to hold onto Frame* instead of FrameView*
+        
+        This is an architectural cleanup and a prerequisite to fixing citibank login
+        in an architecturally sound way.
+
+        Some fixups for the page cache:
+        
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::restore): Add an assert that the document's view
+        matches the cached page's view - this needs to be true by the time this
+        function is called.
+        (WebCore::CachedPage::clear): Change assert to require frame matching, not
+        view matching.
+        * history/CachedPage.h:
+        (WebCore::CachedPage::view): Add a way to get the view out.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::begin): pass Frame, not FrameView, when creating document
+        (WebCore::FrameLoader::open): restore view based on CachedPage, not Document. 
+
+        Remaining changes are just straightforward updates based on which
+        pointer is held or passed:
+        
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::createDocument):
+        (WebCore::DOMImplementation::createHTMLDocument):
+        * dom/DOMImplementation.h:
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::view):
+        (WebCore::Document::frame):
+        (WebCore::Document::recalcStyle):
+        (WebCore::Document::updateLayout):
+        (WebCore::Document::attach):
+        (WebCore::Document::detach):
+        (WebCore::Document::createTokenizer):
+        (WebCore::Document::recalcStyleSelector):
+        (WebCore::Document::setInPageCache):
+        (WebCore::Document::applyXSLTransform):
+        * dom/Document.h:
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::HTMLDocument):
+        * html/HTMLDocument.h:
+        * html/HTMLViewSourceDocument.cpp:
+        (WebCore::HTMLViewSourceDocument::HTMLViewSourceDocument):
+        * html/HTMLViewSourceDocument.h:
+        * ksvg2/svg/SVGDocument.cpp:
+        (WebCore::SVGDocument::SVGDocument):
+        * ksvg2/svg/SVGDocument.h:
+        * loader/ImageDocument.cpp:
+        (WebCore::ImageDocument::ImageDocument):
+        * loader/ImageDocument.h:
+        * loader/PluginDocument.cpp:
+        (WebCore::PluginDocument::PluginDocument):
+        * loader/PluginDocument.h:
+        * loader/TextDocument.cpp:
+        (WebCore::TextDocument::TextDocument):
+        * loader/TextDocument.h:
+        * xml/XSLTProcessor.cpp:
+        (WebCore::XSLTProcessor::createDocumentFromSource):
+        (WebCore::XSLTProcessor::transformToDocument):
+        * xml/XSLTProcessor.h:
+
 2007-04-28  Adele Peterson  <adele@apple.com>
 
         RS by Darin.

diff --git a/WebCore/dom/DOMImplementation.cpp b/WebCore/dom/DOMImplementation.cpp
index a6f87eec422ff52647aba7f884ff7a37b2dca227..7c59588c75cf1ce567f8d8832ebab998e9c71bb2 100644 (file)
--- a/WebCore/dom/DOMImplementation.cpp
+++ b/WebCore/dom/DOMImplementation.cpp
@@ -296,14 +296,14 @@ PassRefPtr<CSSStyleSheet> DOMImplementation::createCSSStyleSheet(const String&,
     return sheet.release();
 }
 
-PassRefPtr<Document> DOMImplementation::createDocument(FrameView* view)
+PassRefPtr<Document> DOMImplementation::createDocument(Frame* frame)
 {
-    return new Document(this, view);
+    return new Document(this, frame);
 }
 
-PassRefPtr<HTMLDocument> DOMImplementation::createHTMLDocument(FrameView* view)
+PassRefPtr<HTMLDocument> DOMImplementation::createHTMLDocument(Frame* frame)
 {
-    return new HTMLDocument(this, view);
+    return new HTMLDocument(this, frame);
 }
 
 DOMImplementation* DOMImplementation::instance()
@@ -341,38 +341,38 @@ PassRefPtr<HTMLDocument> DOMImplementation::createHTMLDocument(const String& tit
     return d.release();
 }
 
-PassRefPtr<Document> DOMImplementation::createDocument(const String& type, FrameView* view, bool inViewSourceMode)
+PassRefPtr<Document> DOMImplementation::createDocument(const String& type, Frame* frame, bool inViewSourceMode)
 {
     if (inViewSourceMode)
-        return new HTMLViewSourceDocument(this, view);
+        return new HTMLViewSourceDocument(this, frame);
 
     // Plugins cannot take HTML and XHTML from us, and we don't even need to initialize the plugin database for those.
     if (type == "text/html")
-        return new HTMLDocument(this, view);
+        return new HTMLDocument(this, frame);
     if (type == "application/xhtml+xml")
-        return new Document(this, view);
+        return new Document(this, frame);
 
     // PDF is one image type for which a plugin can override built-in support.
     // We do not want QuickTime to take over all image types, obviously.
     if ((type == "application/pdf" || type == "text/pdf") && PlugInInfoStore::supportsMIMEType(type))
-        return new PluginDocument(this, view);
+        return new PluginDocument(this, frame);
     if (Image::supportsType(type))
-        return new ImageDocument(this, view);
+        return new ImageDocument(this, frame);
 
     // Everything else can be overridden by plugins. In particular, Adobe SVG Viewer should be used for SVG, if installed.
     if (PlugInInfoStore::supportsMIMEType(type))
-        return new PluginDocument(this, view);
+        return new PluginDocument(this, frame);
 
 #if ENABLE(SVG)
     if (type == "image/svg+xml")
-        return new SVGDocument(this, view);
+        return new SVGDocument(this, frame);
 #endif
     if (isXMLMIMEType(type))
-        return new Document(this, view);
+        return new Document(this, frame);
     if (isTextMIMEType(type))
-        return new TextDocument(this, view);
+        return new TextDocument(this, frame);
 
-    return new HTMLDocument(this, view);
+    return new HTMLDocument(this, frame);
 }
 
 }

diff --git a/WebCore/dom/DOMImplementation.h b/WebCore/dom/DOMImplementation.h
index 77584b8a8af28b26e691a4e40559e0f68e21ea66..2b123f131a5d4353ff5c2c4147dd57a8430acbd2 100644 (file)
--- a/WebCore/dom/DOMImplementation.h
+++ b/WebCore/dom/DOMImplementation.h
@@ -34,7 +34,7 @@ namespace WebCore {
 class CSSStyleSheet;
 class Document;
 class DocumentType;
-class FrameView;
+class Frame;
 class HTMLDocument;
 class String;
 
@@ -58,9 +58,9 @@ public:
     PassRefPtr<HTMLDocument> createHTMLDocument(const String& title);
 
     // Other methods (not part of DOM)
-    PassRefPtr<Document> createDocument(const String& MIMEType, FrameView*, bool inViewSourceMode);
-    PassRefPtr<Document> createDocument(FrameView*);
-    PassRefPtr<HTMLDocument> createHTMLDocument(FrameView*);
+    PassRefPtr<Document> createDocument(const String& MIMEType, Frame*, bool inViewSourceMode);
+    PassRefPtr<Document> createDocument(Frame*);
+    PassRefPtr<HTMLDocument> createHTMLDocument(Frame*);
 
     // Returns the static instance of this class - only one instance of this class should
     // ever be present, and is used as a factory method for creating Document objects

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 71d6b523a81717d57f42d843aca7dab8c9738136..d3e11e9350d7d35f254cc6e40f0537cfb674e7da 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -268,7 +268,7 @@ static void clearSelectionIfNeeded(Frame* frame, Node* newFocusedNode)
 DeprecatedPtrList<Document>*  Document::changedDocuments = 0;
 
 // FrameView might be 0
-Document::Document(DOMImplementation* impl, FrameView *v)
+Document::Document(DOMImplementation* impl, Frame* frame)
     : ContainerNode(0)
     , m_implementation(impl)
     , m_domtree_version(0)
@@ -306,12 +306,13 @@ Document::Document(DOMImplementation* impl, FrameView *v)
 
     m_printing = false;
 
-    m_view = v;
+    m_frame = frame;
     m_renderArena = 0;
 
     m_axObjectCache = 0;
     
-    m_docLoader = new DocLoader(v ? v->frame() : 0, this);
+    // FIXME: DocLoader probably no longer needs the frame argument
+    m_docLoader = new DocLoader(frame, this);
 
     visuallyOrdered = false;
     m_bParsing = false;
@@ -909,12 +910,12 @@ Node::NodeType Document::nodeType() const
 
 FrameView* Document::view() const
 {
-    return m_view;
+    return m_frame ? m_frame->view() : 0;
 }
 
 Frame* Document::frame() const 
 {
-    return m_view ? m_view->frame() : 0; 
+    return m_frame; 
 }
 
 Page* Document::page() const
@@ -991,8 +992,8 @@ void Document::recalcStyle(StyleChange change)
 
         FontDescription fontDescription;
         fontDescription.setUsePrinterFont(printing());
-        if (m_view) {
-            const Settings *settings = m_view->frame()->settings();
+        if (Frame* f = frame()) {
+            const Settings *settings = f->settings();
             if (printing() && !settings->shouldPrintBackgrounds())
                 _style->setForceBackgroundsToWhite(true);
             const AtomicString& stdfont = settings->standardFontFamily();
@@ -1024,8 +1025,8 @@ void Document::recalcStyle(StyleChange change)
         if (change >= Inherit || n->hasChangedChild() || n->changed())
             n->recalcStyle(change);
 
-    if (changed() && m_view)
-        m_view->layout();
+    if (changed() && view())
+        view()->layout();
 
 bail_out:
     setChanged(false);
@@ -1067,8 +1068,9 @@ void Document::updateLayout()
     updateRendering();
 
     // Only do a layout if changes have occurred that make it necessary.      
-    if (m_view && renderer() && (m_view->layoutPending() || renderer()->needsLayout()))
-        m_view->layout();
+    FrameView* v = view();
+    if (v && renderer() && (v->layoutPending() || renderer()->needsLayout()))
+        v->layout();
 }
 
 // FIXME: This is a bad idea and needs to be removed eventually.
@@ -1108,7 +1110,7 @@ void Document::attach()
         m_renderArena = new RenderArena();
     
     // Create the rendering tree
-    setRenderer(new (m_renderArena) RenderView(this, m_view));
+    setRenderer(new (m_renderArena) RenderView(this, view()));
 
     recalcStyle(Force);
 
@@ -1148,7 +1150,8 @@ void Document::detach()
     if (render)
         render->destroy();
 
-    m_view = 0;
+    // FIXME: is this needed or desirable?
+    m_frame = 0;
     
     if (m_renderArena) {
         delete m_renderArena;
@@ -1264,7 +1267,8 @@ void Document::updateSelection()
 
 Tokenizer* Document::createTokenizer()
 {
-    return new XMLTokenizer(this, m_view);
+    // FIXME: this should probably pass the frame instead
+    return new XMLTokenizer(this, view());
 }
 
 void Document::open()
@@ -2089,7 +2093,7 @@ void Document::recalcStyleSelector()
     // Create a new style selector
     delete m_styleSelector;
     String usersheet = m_usersheet;
-    if (m_view && m_view->mediaType() == "print")
+    if (view() && view()->mediaType() == "print")
         usersheet += m_printSheet;
     m_styleSelector = new CSSStyleSelector(this, usersheet, m_styleSheets.get(), !inCompatMode());
     m_styleSelector->setEncodedURL(m_url);
@@ -2673,8 +2677,8 @@ void Document::setInPageCache(bool flag)
     if (flag) {
         ASSERT(m_savedRenderer == 0);
         m_savedRenderer = renderer();
-        if (m_view)
-            m_view->resetScrollbars();
+        if (FrameView* v = view())
+            v->resetScrollbars();
     } else {
         ASSERT(renderer() == 0 || renderer() == m_savedRenderer);
         ASSERT(m_renderArena);
@@ -3207,7 +3211,7 @@ void Document::applyXSLTransform(ProcessingInstruction* pi)
     if (!processor->transformToString(this, resultMIMEType, newSource, resultEncoding))
         return;
     // FIXME: If the transform failed we should probably report an error (like Mozilla does).
-    processor->createDocumentFromSource(newSource, resultEncoding, resultMIMEType, this, view());
+    processor->createDocumentFromSource(newSource, resultEncoding, resultMIMEType, this, frame());
 }
 
 #endif

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 0a39ef26e16e3df8d20c39d36edfea3197930369..90a51b4869676ac80fb2c6c9291b5dd8a0461435 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -133,7 +133,7 @@ struct FormElementKeyHashTraits : WTF::GenericHashTraits<FormElementKey> {
 
 class Document : public ContainerNode {
 public:
-    Document(DOMImplementation*, FrameView*);
+    Document(DOMImplementation*, Frame*);
     ~Document();
 
     virtual void removedLastRef();
@@ -642,7 +642,7 @@ public:
 
 protected:
     CSSStyleSelector* m_styleSelector;
-    FrameView* m_view;
+    Frame* m_frame;
 
     DocLoader* m_docLoader;
     Tokenizer* m_tokenizer;

diff --git a/WebCore/history/CachedPage.cpp b/WebCore/history/CachedPage.cpp
index 82619189fff9e9064aa4a2039dae9fac960ff3d9..3e32859085bd50125f26837f911112fc07a112bd 100644 (file)
--- a/WebCore/history/CachedPage.cpp
+++ b/WebCore/history/CachedPage.cpp
@@ -95,6 +95,8 @@ CachedPage::~CachedPage()
 
 void CachedPage::restore(Page* page)
 {
+    ASSERT(m_document->view() == m_view);
+
     Frame* mainFrame = page->mainFrame();
     KJSProxy* proxy = mainFrame->scriptProxy();
     Window* window = Window::retrieveWindow(mainFrame);
@@ -130,7 +132,7 @@ void CachedPage::clear()
         return;
 
     ASSERT(m_view);
-    ASSERT(m_document->view() == m_view);
+    ASSERT(m_document->frame() == m_view->frame());
 
     if (m_document->inPageCache()) {
         Frame::clearTimers(m_view.get());

diff --git a/WebCore/history/CachedPage.h b/WebCore/history/CachedPage.h
index 4706f3eb8fb74203982d1b4e858f47fe723592a4..2c730299d97ec11c97fab04d5ff53463e5bf623d 100644 (file)
--- a/WebCore/history/CachedPage.h
+++ b/WebCore/history/CachedPage.h
@@ -58,6 +58,7 @@ public:
     
     void clear();
     Document* document() const { return m_document.get(); }
+    FrameView* view() const { return m_view.get(); }
     Node* mousePressNode() const { return m_mousePressNode.get(); }
     const KURL& URL() const { return m_URL; }
     void restore(Page*);

diff --git a/WebCore/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp
index dd351892af9fbdcda3378c507466b8e9a5350b88..7612b697f84e6eaed4d4689ee9fdb7ad8220c25b 100644 (file)
--- a/WebCore/html/HTMLDocument.cpp
+++ b/WebCore/html/HTMLDocument.cpp
@@ -74,8 +74,8 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-HTMLDocument::HTMLDocument(DOMImplementation* implementation, FrameView* view)
-    : Document(implementation, view)
+HTMLDocument::HTMLDocument(DOMImplementation* implementation, Frame* frame)
+    : Document(implementation, frame)
 {
     m_xmlVersion = String();
 }

diff --git a/WebCore/html/HTMLDocument.h b/WebCore/html/HTMLDocument.h
index 33f7a860efffe6d8a6aa2ad98b313b42519c05cf..08c7342c72fbf607a76c7f3f5166796d0b0c94c3 100644 (file)
--- a/WebCore/html/HTMLDocument.h
+++ b/WebCore/html/HTMLDocument.h
@@ -33,7 +33,7 @@ class HTMLElement;
 
 class HTMLDocument : public Document, public CachedResourceClient {
 public:
-    HTMLDocument(DOMImplementation*, FrameView* = 0);
+    HTMLDocument(DOMImplementation*, Frame*);
     virtual ~HTMLDocument();
 
     virtual bool isHTMLDocument() const { return true; }

diff --git a/WebCore/html/HTMLViewSourceDocument.cpp b/WebCore/html/HTMLViewSourceDocument.cpp
index ba282e7d4ab28d56a52868109fcee26548aaa1c7..4610a9857586e2f1eb224308ac24091108110326 100644 (file)
--- a/WebCore/html/HTMLViewSourceDocument.cpp
+++ b/WebCore/html/HTMLViewSourceDocument.cpp
@@ -36,8 +36,9 @@ namespace WebCore
 
 using namespace HTMLNames;
 
-HTMLViewSourceDocument::HTMLViewSourceDocument(DOMImplementation* implementation, FrameView* v)
-    : HTMLDocument(implementation, v), m_current(0)
+HTMLViewSourceDocument::HTMLViewSourceDocument(DOMImplementation* implementation, Frame* frame)
+    : HTMLDocument(implementation, frame)
+    , m_current(0)
 {
 }
 

diff --git a/WebCore/html/HTMLViewSourceDocument.h b/WebCore/html/HTMLViewSourceDocument.h
index 96184339bce145cdf44e52b75d0ccff8922227f0..e03013cbd1d10f0370a403171871796bee8334a6 100644 (file)
--- a/WebCore/html/HTMLViewSourceDocument.h
+++ b/WebCore/html/HTMLViewSourceDocument.h
@@ -28,15 +28,12 @@
 
 namespace WebCore {
 
-class DOMImplementation;
-class FrameView;
 class Token;
-class Attribute;
 
 class HTMLViewSourceDocument : public HTMLDocument
 {
 public:
-    HTMLViewSourceDocument(DOMImplementation*, FrameView* = 0);
+    HTMLViewSourceDocument(DOMImplementation*, Frame*);
     
     virtual Tokenizer* createTokenizer();
     

diff --git a/WebCore/ksvg2/svg/SVGDocument.cpp b/WebCore/ksvg2/svg/SVGDocument.cpp
index 77875b6b6188c408446b785a81ae64a509ccb0ba..4ee8e393e8f8de901ac78d4a9f9cacffa0edd49d 100644 (file)
--- a/WebCore/ksvg2/svg/SVGDocument.cpp
+++ b/WebCore/ksvg2/svg/SVGDocument.cpp
@@ -33,8 +33,8 @@
 
 namespace WebCore {
 
-SVGDocument::SVGDocument(DOMImplementation* i, FrameView* view)
-    : Document(i, view)
+SVGDocument::SVGDocument(DOMImplementation* i, Frame* frame)
+    : Document(i, frame)
 {
 }
 

diff --git a/WebCore/ksvg2/svg/SVGDocument.h b/WebCore/ksvg2/svg/SVGDocument.h
index 4b81156debfd58257159d4ceaa352a7eb9672181..1f70a2eff37b2644699c9fd28d280da1995e25f3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGDocument.h
+++ b/WebCore/ksvg2/svg/SVGDocument.h
@@ -34,7 +34,7 @@ namespace WebCore {
 
     class SVGDocument : public Document {
     public:
-        SVGDocument(DOMImplementation*, FrameView*);
+        SVGDocument(DOMImplementation*, Frame*);
         virtual ~SVGDocument();
         
         virtual bool isSVGDocument() const { return true; }

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 4aec0f0f82ca096f3093bb7cede060fc7ef3bcf4..4928758c51448e2f91e5c1f595bc72808ebb5255 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -838,8 +838,7 @@ void FrameLoader::begin(const KURL& url)
     if (!m_URL.isEmpty())
         baseurl = m_URL;
 
-    RefPtr<Document> document = DOMImplementation::instance()->
-        createDocument(m_responseMIMEType, m_frame->view(), m_frame->inViewSourceMode());
+    RefPtr<Document> document = DOMImplementation::instance()->createDocument(m_responseMIMEType, m_frame, m_frame->inViewSourceMode());
     m_frame->setDocument(document.get());
 
     document->setURL(m_URL.url());
@@ -2554,7 +2553,7 @@ void FrameLoader::open(CachedPage& cachedPage)
     m_wasLoadEventEmitted = false;
     m_outgoingReferrer = URL.url();
     
-    m_frame->setView(document->view());
+    m_frame->setView(cachedPage.view());
     
     m_frame->setDocument(document);
     m_decoder = document->decoder();

diff --git a/WebCore/loader/ImageDocument.cpp b/WebCore/loader/ImageDocument.cpp
index d1c59f237277552b4feeb567bf68e8728463845f..7683a9f102f14c64654e4ff227895d01637bdcb6 100644 (file)
--- a/WebCore/loader/ImageDocument.cpp
+++ b/WebCore/loader/ImageDocument.cpp
@@ -124,8 +124,8 @@ bool ImageTokenizer::isWaitingForScripts() const
     return false;
 }
     
-ImageDocument::ImageDocument(DOMImplementation *_implementation, FrameView *v)
-    : HTMLDocument(_implementation, v)
+ImageDocument::ImageDocument(DOMImplementation* implementation, Frame* frame)
+    : HTMLDocument(implementation, frame)
 {
 }
     

diff --git a/WebCore/loader/ImageDocument.h b/WebCore/loader/ImageDocument.h
index 753120514e6e7038520bc73c0e03875e13845a33..3f5903551a00d852fea7d94e4cd5650bb270c3a4 100644 (file)
--- a/WebCore/loader/ImageDocument.h
+++ b/WebCore/loader/ImageDocument.h
@@ -34,7 +34,7 @@ class FrameView;
 class ImageDocument : public HTMLDocument
 {
 public:
-    ImageDocument(DOMImplementation*, FrameView* = 0);
+    ImageDocument(DOMImplementation*, Frame*);
 
     virtual bool isImageDocument() const { return true; }
     

diff --git a/WebCore/loader/PluginDocument.cpp b/WebCore/loader/PluginDocument.cpp
index eb481e13aa6be109cd72dd68b7c03ee8221c8f00..894f8f081b0426428058c9920c5f3c2a61cfb5a2 100644 (file)
--- a/WebCore/loader/PluginDocument.cpp
+++ b/WebCore/loader/PluginDocument.cpp
@@ -127,8 +127,8 @@ bool PluginTokenizer::isWaitingForScripts() const
     return false;
 }
     
-PluginDocument::PluginDocument(DOMImplementation* _implementation, FrameView* v)
-    : HTMLDocument(_implementation, v)
+PluginDocument::PluginDocument(DOMImplementation* implementation, Frame* frame)
+    : HTMLDocument(implementation, frame)
 {
     setParseMode(Compat);
 }

diff --git a/WebCore/loader/PluginDocument.h b/WebCore/loader/PluginDocument.h
index 9084c329970a2951519aff2f1f8d173d8013374d..9e62753d1efa31cdeff40ce9b72bb8ad97807ff7 100644 (file)
--- a/WebCore/loader/PluginDocument.h
+++ b/WebCore/loader/PluginDocument.h
@@ -34,7 +34,7 @@ class FrameView;
 class PluginDocument : public HTMLDocument
 {
 public:
-    PluginDocument(DOMImplementation*, FrameView* = 0);
+    PluginDocument(DOMImplementation*, Frame*);
 
     virtual bool isPluginDocument() const { return true; }
         

diff --git a/WebCore/loader/TextDocument.cpp b/WebCore/loader/TextDocument.cpp
index 34320209d18247910501ae44246dc10fc98a4a07..608c7fd40b198e956b6fc713f6810366de805dc4 100644 (file)
--- a/WebCore/loader/TextDocument.cpp
+++ b/WebCore/loader/TextDocument.cpp
@@ -151,8 +151,8 @@ bool TextTokenizer::isWaitingForScripts() const
     return false;
 }
 
-TextDocument::TextDocument(DOMImplementation* implementation, FrameView* v)
-    : HTMLDocument(implementation, v)
+TextDocument::TextDocument(DOMImplementation* implementation, Frame* frame)
+    : HTMLDocument(implementation, frame)
 {
 }
 

diff --git a/WebCore/loader/TextDocument.h b/WebCore/loader/TextDocument.h
index ccbc777eed0ac34baea9a93f54b10394815e0051..3d5c9c0a749f49db1c9628a8e6aa247cdb02071d 100644 (file)
--- a/WebCore/loader/TextDocument.h
+++ b/WebCore/loader/TextDocument.h
@@ -34,7 +34,7 @@ class FrameView;
 class TextDocument : public HTMLDocument
 {
 public:
-    TextDocument(DOMImplementation*, FrameView* = 0);
+    TextDocument(DOMImplementation*, Frame*);
     
     virtual Tokenizer* createTokenizer();
 };

diff --git a/WebCore/xml/XSLTProcessor.cpp b/WebCore/xml/XSLTProcessor.cpp
index 5f654f9cfd5fe86330e37fb34fdffb56fc3057d5..ddbd69c8cc58f3bb3470367b5ce254364261305d 100644 (file)
--- a/WebCore/xml/XSLTProcessor.cpp
+++ b/WebCore/xml/XSLTProcessor.cpp
@@ -191,27 +191,26 @@ static void freeXsltParamArray(const char **params)
 
 
 RefPtr<Document> XSLTProcessor::createDocumentFromSource(const DeprecatedString& sourceString,
-    const DeprecatedString& sourceEncoding, const DeprecatedString& sourceMIMEType, Node* sourceNode, FrameView* view)
+    const DeprecatedString& sourceEncoding, const DeprecatedString& sourceMIMEType, Node* sourceNode, Frame* frame)
 {
     RefPtr<Document> ownerDocument = sourceNode->document();
     bool sourceIsDocument = (sourceNode == ownerDocument.get());
     String documentSource = sourceString;
 
     RefPtr<Document> result;
-    if (sourceMIMEType == "text/html")
-        result = ownerDocument->implementation()->createHTMLDocument(view);
-    else {
-        result = ownerDocument->implementation()->createDocument(view);
-        if (sourceMIMEType == "text/plain")
-            transformTextStringToXHTMLDocumentString(documentSource);
-    }
+    if (sourceMIMEType == "text/plain") {
+        result = ownerDocument->implementation()->createDocument(frame);
+        transformTextStringToXHTMLDocumentString(documentSource);
+    } else
+        result = ownerDocument->implementation()->createDocument(sourceMIMEType, frame, false);
     
     // Before parsing, we need to save & detach the old document and get the new document
     // in place. We have to do this only if we're rendering the result document.
-    if (view) {
-        view->clear();
-        result->setTransformSourceDocument(view->frame()->document());
-        view->frame()->setDocument(result.get());
+    if (frame) {
+        if (FrameView* view = frame->view())
+            view->clear();
+        result->setTransformSourceDocument(frame->document());
+        frame->setDocument(result.get());
     }
     
     result->open();
@@ -227,8 +226,8 @@ RefPtr<Document> XSLTProcessor::createDocumentFromSource(const DeprecatedString&
     
     result->write(documentSource);
     result->finishParsing();
-    if (view)
-        view->frame()->loader()->checkCompleted();
+    if (frame)
+        frame->loader()->checkCompleted();
     else
         result->close(); // FIXME: Even viewless docs can load subresources. onload will fire too early.
                          // This is probably a bug in XMLHttpRequestObjects as well.
@@ -363,7 +362,7 @@ RefPtr<Document> XSLTProcessor::transformToDocument(Node *sourceNode)
     DeprecatedString resultEncoding;
     if (!transformToString(sourceNode, resultMIMEType, resultString, resultEncoding))
         return 0;
-    return createDocumentFromSource(resultString, resultEncoding, resultMIMEType, sourceNode);
+    return createDocumentFromSource(resultString, resultEncoding, resultMIMEType, sourceNode, 0);
 }
 
 RefPtr<DocumentFragment> XSLTProcessor::transformToFragment(Node* sourceNode, Document* outputDoc)

diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h
index 888e25bd869373ef0216c49656a3614790a8ffdb..635cd73ee974395f141b4ac220141bf607e06ce7 100644 (file)
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -33,7 +33,7 @@
 
 namespace WebCore {
 
-class FrameView;
+class Frame;
 class Node;
 class Document;
 class DocumentFragment;
@@ -43,7 +43,7 @@ class XSLTProcessor : public Shared<XSLTProcessor>
 public:
     void setXSLStylesheet(XSLStyleSheet *styleSheet) { m_stylesheet = styleSheet; }
     bool transformToString(Node *source, DeprecatedString &resultMIMEType, DeprecatedString &resultString, DeprecatedString &resultEncoding);
-    RefPtr<Document> createDocumentFromSource(const DeprecatedString &source, const DeprecatedString &sourceEncoding, const DeprecatedString &sourceMIMEType, Node *sourceNode, FrameView *view = 0);
+    RefPtr<Document> createDocumentFromSource(const DeprecatedString& source, const DeprecatedString& sourceEncoding, const DeprecatedString& sourceMIMEType, Node* sourceNode, Frame* frame);
     
     // DOM methods
     void importStylesheet(Node *style) { m_stylesheetRootNode = style; }