Changeset 73392 in webkit


Ignore:
Timestamp:
Dec 6, 2010 1:11:20 PM (13 years ago)
Author:
Nate Chapin
Message:

2010-12-06 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Make DocumentWriter a member of DocumentLoader
instead of FrameLoader.
​https://bugs.webkit.org/show_bug.cgi?id=50489

Refactor, no new tests.

  • bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::executeIfJavaScriptURL):
  • dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::close): (WebCore::Document::lastModified): (WebCore::Document::finishedParsing): (WebCore::Document::initSecurityContext): (WebCore::Document::updateURLForPushOrReplaceState):
  • dom/Document.h: (WebCore::Document::setDocumentLoader): (WebCore::Document::loader):
  • dom/ProcessingInstruction.cpp: (WebCore::ProcessingInstruction::checkStyleSheet):
  • dom/ScriptElement.cpp: (WebCore::ScriptElement::scriptCharset):
  • html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::process):
  • html/MediaDocument.cpp: (WebCore::MediaDocument::replaceMediaElementTimerFired):
  • html/PluginDocument.cpp: (WebCore::PluginDocumentParser::createDocumentStructure):
  • loader/DocumentLoader.cpp: (WebCore::DocumentLoader::DocumentLoader): (WebCore::DocumentLoader::finishedLoading): (WebCore::DocumentLoader::commitData): (WebCore::DocumentLoader::setupForReplaceByMIMEType): (WebCore::DocumentLoader::setFrame):
  • loader/DocumentLoader.h: (WebCore::DocumentLoader::writer):
  • loader/DocumentWriter.h: (WebCore::DocumentWriter::setFrame):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::FrameLoader): (WebCore::FrameLoader::init): (WebCore::FrameLoader::clear): (WebCore::FrameLoader::receivedFirstData): (WebCore::FrameLoader::transitionToCommitted): (WebCore::FrameLoader::open): (WebCore::FrameLoader::finishedLoadingDocument): (WebCore::FrameLoader::addExtraFieldsToRequest):
  • loader/FrameLoader.h: (WebCore::FrameLoader::notifier):
  • loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::requestPreload):
  • platform/network/FormDataBuilder.cpp: (WebCore::FormDataBuilder::encodingFromAcceptCharset):
  • svg/graphics/SVGImage.cpp: (WebCore::SVGImage::dataChanged):
