Changeset 73436 in webkit


Ignore:
Timestamp:
Dec 7, 2010 4:40:54 AM (13 years ago)
Author:
Martin Robinson
Message:

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • 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:
  • 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:
  • loader/DocumentWriter.cpp: (WebCore::DocumentWriter::begin):
  • loader/DocumentWriter.h:
  • 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::writer):
  • loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::requestPreload):
  • platform/network/FormDataBuilder.cpp: (WebCore::FormDataBuilder::encodingFromAcceptCharset):
  • svg/graphics/SVGImage.cpp: (WebCore::SVGImage::dataChanged):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
  • src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::finishedLoading):
  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::encoding): (WebKit::WebFrameImpl::loadJavaScriptURL):
  • src/WebPageSerializerImpl.cpp: (WebKit::WebPageSerializerImpl::preActionBeforeSerializeOpenTag): (WebKit::WebPageSerializerImpl::serialize):
  • src/WebSearchableFormData.cpp: (WebCore::GetFormEncoding):
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::pageEncoding):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::finishedLoading):
  • webkit/webkitwebview.cpp: (webkit_web_view_get_encoding):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • WebView/WebFrame.mm: (-[WebFrame _canProvideDocumentSource]):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • Api/qwebframe.cpp: (QWebFrame::setUrl):
  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::finishedLoading):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • WebCoreSupport/FrameLoaderClientWinCE.cpp: (WebKit::FrameLoaderClientWinCE::finishedLoading):

2010-12-07 Martin Robinson <mrobinson@igalia.com>

Unreviewed, rolling out r73392.
http://trac.webkit.org/changeset/73392
https://bugs.webkit.org/show_bug.cgi?id=50489

This commit caused crashes on the GTK+ bots

  • WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::finishedLoading):
