2007-12-16 Grace Kloba <klobag@gmail.com>

        Reviewed by Darin Adler.

        Fix http://bugs.webkit.org/show_bug.cgi?id=16433.
        Bug 16433: LOW_BANDWIDTH_DISPLAY build is broken

        * dom/Document.cpp:
        (WebCore::Document::Document):
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::addLowBandwidthDisplayRequest):
        (WebCore::FrameLoader::switchOutLowBandwidthDisplayIfReady):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index acf6cc875b92309bdc5e0d332cfd0f92019ba6ec..8352c8f657b87e5b17b997714b9a53a7214bc472 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-16  Grace Kloba  <klobag@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=16433.
+        Bug 16433: LOW_BANDWIDTH_DISPLAY build is broken
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::addLowBandwidthDisplayRequest):
+        (WebCore::FrameLoader::switchOutLowBandwidthDisplayIfReady):
+
 2007-12-16  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Darin.

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index ec237154a61fe873e56590f314975fd14afe6445..d31ef1c91bd53e68bf88ff7cd982e52979d401ac 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -280,11 +280,11 @@ Document::Document(DOMImplementation* impl, Frame* frame, bool isXHTML)
     , m_inPageCache(false)
     , m_isAllowedToLoadLocalResources(false)
     , m_useSecureKeyboardEntryWhenActive(false)
+    , m_isXHTML(isXHTML)
+    , m_numNodeLists(0)
 #if USE(LOW_BANDWIDTH_DISPLAY)
     , m_inLowBandwidthDisplay(false)
 #endif
-    , m_isXHTML(isXHTML)
-    , m_numNodeLists(0)
 {
     m_document.resetSkippingRef(this);
 

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 5711cfeb058155f9f317e83f1e4d3393461339dd..5e76a57fa4eb0952c94cb162571324a6fa39a647 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -4723,6 +4723,7 @@ bool FrameLoader::addLowBandwidthDisplayRequest(CachedResource* cache)
             cache->ref(this);
             return true;
         case CachedResource::ImageResource:
+        case CachedResource::FontResource:
 #if ENABLE(XSLT)
         case CachedResource::XSLStyleSheet:
 #endif
@@ -4780,14 +4781,14 @@ void FrameLoader::switchOutLowBandwidthDisplayIfReady()
             
             // similar to begin(), should be refactored to share more code
             RefPtr<Document> newDoc = DOMImplementation::instance()->
-                createDocument(m_responseMIMEType, m_frame->view(), m_frame->inViewSourceMode());
+                createDocument(m_responseMIMEType, m_frame, m_frame->inViewSourceMode());
             m_frame->setDocument(newDoc);
             newDoc->setURL(m_URL.url());
             newDoc->setBaseURL(m_URL.url());
             if (m_decoder)
                 newDoc->setDecoder(m_decoder.get());
             restoreDocumentState();
-            partClearedInBegin();         
+            dispatchWindowObjectAvailable();         
             newDoc->implicitOpen();
 
             // swap DocLoader ownership