Location:
trunk
Files:
37 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r73390 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Make DocumentWriter a member of DocumentLoader
     6        instead of FrameLoader.
     7        https://bugs.webkit.org/show_bug.cgi?id=50489
     8
     9        Refactor, no new tests.
     10
     11        * bindings/ScriptControllerBase.cpp:
     12        (WebCore::ScriptController::executeIfJavaScriptURL):
     13        * dom/Document.cpp:
     14        (WebCore::Document::Document):
     15        (WebCore::Document::close):
     16        (WebCore::Document::lastModified):
     17        (WebCore::Document::finishedParsing):
     18        (WebCore::Document::initSecurityContext):
     19        (WebCore::Document::updateURLForPushOrReplaceState):
     20        * dom/Document.h:
     21        (WebCore::Document::setDocumentLoader):
     22        (WebCore::Document::loader):
     23        * dom/ProcessingInstruction.cpp:
     24        (WebCore::ProcessingInstruction::checkStyleSheet):
     25        * dom/ScriptElement.cpp:
     26        (WebCore::ScriptElement::scriptCharset):
     27        * html/HTMLLinkElement.cpp:
     28        (WebCore::HTMLLinkElement::process):
     29        * html/MediaDocument.cpp:
     30        (WebCore::MediaDocument::replaceMediaElementTimerFired):
     31        * html/PluginDocument.cpp:
     32        (WebCore::PluginDocumentParser::createDocumentStructure):
     33        * loader/DocumentLoader.cpp:
     34        (WebCore::DocumentLoader::DocumentLoader):
     35        (WebCore::DocumentLoader::finishedLoading):
     36        (WebCore::DocumentLoader::commitData):
     37        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
     38        (WebCore::DocumentLoader::setFrame):
     39        * loader/DocumentLoader.h:
     40        (WebCore::DocumentLoader::writer):
     41        * loader/DocumentWriter.h:
     42        (WebCore::DocumentWriter::setFrame):
     43        * loader/FrameLoader.cpp:
     44        (WebCore::FrameLoader::FrameLoader):
     45        (WebCore::FrameLoader::init):
     46        (WebCore::FrameLoader::clear):
     47        (WebCore::FrameLoader::receivedFirstData):
     48        (WebCore::FrameLoader::transitionToCommitted):
     49        (WebCore::FrameLoader::open):
     50        (WebCore::FrameLoader::finishedLoadingDocument):
     51        (WebCore::FrameLoader::addExtraFieldsToRequest):
     52        * loader/FrameLoader.h:
     53        (WebCore::FrameLoader::notifier):
     54        * loader/cache/CachedResourceLoader.cpp:
     55        (WebCore::CachedResourceLoader::requestPreload):
     56        * platform/network/FormDataBuilder.cpp:
     57        (WebCore::FormDataBuilder::encodingFromAcceptCharset):
     58        * svg/graphics/SVGImage.cpp:
     59        (WebCore::SVGImage::dataChanged):
     60
    1612010-12-06  Mark Rowe  <mrowe@apple.com>
    262

  • trunk/WebCore/bindings/ScriptControllerBase.cpp

    r69990 r73392  
    113113    //        http://bugs.webkit.org/show_bug.cgi?id=16782
    114114    if (shouldReplaceDocumentIfJavaScriptURL == ReplaceDocumentIfJavaScriptURL)
    115         m_frame->loader()->writer()->replaceDocument(scriptResult);
     115        m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
    116116
    117117    return true;

  • trunk/WebCore/dom/Document.cpp

    r72969 r73392  
    428428
    429429    m_frame = frame;
     430    m_documentLoader = frame ? frame->loader()->activeDocumentLoader() : 0;
    430431
    431432    if (frame || !url.isEmpty())
    … …  
    20542055    if (frame) {
    20552056        // This code calls implicitClose() if all loading has completed.
    2056         FrameLoader* frameLoader = frame->loader();
    2057         frameLoader->writer()->endIfNotLoadingMainResource();
    2058         frameLoader->checkCompleted();
     2057        loader()->writer()->endIfNotLoadingMainResource();
     2058        frame->loader()->checkCompleted();
    20592059    } else {
    20602060        // Because we have no frame, we don't know if all loading has completed,
    … …  
    37133713    bool foundDate = false;
    37143714    if (m_frame) {
    3715         String httpLastModified = m_frame->loader()->documentLoader()->response().httpHeaderField("Last-Modified");
     3715        String httpLastModified = m_documentLoader->response().httpHeaderField("Last-Modified");
    37163716        if (!httpLastModified.isEmpty()) {
    37173717            date.setMillisecondsSinceEpochForDateTime(parseDate(httpLastModified));
    … …  
    42314231
    42324232        if (InspectorController* controller = page()->inspectorController())
    4233             controller->mainResourceFiredDOMContentEvent(f->loader()->documentLoader(), url());
     4233            controller->mainResourceFiredDOMContentEvent(m_documentLoader, url());
    42344234#endif
    42354235    }
    … …  
    44454445        // and https://bugs.webkit.org/show_bug.cgi?id=19760 for further
    44464446        // discussion.
    4447         DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
    4448         if (documentLoader && documentLoader->substituteData().isValid())
     4447        if (m_documentLoader->substituteData().isValid())
    44494448            securityOrigin()->grantLoadLocalResources();
    44504449    }
    … …  
    45264525    setURL(url);
    45274526    f->loader()->setURL(url);
    4528     f->loader()->documentLoader()->replaceRequestURLForSameDocumentNavigation(url);
     4527    m_documentLoader->replaceRequestURLForSameDocumentNavigation(url);
    45294528}
    45304529

  • trunk/WebCore/dom/Document.h

    r72552 r73392  
    3434#include "Color.h"
    3535#include "ContainerNode.h"
     36#include "DocumentLoader.h"
    3637#include "DocumentMarkerController.h"
    3738#include "DocumentTiming.h"
    … …  
    5657class CDATASection;
    5758class CachedCSSStyleSheet;
     59class CachedResourceLoader;
    5860class CachedScript;
    5961class CanvasRenderingContext;
    … …  
    6870class DOMWindow;
    6971class DatabaseThread;
    70 class CachedResourceLoader;
    7172class DocumentFragment;
    7273class DocumentType;
    … …  
    549550    void setVisuallyOrdered();
    550551    bool visuallyOrdered() const { return m_visuallyOrdered; }
     552   
     553    void setDocumentLoader(DocumentLoader* documentLoader) { m_documentLoader = documentLoader; }
     554    DocumentLoader* loader() const { return m_documentLoader; }
    551555
    552556    void open(Document* ownerDocument = 0);
    … …  
    11371141
    11381142    Frame* m_frame;
     1143    DocumentLoader* m_documentLoader;
    11391144    OwnPtr<CachedResourceLoader> m_cachedResourceLoader;
    11401145    RefPtr<DocumentParser> m_parser;

  • trunk/WebCore/dom/ProcessingInstruction.cpp

    r72315 r73392  
    169169                String charset = attrs.get("charset");
    170170                if (charset.isEmpty())
    171                     charset = document()->frame()->loader()->writer()->encoding();
     171                    charset = document()->loader()->writer()->encoding();
    172172
    173173                m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet(url, charset);

  • trunk/WebCore/dom/ScriptElement.cpp

    r72995 r73392  
    293293    // If charset has not been declared in script tag, fall back to frame encoding.
    294294    if (charset.isEmpty()) {
    295         if (Frame* frame = m_element->document()->frame())
    296             charset = frame->loader()->writer()->encoding();
     295        if (DocumentLoader* loader = m_element->document()->loader())
     296            charset = loader->writer()->encoding();
    297297    }
    298298

  • trunk/WebCore/html/HTMLLinkElement.cpp

    r73335 r73392  
    231231       
    232232        String charset = getAttribute(charsetAttr);
    233         if (charset.isEmpty() && document()->frame())
    234             charset = document()->frame()->loader()->writer()->encoding();
     233        if (charset.isEmpty())
     234            charset = document()->loader()->writer()->encoding();
    235235
    236236        if (m_cachedSheet) {

  • trunk/WebCore/html/MediaDocument.cpp

    r72259 r73392  
    209209        embedElement->setAttribute(nameAttr, "plugin");
    210210        embedElement->setAttribute(srcAttr, url().string());
    211         embedElement->setAttribute(typeAttr, frame()->loader()->writer()->mimeType());
     211        embedElement->setAttribute(typeAttr, loader()->writer()->mimeType());
    212212
    213213        ExceptionCode ec;

  • trunk/WebCore/html/PluginDocument.cpp

    r69268 r73392  
    9292    m_embedElement->setAttribute(nameAttr, "plugin");
    9393    m_embedElement->setAttribute(srcAttr, document()->url().string());
    94     m_embedElement->setAttribute(typeAttr, document()->frame()->loader()->writer()->mimeType());
     94    m_embedElement->setAttribute(typeAttr, document()->loader()->writer()->mimeType());
    9595
    9696    static_cast<PluginDocument*>(document())->setPluginNode(m_embedElement);

  • trunk/WebCore/loader/DocumentLoader.cpp

    r73210 r73392  
    3838#include "Document.h"
    3939#include "DocumentParser.h"
     40#include "DocumentWriter.h"
    4041#include "Event.h"
    4142#include "Frame.h"
    … …  
    5051#include "Settings.h"
    5152#include "SharedBuffer.h"
    52 
     53#include "TextResourceDecoder.h"
    5354#include <wtf/Assertions.h>
    5455#include <wtf/text/CString.h>
    … …  
    7879    : m_deferMainResourceDataLoad(true)
    7980    , m_frame(0)
     81    , m_writer(m_frame)
    8082    , m_originalRequest(req)
    8183    , m_substituteData(substituteData)
    … …  
    277279    if (FrameLoader* loader = frameLoader()) {
    278280        loader->finishedLoadingDocument(this);
    279         loader->writer()->end();
     281        m_writer.end();
    280282    }
    281283}
    … …  
    305307        encoding = response().textEncodingName();
    306308    }
    307     // FIXME: DocumentWriter should be owned by DocumentLoader.
    308     m_frame->loader()->writer()->setEncoding(encoding, userChosen);
     309    m_writer.setEncoding(encoding, userChosen);
    309310    ASSERT(m_frame->document()->parsing());
    310     m_frame->loader()->writer()->addData(bytes, length);
     311    m_writer.addData(bytes, length);
    311312}
    312313
    … …  
    338339   
    339340    frameLoader()->finishedLoadingDocument(this);
    340     m_frame->loader()->writer()->end();
     341    m_writer.end();
    341342   
    342343    frameLoader()->setReplacing();
    … …  
    375376    ASSERT(frame && !m_frame);
    376377    m_frame = frame;
     378    m_writer.setFrame(frame);
    377379    attachToFrame();
    378380}

  • trunk/WebCore/loader/DocumentLoader.h

    r70574 r73392  
    3131
    3232#include "DocumentLoadTiming.h"
     33#include "DocumentWriter.h"
    3334#include "NavigationAction.h"
    3435#include "ResourceError.h"
    … …  
    7374        MainResourceLoader* mainResourceLoader() const { return m_mainResourceLoader.get(); }
    7475        PassRefPtr<SharedBuffer> mainResourceData() const;
     76       
     77        DocumentWriter* writer() const { return &m_writer; }
    7578
    7679        const ResourceRequest& originalRequest() const;
    … …  
    247250
    248251        RefPtr<SharedBuffer> m_mainResourceData;
     252       
     253        mutable DocumentWriter m_writer;
    249254
    250255        // A reference to actual request used to create the data source.

  • trunk/WebCore/loader/DocumentWriter.cpp

    r69026 r73392  
    124124    bool resetScripting = !(m_frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument() && m_frame->document()->securityOrigin()->isSecureTransitionTo(url));
    125125    m_frame->loader()->clear(resetScripting, resetScripting);
     126    clear();
    126127    if (resetScripting)
    127128        m_frame->script()->updatePlatformScriptObjects();

  • trunk/WebCore/loader/DocumentWriter.h

    r69026 r73392  
    5353    void end();
    5454    void endIfNotLoadingMainResource();
    55     void clear();
     55   
     56    void setFrame(Frame* frame) { m_frame = frame; }
    5657
    5758    String encoding() const;
    … …  
    7677private:
    7778    PassRefPtr<Document> createDocument(const KURL&);
     79    void clear();
    7880
    7981    Frame* m_frame;

  • trunk/WebCore/loader/FrameLoader.cpp

    r72611 r73392  
    179179    , m_history(frame)
    180180    , m_notifer(frame)
    181     , m_writer(frame)
    182181    , m_subframeLoader(frame)
    183182    , m_state(FrameStateCommittedPage)
    … …  
    233232    m_provisionalDocumentLoader->setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String()));
    234233    m_provisionalDocumentLoader->finishedLoading();
    235     writer()->begin(KURL(), false);
    236     writer()->end();
     234    m_documentLoader->writer()->begin(KURL(), false);
     235    m_documentLoader->writer()->end();
    237236    m_frame->document()->cancelParsing();
    238237    m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
    … …  
    593592    // as some destructors might still try to access the document.
    594593    m_frame->setDocument(0);
    595     writer()->clear();
    596594
    597595    m_subframeLoader.clear();
    … …  
    612610void FrameLoader::receivedFirstData()
    613611{
    614     writer()->begin(m_workingURL, false);
    615     writer()->setDocumentWasLoadedAsPartOfNavigation();
     612    activeDocumentLoader()->writer()->begin(m_workingURL, false);
     613    activeDocumentLoader()->writer()->setDocumentWasLoadedAsPartOfNavigation();
    616614
    617615    dispatchDidCommitLoad();
    … …  
    20132011    }
    20142012
    2015     writer()->setMIMEType(dl->responseMIMEType());
     2013    m_documentLoader->writer()->setMIMEType(dl->responseMIMEType());
    20162014
    20172015    // Tell the client we've committed this URL.
    … …  
    21492147    m_frame->domWindow()->setSecurityOrigin(document->securityOrigin());
    21502148
    2151     writer()->setDecoder(document->decoder());
    2152 
    21532149    updateFirstPartyForCookies();
    21542150
    … …  
    22432239    loader->setParsedArchiveData(mainResource->data());
    22442240
    2245     writer()->setMIMEType(mainResource->mimeType());
     2241    loader->writer()->setMIMEType(mainResource->mimeType());
    22462242
    22472243    closeURL();
    … …  
    22512247    String userChosenEncoding = documentLoader()->overrideEncoding();
    22522248    bool encodingIsUserChosen = !userChosenEncoding.isNull();
    2253     writer()->setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen);
    2254     writer()->addData(mainResource->data()->data(), mainResource->data()->size());
     2249    loader->writer()->setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen);
     2250    loader->writer()->addData(mainResource->data()->data(), mainResource->data()->size());
    22552251}
    22562252
    … …  
    26762672    // For a newly opened frame with an empty URL, encoding() should not be used, because this methods asks decoder, which uses ISO-8859-1.
    26772673    Settings* settings = m_frame->settings();
    2678     request.setResponseContentDispositionEncodingFallbackArray("UTF-8", writer()->deprecatedFrameEncoding(), settings ? settings->defaultTextEncodingName() : String());
     2674    request.setResponseContentDispositionEncodingFallbackArray("UTF-8", activeDocumentLoader()->writer()->deprecatedFrameEncoding(), settings ? settings->defaultTextEncodingName() : String());
    26792675}
    26802676

  • trunk/WebCore/loader/FrameLoader.h

    r71959 r73392  
    3333
    3434#include "CachePolicy.h"
    35 #include "DocumentWriter.h"
    3635#include "FrameLoaderStateMachine.h"
    3736#include "FrameLoaderTypes.h"
    … …  
    9998    HistoryController* history() const { return &m_history; }
    10099    ResourceLoadNotifier* notifier() const { return &m_notifer; }
    101     DocumentWriter* writer() const { return &m_writer; }
    102100    SubframeLoader* subframeLoader() const { return &m_subframeLoader; }
    103101
    … …  
    428426    mutable HistoryController m_history;
    429427    mutable ResourceLoadNotifier m_notifer;
    430     mutable DocumentWriter m_writer;
    431428    mutable SubframeLoader m_subframeLoader;
    432429    mutable FrameLoaderStateMachine m_stateMachine;

  • trunk/WebCore/loader/cache/CachedResourceLoader.cpp

    r72303 r73392  
    407407    String encoding;
    408408    if (type == CachedResource::Script || type == CachedResource::CSSStyleSheet)
    409         encoding = charset.isEmpty() ? m_document->frame()->loader()->writer()->encoding() : charset;
     409        encoding = charset.isEmpty() ? m_document->loader()->writer()->encoding() : charset;
    410410
    411411    CachedResource* resource = requestResource(type, url, encoding, true);

  • trunk/WebCore/platform/network/FormDataBuilder.cpp

    r63999 r73392  
    9595    }
    9696
    97     if (Frame* frame = document->frame())
    98         return frame->loader()->writer()->encoding();
    99 
    100     return Latin1Encoding();
     97    return document->loader()->writer()->encoding();
    10198}
    10299

  • trunk/WebCore/svg/graphics/SVGImage.cpp

    r70143 r73392  
    279279        loader->policyChecker()->cancelCheck(); // cancel any policy checks
    280280        loader->commitProvisionalLoad();
    281         loader->writer()->setMIMEType("image/svg+xml");
    282         loader->writer()->begin(KURL()); // create the empty document
    283         loader->writer()->addData(data()->data(), data()->size());
    284         loader->writer()->end();
     281        loader->activeDocumentLoader()->writer()->setMIMEType("image/svg+xml");
     282        loader->activeDocumentLoader()->writer()->begin(KURL()); // create the empty document
     283        loader->activeDocumentLoader()->writer()->addData(data()->data(), data()->size());
     284        loader->activeDocumentLoader()->writer()->end();
    285285        frame->view()->setTransparent(true); // SVG Images are transparent.
    286286    }

  • trunk/WebKit/chromium/ChangeLog

    r73317 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * src/ContextMenuClientImpl.cpp:
     9        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
     10        * src/FrameLoaderClientImpl.cpp:
     11        (WebKit::FrameLoaderClientImpl::finishedLoading):
     12        * src/WebFrameImpl.cpp:
     13        (WebKit::WebFrameImpl::encoding):
     14        (WebKit::WebFrameImpl::loadJavaScriptURL):
     15        * src/WebPageSerializerImpl.cpp:
     16        (WebKit::WebPageSerializerImpl::preActionBeforeSerializeOpenTag):
     17        (WebKit::WebPageSerializerImpl::serialize):
     18        * src/WebSearchableFormData.cpp:
     19        (WebCore::GetFormEncoding):
     20        * src/WebViewImpl.cpp:
     21        (WebKit::WebViewImpl::pageEncoding):
     22
    1232010-12-03  Sheriff Bot  <webkit.review.bot@gmail.com>
    224

  • trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

    r70598 r73392  
    227227    // If it's not a link, an image, a media element, or an image/media link,
    228228    // show a selection menu or a more generic page menu.
    229     data.frameEncoding = selectedFrame->loader()->writer()->encoding();
     229    data.frameEncoding = selectedFrame->document()->loader()->writer()->encoding();
    230230
    231231    // Send the frame and page URLs in any case.

  • trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r71610 r73392  
    10981098        // match the behavior on the Mac.
    10991099        if (m_hasRepresentation)
    1100             dl->frameLoader()->writer()->setEncoding("", false);
     1100            dl->writer()->setEncoding("", false);
    11011101    }
    11021102}

  • trunk/WebKit/chromium/src/WebFrameImpl.cpp

    r72616 r73392  
    546546WebString WebFrameImpl::encoding() const
    547547{
    548     return frame()->loader()->writer()->encoding();
     548    return frame()->document()->loader()->writer()->encoding();
    549549}
    550550
    … …  
    22722272
    22732273    if (!m_frame->navigationScheduler()->locationChangePending())
    2274         m_frame->loader()->writer()->replaceDocument(scriptResult);
     2274        m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
    22752275}
    22762276

  • trunk/WebKit/chromium/src/WebPageSerializerImpl.cpp

    r69683 r73392  
    169169            String xmlEncoding = param->document->xmlEncoding();
    170170            if (xmlEncoding.isEmpty())
    171                 xmlEncoding = param->document->frame()->loader()->writer()->encoding();
     171                xmlEncoding = param->document->loader()->writer()->encoding();
    172172            if (xmlEncoding.isEmpty())
    173173                xmlEncoding = UTF8Encoding().name();
    … …  
    506506        didSerialization = true;
    507507
    508         String encoding = webFrame->frame()->loader()->writer()->encoding();
     508        String encoding = document->loader()->writer()->encoding();
    509509        const TextEncoding& textEncoding = encoding.isEmpty() ? UTF8Encoding() : TextEncoding(encoding);
    510510        String directoryName = url == mainURL ? m_localDirectoryName : "";

  • trunk/WebKit/chromium/src/WebSearchableFormData.cpp

    r68749 r73392  
    6262            return;
    6363    }
    64     const Frame* frame = form->document()->frame();
    65     *encoding = frame ? TextEncoding(frame->loader()->writer()->encoding()) : Latin1Encoding();
     64    *encoding = TextEncoding(form->document()->loader()->writer()->encoding());
    6665}
    6766

  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r73137 r73392  
    14321432        return WebString();
    14331433
    1434     return m_page->mainFrame()->loader()->writer()->encoding();
     1434    return m_page->mainFrame()->document()->loader()->writer()->encoding();
    14351435}
    14361436

  • trunk/WebKit/gtk/ChangeLog

    r73368 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     9        (WebKit::FrameLoaderClient::finishedLoading):
     10        * webkit/webkitwebview.cpp:
     11        (webkit_web_view_get_encoding):
     12
    1132010-12-06  Martin Robinson  <mrobinson@igalia.com>
    214

  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r73353 r73392  
    10171017void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
    10181018{
    1019     if (!m_pluginView) {
    1020         FrameLoader* loader = documentLoader->frameLoader();
    1021         loader->writer()->setEncoding(m_response.textEncodingName(), false);
    1022     } else {
     1019    if (!m_pluginView)
     1020        documentLoader->writer()->setEncoding(m_response.textEncodingName(), false);
     1021    else {
    10231022        m_pluginView->didFinishLoading();
    10241023        m_pluginView = 0;

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r73354 r73392  
    45104510{
    45114511    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    4512     String encoding = core(webView)->mainFrame()->loader()->writer()->encoding();
     4512    String encoding = core(webView)->mainFrame()->document()->loader()->writer()->encoding();
    45134513    if (encoding.isEmpty())
    45144514        return 0;

  • trunk/WebKit/mac/ChangeLog

    r73380 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * WebView/WebFrame.mm:
     9        (-[WebFrame _canProvideDocumentSource]):
     10
    1112010-12-06  Chris Marrin  <cmarrin@apple.com>
    212

  • trunk/WebKit/mac/WebView/WebFrame.mm

    r72573 r73392  
    934934{
    935935    Frame* frame = _private->coreFrame;
    936     String mimeType = frame->loader()->writer()->mimeType();
     936    String mimeType = frame->document()->loader()->writer()->mimeType();
    937937    PluginData* pluginData = frame->page() ? frame->page()->pluginData() : 0;
    938938

  • trunk/WebKit/qt/Api/qwebframe.cpp

    r72910 r73392  
    704704{
    705705    const QUrl absolute = ensureAbsoluteUrl(url);
    706     d->frame->loader()->writer()->begin(absolute);
    707     d->frame->loader()->writer()->end();
     706    d->frame->document()->loader()->writer()->begin(absolute);
     707    d->frame->document()->loader()->writer()->end();
    708708    load(absolute);
    709709}

  • trunk/WebKit/qt/ChangeLog

    r73088 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * Api/qwebframe.cpp:
     9        (QWebFrame::setUrl):
     10        * WebCoreSupport/FrameLoaderClientQt.cpp:
     11        (WebCore::FrameLoaderClientQt::finishedLoading):
     12
    1132010-12-01  Jia Pu  <jpu@apple.com>
    214

  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r72612 r73392  
    620620        // match the behavior on the Mac.
    621621        if (m_hasRepresentation)
    622             loader->frameLoader()->writer()->setEncoding("", false);
     622            loader->writer()->setEncoding("", false);
    623623        return;
    624624    }

  • trunk/WebKit/wince/ChangeLog

    r73378 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     9        (WebKit::FrameLoaderClientWinCE::finishedLoading):
     10
    1112010-12-06  Patrick Gansterer  <paroga@webkit.org>
    212

  • trunk/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r70986 r73392  
    451451{
    452452    if (!m_pluginView) {
    453         FrameLoader* loader = documentLoader->frameLoader();
    454         loader->writer()->setEncoding(m_response.textEncodingName(), false);
     453        documentLoader->writer()->setEncoding(m_response.textEncodingName(), false);
    455454        return;
    456455    }

  • trunk/WebKit/wx/ChangeLog

    r73088 r73392  
     12010-12-06  Nate Chapin  <japhet@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Update calls to DocumentWriter.
     6        https://bugs.webkit.org/show_bug.cgi?id=50489
     7
     8        * WebKitSupport/FrameLoaderClientWx.cpp:
     9        (WebCore::FrameLoaderClientWx::finishedLoading):
     10
    1112010-12-01  Jia Pu  <jpu@apple.com>
    212

  • trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r70894 r73392  
    435435    if (!m_pluginView) {
    436436        if (m_firstData) {
    437             FrameLoader* fl = loader->frameLoader();
    438             fl->writer()->setEncoding(m_response.textEncodingName(), false);
     437            loader->writer()->setEncoding(m_response.textEncodingName(), false);
    439438            m_firstData = false;
    440439        }
Note: See TracChangeset for help on using the changeset viewer.