Location:
trunk
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r73434 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * bindings/ScriptControllerBase.cpp:
     10        (WebCore::ScriptController::executeIfJavaScriptURL):
     11        * dom/Document.cpp:
     12        (WebCore::Document::Document):
     13        (WebCore::Document::close):
     14        (WebCore::Document::lastModified):
     15        (WebCore::Document::finishedParsing):
     16        (WebCore::Document::initSecurityContext):
     17        (WebCore::Document::updateURLForPushOrReplaceState):
     18        * dom/Document.h:
     19        * dom/ProcessingInstruction.cpp:
     20        (WebCore::ProcessingInstruction::checkStyleSheet):
     21        * dom/ScriptElement.cpp:
     22        (WebCore::ScriptElement::scriptCharset):
     23        * html/HTMLLinkElement.cpp:
     24        (WebCore::HTMLLinkElement::process):
     25        * html/MediaDocument.cpp:
     26        (WebCore::MediaDocument::replaceMediaElementTimerFired):
     27        * html/PluginDocument.cpp:
     28        (WebCore::PluginDocumentParser::createDocumentStructure):
     29        * loader/DocumentLoader.cpp:
     30        (WebCore::DocumentLoader::DocumentLoader):
     31        (WebCore::DocumentLoader::finishedLoading):
     32        (WebCore::DocumentLoader::commitData):
     33        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
     34        (WebCore::DocumentLoader::setFrame):
     35        * loader/DocumentLoader.h:
     36        * loader/DocumentWriter.cpp:
     37        (WebCore::DocumentWriter::begin):
     38        * loader/DocumentWriter.h:
     39        * loader/FrameLoader.cpp:
     40        (WebCore::FrameLoader::FrameLoader):
     41        (WebCore::FrameLoader::init):
     42        (WebCore::FrameLoader::clear):
     43        (WebCore::FrameLoader::receivedFirstData):
     44        (WebCore::FrameLoader::transitionToCommitted):
     45        (WebCore::FrameLoader::open):
     46        (WebCore::FrameLoader::finishedLoadingDocument):
     47        (WebCore::FrameLoader::addExtraFieldsToRequest):
     48        * loader/FrameLoader.h:
     49        (WebCore::FrameLoader::writer):
     50        * loader/cache/CachedResourceLoader.cpp:
     51        (WebCore::CachedResourceLoader::requestPreload):
     52        * platform/network/FormDataBuilder.cpp:
     53        (WebCore::FormDataBuilder::encodingFromAcceptCharset):
     54        * svg/graphics/SVGImage.cpp:
     55        (WebCore::SVGImage::dataChanged):
     56
    1572010-12-07  Patrick Gansterer  <paroga@webkit.org>
    258
  • trunk/WebCore/bindings/ScriptControllerBase.cpp

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

    r73430 r73436  
    429429
    430430    m_frame = frame;
    431     m_documentLoader = frame ? frame->loader()->activeDocumentLoader() : 0;
    432431
    433432    if (frame || !url.isEmpty())
     
    20562055    if (frame) {
    20572056        // This code calls implicitClose() if all loading has completed.
    2058         loader()->writer()->endIfNotLoadingMainResource();
    2059         frame->loader()->checkCompleted();
     2057        FrameLoader* frameLoader = frame->loader();
     2058        frameLoader->writer()->endIfNotLoadingMainResource();
     2059        frameLoader->checkCompleted();
    20602060    } else {
    20612061        // Because we have no frame, we don't know if all loading has completed,
     
    37143714    bool foundDate = false;
    37153715    if (m_frame) {
    3716         String httpLastModified = m_documentLoader->response().httpHeaderField("Last-Modified");
     3716        String httpLastModified = m_frame->loader()->documentLoader()->response().httpHeaderField("Last-Modified");
    37173717        if (!httpLastModified.isEmpty()) {
    37183718            date.setMillisecondsSinceEpochForDateTime(parseDate(httpLastModified));
     
    42324232
    42334233        if (InspectorController* controller = page()->inspectorController())
    4234             controller->mainResourceFiredDOMContentEvent(m_documentLoader, url());
     4234            controller->mainResourceFiredDOMContentEvent(f->loader()->documentLoader(), url());
    42354235#endif
    42364236    }
     
    44464446        // and https://bugs.webkit.org/show_bug.cgi?id=19760 for further
    44474447        // discussion.
    4448         if (m_documentLoader->substituteData().isValid())
     4448        DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
     4449        if (documentLoader && documentLoader->substituteData().isValid())
    44494450            securityOrigin()->grantLoadLocalResources();
    44504451    }
     
    45264527    setURL(url);
    45274528    f->loader()->setURL(url);
    4528     m_documentLoader->replaceRequestURLForSameDocumentNavigation(url);
     4529    f->loader()->documentLoader()->replaceRequestURLForSameDocumentNavigation(url);
    45294530}
    45304531
  • trunk/WebCore/dom/Document.h

    r73430 r73436  
    3434#include "Color.h"
    3535#include "ContainerNode.h"
    36 #include "DocumentLoader.h"
    3736#include "DocumentMarkerController.h"
    3837#include "DocumentTiming.h"
     
    5756class CDATASection;
    5857class CachedCSSStyleSheet;
    59 class CachedResourceLoader;
    6058class CachedScript;
    6159class CanvasRenderingContext;
     
    7068class DOMWindow;
    7169class DatabaseThread;
     70class CachedResourceLoader;
    7271class DocumentFragment;
    7372class DocumentType;
     
    551550    void setVisuallyOrdered();
    552551    bool visuallyOrdered() const { return m_visuallyOrdered; }
    553    
    554     void setDocumentLoader(DocumentLoader* documentLoader) { m_documentLoader = documentLoader; }
    555     DocumentLoader* loader() const { return m_documentLoader; }
    556552
    557553    void open(Document* ownerDocument = 0);
     
    11421138
    11431139    Frame* m_frame;
    1144     DocumentLoader* m_documentLoader;
    11451140    OwnPtr<CachedResourceLoader> m_cachedResourceLoader;
    11461141    RefPtr<DocumentParser> m_parser;
  • trunk/WebCore/dom/ProcessingInstruction.cpp

    r73392 r73436  
    169169                String charset = attrs.get("charset");
    170170                if (charset.isEmpty())
    171                     charset = document()->loader()->writer()->encoding();
     171                    charset = document()->frame()->loader()->writer()->encoding();
    172172
    173173                m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet(url, charset);
  • trunk/WebCore/dom/ScriptElement.cpp

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

    r73392 r73436  
    231231       
    232232        String charset = getAttribute(charsetAttr);
    233         if (charset.isEmpty())
    234             charset = document()->loader()->writer()->encoding();
     233        if (charset.isEmpty() && document()->frame())
     234            charset = document()->frame()->loader()->writer()->encoding();
    235235
    236236        if (m_cachedSheet) {
  • trunk/WebCore/html/MediaDocument.cpp

    r73392 r73436  
    209209        embedElement->setAttribute(nameAttr, "plugin");
    210210        embedElement->setAttribute(srcAttr, url().string());
    211         embedElement->setAttribute(typeAttr, loader()->writer()->mimeType());
     211        embedElement->setAttribute(typeAttr, frame()->loader()->writer()->mimeType());
    212212
    213213        ExceptionCode ec;
  • trunk/WebCore/html/PluginDocument.cpp

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

    r73392 r73436  
    3838#include "Document.h"
    3939#include "DocumentParser.h"
    40 #include "DocumentWriter.h"
    4140#include "Event.h"
    4241#include "Frame.h"
     
    5150#include "Settings.h"
    5251#include "SharedBuffer.h"
    53 #include "TextResourceDecoder.h"
     52
    5453#include <wtf/Assertions.h>
    5554#include <wtf/text/CString.h>
     
    7978    : m_deferMainResourceDataLoad(true)
    8079    , m_frame(0)
    81     , m_writer(m_frame)
    8280    , m_originalRequest(req)
    8381    , m_substituteData(substituteData)
     
    279277    if (FrameLoader* loader = frameLoader()) {
    280278        loader->finishedLoadingDocument(this);
    281         m_writer.end();
     279        loader->writer()->end();
    282280    }
    283281}
     
    307305        encoding = response().textEncodingName();
    308306    }
    309     m_writer.setEncoding(encoding, userChosen);
     307    // FIXME: DocumentWriter should be owned by DocumentLoader.
     308    m_frame->loader()->writer()->setEncoding(encoding, userChosen);
    310309    ASSERT(m_frame->document()->parsing());
    311     m_writer.addData(bytes, length);
     310    m_frame->loader()->writer()->addData(bytes, length);
    312311}
    313312
     
    339338   
    340339    frameLoader()->finishedLoadingDocument(this);
    341     m_writer.end();
     340    m_frame->loader()->writer()->end();
    342341   
    343342    frameLoader()->setReplacing();
     
    376375    ASSERT(frame && !m_frame);
    377376    m_frame = frame;
    378     m_writer.setFrame(frame);
    379377    attachToFrame();
    380378}
  • trunk/WebCore/loader/DocumentLoader.h

    r73392 r73436  
    3131
    3232#include "DocumentLoadTiming.h"
    33 #include "DocumentWriter.h"
    3433#include "NavigationAction.h"
    3534#include "ResourceError.h"
     
    7473        MainResourceLoader* mainResourceLoader() const { return m_mainResourceLoader.get(); }
    7574        PassRefPtr<SharedBuffer> mainResourceData() const;
    76        
    77         DocumentWriter* writer() const { return &m_writer; }
    7875
    7976        const ResourceRequest& originalRequest() const;
     
    250247
    251248        RefPtr<SharedBuffer> m_mainResourceData;
    252        
    253         mutable DocumentWriter m_writer;
    254249
    255250        // A reference to actual request used to create the data source.
  • trunk/WebCore/loader/DocumentWriter.cpp

    r73392 r73436  
    124124    bool resetScripting = !(m_frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument() && m_frame->document()->securityOrigin()->isSecureTransitionTo(url));
    125125    m_frame->loader()->clear(resetScripting, resetScripting);
    126     clear();
    127126    if (resetScripting)
    128127        m_frame->script()->updatePlatformScriptObjects();
  • trunk/WebCore/loader/DocumentWriter.h

    r73392 r73436  
    5353    void end();
    5454    void endIfNotLoadingMainResource();
    55    
    56     void setFrame(Frame* frame) { m_frame = frame; }
     55    void clear();
    5756
    5857    String encoding() const;
     
    7776private:
    7877    PassRefPtr<Document> createDocument(const KURL&);
    79     void clear();
    8078
    8179    Frame* m_frame;
  • trunk/WebCore/loader/FrameLoader.cpp

    r73392 r73436  
    179179    , m_history(frame)
    180180    , m_notifer(frame)
     181    , m_writer(frame)
    181182    , m_subframeLoader(frame)
    182183    , m_state(FrameStateCommittedPage)
     
    232233    m_provisionalDocumentLoader->setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String()));
    233234    m_provisionalDocumentLoader->finishedLoading();
    234     m_documentLoader->writer()->begin(KURL(), false);
    235     m_documentLoader->writer()->end();
     235    writer()->begin(KURL(), false);
     236    writer()->end();
    236237    m_frame->document()->cancelParsing();
    237238    m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
     
    592593    // as some destructors might still try to access the document.
    593594    m_frame->setDocument(0);
     595    writer()->clear();
    594596
    595597    m_subframeLoader.clear();
     
    610612void FrameLoader::receivedFirstData()
    611613{
    612     activeDocumentLoader()->writer()->begin(m_workingURL, false);
    613     activeDocumentLoader()->writer()->setDocumentWasLoadedAsPartOfNavigation();
     614    writer()->begin(m_workingURL, false);
     615    writer()->setDocumentWasLoadedAsPartOfNavigation();
    614616
    615617    dispatchDidCommitLoad();
     
    20112013    }
    20122014
    2013     m_documentLoader->writer()->setMIMEType(dl->responseMIMEType());
     2015    writer()->setMIMEType(dl->responseMIMEType());
    20142016
    20152017    // Tell the client we've committed this URL.
     
    21472149    m_frame->domWindow()->setSecurityOrigin(document->securityOrigin());
    21482150
     2151    writer()->setDecoder(document->decoder());
     2152
    21492153    updateFirstPartyForCookies();
    21502154
     
    22392243    loader->setParsedArchiveData(mainResource->data());
    22402244
    2241     loader->writer()->setMIMEType(mainResource->mimeType());
     2245    writer()->setMIMEType(mainResource->mimeType());
    22422246
    22432247    closeURL();
     
    22472251    String userChosenEncoding = documentLoader()->overrideEncoding();
    22482252    bool encodingIsUserChosen = !userChosenEncoding.isNull();
    2249     loader->writer()->setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen);
    2250     loader->writer()->addData(mainResource->data()->data(), mainResource->data()->size());
     2253    writer()->setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen);
     2254    writer()->addData(mainResource->data()->data(), mainResource->data()->size());
    22512255}
    22522256
     
    26722676    // For a newly opened frame with an empty URL, encoding() should not be used, because this methods asks decoder, which uses ISO-8859-1.
    26732677    Settings* settings = m_frame->settings();
    2674     request.setResponseContentDispositionEncodingFallbackArray("UTF-8", activeDocumentLoader()->writer()->deprecatedFrameEncoding(), settings ? settings->defaultTextEncodingName() : String());
     2678    request.setResponseContentDispositionEncodingFallbackArray("UTF-8", writer()->deprecatedFrameEncoding(), settings ? settings->defaultTextEncodingName() : String());
    26752679}
    26762680
  • trunk/WebCore/loader/FrameLoader.h

    r73392 r73436  
    3333
    3434#include "CachePolicy.h"
     35#include "DocumentWriter.h"
    3536#include "FrameLoaderStateMachine.h"
    3637#include "FrameLoaderTypes.h"
     
    9899    HistoryController* history() const { return &m_history; }
    99100    ResourceLoadNotifier* notifier() const { return &m_notifer; }
     101    DocumentWriter* writer() const { return &m_writer; }
    100102    SubframeLoader* subframeLoader() const { return &m_subframeLoader; }
    101103
     
    426428    mutable HistoryController m_history;
    427429    mutable ResourceLoadNotifier m_notifer;
     430    mutable DocumentWriter m_writer;
    428431    mutable SubframeLoader m_subframeLoader;
    429432    mutable FrameLoaderStateMachine m_stateMachine;
  • trunk/WebCore/loader/cache/CachedResourceLoader.cpp

    r73392 r73436  
    407407    String encoding;
    408408    if (type == CachedResource::Script || type == CachedResource::CSSStyleSheet)
    409         encoding = charset.isEmpty() ? m_document->loader()->writer()->encoding() : charset;
     409        encoding = charset.isEmpty() ? m_document->frame()->loader()->writer()->encoding() : charset;
    410410
    411411    CachedResource* resource = requestResource(type, url, encoding, true);
  • trunk/WebCore/platform/network/FormDataBuilder.cpp

    r73392 r73436  
    9595    }
    9696
    97     return document->loader()->writer()->encoding();
     97    if (Frame* frame = document->frame())
     98        return frame->loader()->writer()->encoding();
     99
     100    return Latin1Encoding();
    98101}
    99102
  • trunk/WebCore/svg/graphics/SVGImage.cpp

    r73392 r73436  
    279279        loader->policyChecker()->cancelCheck(); // cancel any policy checks
    280280        loader->commitProvisionalLoad();
    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();
     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();
    285285        frame->view()->setTransparent(true); // SVG Images are transparent.
    286286    }
  • trunk/WebKit/chromium/ChangeLog

    r73430 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * src/ContextMenuClientImpl.cpp:
     10        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
     11        * src/FrameLoaderClientImpl.cpp:
     12        (WebKit::FrameLoaderClientImpl::finishedLoading):
     13        * src/WebFrameImpl.cpp:
     14        (WebKit::WebFrameImpl::encoding):
     15        (WebKit::WebFrameImpl::loadJavaScriptURL):
     16        * src/WebPageSerializerImpl.cpp:
     17        (WebKit::WebPageSerializerImpl::preActionBeforeSerializeOpenTag):
     18        (WebKit::WebPageSerializerImpl::serialize):
     19        * src/WebSearchableFormData.cpp:
     20        (WebCore::GetFormEncoding):
     21        * src/WebViewImpl.cpp:
     22        (WebKit::WebViewImpl::pageEncoding):
     23
    1242010-12-07  Kenichi Ishibashi  <bashi@google.com>
    225
  • trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

    r73392 r73436  
    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->document()->loader()->writer()->encoding();
     229    data.frameEncoding = selectedFrame->loader()->writer()->encoding();
    230230
    231231    // Send the frame and page URLs in any case.
  • trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r73392 r73436  
    10981098        // match the behavior on the Mac.
    10991099        if (m_hasRepresentation)
    1100             dl->writer()->setEncoding("", false);
     1100            dl->frameLoader()->writer()->setEncoding("", false);
    11011101    }
    11021102}
  • trunk/WebKit/chromium/src/WebFrameImpl.cpp

    r73392 r73436  
    546546WebString WebFrameImpl::encoding() const
    547547{
    548     return frame()->document()->loader()->writer()->encoding();
     548    return frame()->loader()->writer()->encoding();
    549549}
    550550
     
    22722272
    22732273    if (!m_frame->navigationScheduler()->locationChangePending())
    2274         m_frame->document()->loader()->writer()->replaceDocument(scriptResult);
     2274        m_frame->loader()->writer()->replaceDocument(scriptResult);
    22752275}
    22762276
  • trunk/WebKit/chromium/src/WebPageSerializerImpl.cpp

    r73392 r73436  
    169169            String xmlEncoding = param->document->xmlEncoding();
    170170            if (xmlEncoding.isEmpty())
    171                 xmlEncoding = param->document->loader()->writer()->encoding();
     171                xmlEncoding = param->document->frame()->loader()->writer()->encoding();
    172172            if (xmlEncoding.isEmpty())
    173173                xmlEncoding = UTF8Encoding().name();
     
    506506        didSerialization = true;
    507507
    508         String encoding = document->loader()->writer()->encoding();
     508        String encoding = webFrame->frame()->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

    r73430 r73436  
    6262            return;
    6363    }
    64     *encoding = TextEncoding(form->document()->loader()->writer()->encoding());
     64    const Frame* frame = form->document()->frame();
     65    *encoding = frame ? TextEncoding(frame->loader()->writer()->encoding()) : Latin1Encoding();
    6566}
    6667
  • trunk/WebKit/chromium/src/WebViewImpl.cpp

    r73392 r73436  
    14321432        return WebString();
    14331433
    1434     return m_page->mainFrame()->document()->loader()->writer()->encoding();
     1434    return m_page->mainFrame()->loader()->writer()->encoding();
    14351435}
    14361436
  • trunk/WebKit/gtk/ChangeLog

    r73392 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     10        (WebKit::FrameLoaderClient::finishedLoading):
     11        * webkit/webkitwebview.cpp:
     12        (webkit_web_view_get_encoding):
     13
    1142010-12-06  Nate Chapin  <japhet@chromium.org>
    215
  • trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r73392 r73436  
    10171017void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
    10181018{
    1019     if (!m_pluginView)
    1020         documentLoader->writer()->setEncoding(m_response.textEncodingName(), false);
    1021     else {
     1019    if (!m_pluginView) {
     1020        FrameLoader* loader = documentLoader->frameLoader();
     1021        loader->writer()->setEncoding(m_response.textEncodingName(), false);
     1022    } else {
    10221023        m_pluginView->didFinishLoading();
    10231024        m_pluginView = 0;
  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r73392 r73436  
    45104510{
    45114511    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
    4512     String encoding = core(webView)->mainFrame()->document()->loader()->writer()->encoding();
     4512    String encoding = core(webView)->mainFrame()->loader()->writer()->encoding();
    45134513    if (encoding.isEmpty())
    45144514        return 0;
  • trunk/WebKit/mac/ChangeLog

    r73430 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * WebView/WebFrame.mm:
     10        (-[WebFrame _canProvideDocumentSource]):
     11
    1122010-12-07  Kenichi Ishibashi  <bashi@google.com>
    213
  • trunk/WebKit/mac/WebView/WebFrame.mm

    r73392 r73436  
    934934{
    935935    Frame* frame = _private->coreFrame;
    936     String mimeType = frame->document()->loader()->writer()->mimeType();
     936    String mimeType = frame->loader()->writer()->mimeType();
    937937    PluginData* pluginData = frame->page() ? frame->page()->pluginData() : 0;
    938938
  • trunk/WebKit/qt/Api/qwebframe.cpp

    r73392 r73436  
    704704{
    705705    const QUrl absolute = ensureAbsoluteUrl(url);
    706     d->frame->document()->loader()->writer()->begin(absolute);
    707     d->frame->document()->loader()->writer()->end();
     706    d->frame->loader()->writer()->begin(absolute);
     707    d->frame->loader()->writer()->end();
    708708    load(absolute);
    709709}
  • trunk/WebKit/qt/ChangeLog

    r73392 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * Api/qwebframe.cpp:
     10        (QWebFrame::setUrl):
     11        * WebCoreSupport/FrameLoaderClientQt.cpp:
     12        (WebCore::FrameLoaderClientQt::finishedLoading):
     13
    1142010-12-06  Nate Chapin  <japhet@chromium.org>
    215
  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

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

    r73392 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     10        (WebKit::FrameLoaderClientWinCE::finishedLoading):
     11
    1122010-12-06  Nate Chapin  <japhet@chromium.org>
    213
  • trunk/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r73392 r73436  
    451451{
    452452    if (!m_pluginView) {
    453         documentLoader->writer()->setEncoding(m_response.textEncodingName(), false);
     453        FrameLoader* loader = documentLoader->frameLoader();
     454        loader->writer()->setEncoding(m_response.textEncodingName(), false);
    454455        return;
    455456    }
  • trunk/WebKit/wx/ChangeLog

    r73392 r73436  
     12010-12-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out r73392.
     4        http://trac.webkit.org/changeset/73392
     5        https://bugs.webkit.org/show_bug.cgi?id=50489
     6
     7        This commit caused crashes on the GTK+ bots
     8
     9        * WebKitSupport/FrameLoaderClientWx.cpp:
     10        (WebCore::FrameLoaderClientWx::finishedLoading):
     11
    1122010-12-06  Nate Chapin  <japhet@chromium.org>
    213
  • trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

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