Changeset 73436 in webkit
- Timestamp:
- Dec 7, 2010 4:40:54 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r73434 r73436 1 2010-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 1 57 2010-12-07 Patrick Gansterer <paroga@webkit.org> 2 58 -
trunk/WebCore/bindings/ScriptControllerBase.cpp
r73392 r73436 113 113 // http://bugs.webkit.org/show_bug.cgi?id=16782 114 114 if (shouldReplaceDocumentIfJavaScriptURL == ReplaceDocumentIfJavaScriptURL) 115 m_frame-> document()->loader()->writer()->replaceDocument(scriptResult);115 m_frame->loader()->writer()->replaceDocument(scriptResult); 116 116 117 117 return true; -
trunk/WebCore/dom/Document.cpp
r73430 r73436 429 429 430 430 m_frame = frame; 431 m_documentLoader = frame ? frame->loader()->activeDocumentLoader() : 0;432 431 433 432 if (frame || !url.isEmpty()) … … 2056 2055 if (frame) { 2057 2056 // 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(); 2060 2060 } else { 2061 2061 // Because we have no frame, we don't know if all loading has completed, … … 3714 3714 bool foundDate = false; 3715 3715 if (m_frame) { 3716 String httpLastModified = m_ documentLoader->response().httpHeaderField("Last-Modified");3716 String httpLastModified = m_frame->loader()->documentLoader()->response().httpHeaderField("Last-Modified"); 3717 3717 if (!httpLastModified.isEmpty()) { 3718 3718 date.setMillisecondsSinceEpochForDateTime(parseDate(httpLastModified)); … … 4232 4232 4233 4233 if (InspectorController* controller = page()->inspectorController()) 4234 controller->mainResourceFiredDOMContentEvent( m_documentLoader, url());4234 controller->mainResourceFiredDOMContentEvent(f->loader()->documentLoader(), url()); 4235 4235 #endif 4236 4236 } … … 4446 4446 // and https://bugs.webkit.org/show_bug.cgi?id=19760 for further 4447 4447 // discussion. 4448 if (m_documentLoader->substituteData().isValid()) 4448 DocumentLoader* documentLoader = m_frame->loader()->documentLoader(); 4449 if (documentLoader && documentLoader->substituteData().isValid()) 4449 4450 securityOrigin()->grantLoadLocalResources(); 4450 4451 } … … 4526 4527 setURL(url); 4527 4528 f->loader()->setURL(url); 4528 m_documentLoader->replaceRequestURLForSameDocumentNavigation(url);4529 f->loader()->documentLoader()->replaceRequestURLForSameDocumentNavigation(url); 4529 4530 } 4530 4531 -
trunk/WebCore/dom/Document.h
r73430 r73436 34 34 #include "Color.h" 35 35 #include "ContainerNode.h" 36 #include "DocumentLoader.h"37 36 #include "DocumentMarkerController.h" 38 37 #include "DocumentTiming.h" … … 57 56 class CDATASection; 58 57 class CachedCSSStyleSheet; 59 class CachedResourceLoader;60 58 class CachedScript; 61 59 class CanvasRenderingContext; … … 70 68 class DOMWindow; 71 69 class DatabaseThread; 70 class CachedResourceLoader; 72 71 class DocumentFragment; 73 72 class DocumentType; … … 551 550 void setVisuallyOrdered(); 552 551 bool visuallyOrdered() const { return m_visuallyOrdered; } 553 554 void setDocumentLoader(DocumentLoader* documentLoader) { m_documentLoader = documentLoader; }555 DocumentLoader* loader() const { return m_documentLoader; }556 552 557 553 void open(Document* ownerDocument = 0); … … 1142 1138 1143 1139 Frame* m_frame; 1144 DocumentLoader* m_documentLoader;1145 1140 OwnPtr<CachedResourceLoader> m_cachedResourceLoader; 1146 1141 RefPtr<DocumentParser> m_parser; -
trunk/WebCore/dom/ProcessingInstruction.cpp
r73392 r73436 169 169 String charset = attrs.get("charset"); 170 170 if (charset.isEmpty()) 171 charset = document()-> loader()->writer()->encoding();171 charset = document()->frame()->loader()->writer()->encoding(); 172 172 173 173 m_cachedSheet = document()->cachedResourceLoader()->requestCSSStyleSheet(url, charset); -
trunk/WebCore/dom/ScriptElement.cpp
r73392 r73436 293 293 // If charset has not been declared in script tag, fall back to frame encoding. 294 294 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(); 297 297 } 298 298 -
trunk/WebCore/html/HTMLLinkElement.cpp
r73392 r73436 231 231 232 232 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(); 235 235 236 236 if (m_cachedSheet) { -
trunk/WebCore/html/MediaDocument.cpp
r73392 r73436 209 209 embedElement->setAttribute(nameAttr, "plugin"); 210 210 embedElement->setAttribute(srcAttr, url().string()); 211 embedElement->setAttribute(typeAttr, loader()->writer()->mimeType());211 embedElement->setAttribute(typeAttr, frame()->loader()->writer()->mimeType()); 212 212 213 213 ExceptionCode ec; -
trunk/WebCore/html/PluginDocument.cpp
r73392 r73436 92 92 m_embedElement->setAttribute(nameAttr, "plugin"); 93 93 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()); 95 95 96 96 static_cast<PluginDocument*>(document())->setPluginNode(m_embedElement); -
trunk/WebCore/loader/DocumentLoader.cpp
r73392 r73436 38 38 #include "Document.h" 39 39 #include "DocumentParser.h" 40 #include "DocumentWriter.h"41 40 #include "Event.h" 42 41 #include "Frame.h" … … 51 50 #include "Settings.h" 52 51 #include "SharedBuffer.h" 53 #include "TextResourceDecoder.h" 52 54 53 #include <wtf/Assertions.h> 55 54 #include <wtf/text/CString.h> … … 79 78 : m_deferMainResourceDataLoad(true) 80 79 , m_frame(0) 81 , m_writer(m_frame)82 80 , m_originalRequest(req) 83 81 , m_substituteData(substituteData) … … 279 277 if (FrameLoader* loader = frameLoader()) { 280 278 loader->finishedLoadingDocument(this); 281 m_writer.end();279 loader->writer()->end(); 282 280 } 283 281 } … … 307 305 encoding = response().textEncodingName(); 308 306 } 309 m_writer.setEncoding(encoding, userChosen); 307 // FIXME: DocumentWriter should be owned by DocumentLoader. 308 m_frame->loader()->writer()->setEncoding(encoding, userChosen); 310 309 ASSERT(m_frame->document()->parsing()); 311 m_ writer.addData(bytes, length);310 m_frame->loader()->writer()->addData(bytes, length); 312 311 } 313 312 … … 339 338 340 339 frameLoader()->finishedLoadingDocument(this); 341 m_ writer.end();340 m_frame->loader()->writer()->end(); 342 341 343 342 frameLoader()->setReplacing(); … … 376 375 ASSERT(frame && !m_frame); 377 376 m_frame = frame; 378 m_writer.setFrame(frame);379 377 attachToFrame(); 380 378 } -
trunk/WebCore/loader/DocumentLoader.h
r73392 r73436 31 31 32 32 #include "DocumentLoadTiming.h" 33 #include "DocumentWriter.h"34 33 #include "NavigationAction.h" 35 34 #include "ResourceError.h" … … 74 73 MainResourceLoader* mainResourceLoader() const { return m_mainResourceLoader.get(); } 75 74 PassRefPtr<SharedBuffer> mainResourceData() const; 76 77 DocumentWriter* writer() const { return &m_writer; }78 75 79 76 const ResourceRequest& originalRequest() const; … … 250 247 251 248 RefPtr<SharedBuffer> m_mainResourceData; 252 253 mutable DocumentWriter m_writer;254 249 255 250 // A reference to actual request used to create the data source. -
trunk/WebCore/loader/DocumentWriter.cpp
r73392 r73436 124 124 bool resetScripting = !(m_frame->loader()->stateMachine()->isDisplayingInitialEmptyDocument() && m_frame->document()->securityOrigin()->isSecureTransitionTo(url)); 125 125 m_frame->loader()->clear(resetScripting, resetScripting); 126 clear();127 126 if (resetScripting) 128 127 m_frame->script()->updatePlatformScriptObjects(); -
trunk/WebCore/loader/DocumentWriter.h
r73392 r73436 53 53 void end(); 54 54 void endIfNotLoadingMainResource(); 55 56 void setFrame(Frame* frame) { m_frame = frame; } 55 void clear(); 57 56 58 57 String encoding() const; … … 77 76 private: 78 77 PassRefPtr<Document> createDocument(const KURL&); 79 void clear();80 78 81 79 Frame* m_frame; -
trunk/WebCore/loader/FrameLoader.cpp
r73392 r73436 179 179 , m_history(frame) 180 180 , m_notifer(frame) 181 , m_writer(frame) 181 182 , m_subframeLoader(frame) 182 183 , m_state(FrameStateCommittedPage) … … 232 233 m_provisionalDocumentLoader->setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String())); 233 234 m_provisionalDocumentLoader->finishedLoading(); 234 m_documentLoader->writer()->begin(KURL(), false);235 m_documentLoader->writer()->end();235 writer()->begin(KURL(), false); 236 writer()->end(); 236 237 m_frame->document()->cancelParsing(); 237 238 m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument); … … 592 593 // as some destructors might still try to access the document. 593 594 m_frame->setDocument(0); 595 writer()->clear(); 594 596 595 597 m_subframeLoader.clear(); … … 610 612 void FrameLoader::receivedFirstData() 611 613 { 612 activeDocumentLoader()->writer()->begin(m_workingURL, false);613 activeDocumentLoader()->writer()->setDocumentWasLoadedAsPartOfNavigation();614 writer()->begin(m_workingURL, false); 615 writer()->setDocumentWasLoadedAsPartOfNavigation(); 614 616 615 617 dispatchDidCommitLoad(); … … 2011 2013 } 2012 2014 2013 m_documentLoader->writer()->setMIMEType(dl->responseMIMEType());2015 writer()->setMIMEType(dl->responseMIMEType()); 2014 2016 2015 2017 // Tell the client we've committed this URL. … … 2147 2149 m_frame->domWindow()->setSecurityOrigin(document->securityOrigin()); 2148 2150 2151 writer()->setDecoder(document->decoder()); 2152 2149 2153 updateFirstPartyForCookies(); 2150 2154 … … 2239 2243 loader->setParsedArchiveData(mainResource->data()); 2240 2244 2241 loader->writer()->setMIMEType(mainResource->mimeType());2245 writer()->setMIMEType(mainResource->mimeType()); 2242 2246 2243 2247 closeURL(); … … 2247 2251 String userChosenEncoding = documentLoader()->overrideEncoding(); 2248 2252 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()); 2251 2255 } 2252 2256 … … 2672 2676 // For a newly opened frame with an empty URL, encoding() should not be used, because this methods asks decoder, which uses ISO-8859-1. 2673 2677 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()); 2675 2679 } 2676 2680 -
trunk/WebCore/loader/FrameLoader.h
r73392 r73436 33 33 34 34 #include "CachePolicy.h" 35 #include "DocumentWriter.h" 35 36 #include "FrameLoaderStateMachine.h" 36 37 #include "FrameLoaderTypes.h" … … 98 99 HistoryController* history() const { return &m_history; } 99 100 ResourceLoadNotifier* notifier() const { return &m_notifer; } 101 DocumentWriter* writer() const { return &m_writer; } 100 102 SubframeLoader* subframeLoader() const { return &m_subframeLoader; } 101 103 … … 426 428 mutable HistoryController m_history; 427 429 mutable ResourceLoadNotifier m_notifer; 430 mutable DocumentWriter m_writer; 428 431 mutable SubframeLoader m_subframeLoader; 429 432 mutable FrameLoaderStateMachine m_stateMachine; -
trunk/WebCore/loader/cache/CachedResourceLoader.cpp
r73392 r73436 407 407 String encoding; 408 408 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; 410 410 411 411 CachedResource* resource = requestResource(type, url, encoding, true); -
trunk/WebCore/platform/network/FormDataBuilder.cpp
r73392 r73436 95 95 } 96 96 97 return document->loader()->writer()->encoding(); 97 if (Frame* frame = document->frame()) 98 return frame->loader()->writer()->encoding(); 99 100 return Latin1Encoding(); 98 101 } 99 102 -
trunk/WebCore/svg/graphics/SVGImage.cpp
r73392 r73436 279 279 loader->policyChecker()->cancelCheck(); // cancel any policy checks 280 280 loader->commitProvisionalLoad(); 281 loader-> activeDocumentLoader()->writer()->setMIMEType("image/svg+xml");282 loader-> activeDocumentLoader()->writer()->begin(KURL()); // create the empty document283 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(); 285 285 frame->view()->setTransparent(true); // SVG Images are transparent. 286 286 } -
trunk/WebKit/chromium/ChangeLog
r73430 r73436 1 2010-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 1 24 2010-12-07 Kenichi Ishibashi <bashi@google.com> 2 25 -
trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp
r73392 r73436 227 227 // If it's not a link, an image, a media element, or an image/media link, 228 228 // 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(); 230 230 231 231 // Send the frame and page URLs in any case. -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r73392 r73436 1098 1098 // match the behavior on the Mac. 1099 1099 if (m_hasRepresentation) 1100 dl-> writer()->setEncoding("", false);1100 dl->frameLoader()->writer()->setEncoding("", false); 1101 1101 } 1102 1102 } -
trunk/WebKit/chromium/src/WebFrameImpl.cpp
r73392 r73436 546 546 WebString WebFrameImpl::encoding() const 547 547 { 548 return frame()-> document()->loader()->writer()->encoding();548 return frame()->loader()->writer()->encoding(); 549 549 } 550 550 … … 2272 2272 2273 2273 if (!m_frame->navigationScheduler()->locationChangePending()) 2274 m_frame-> document()->loader()->writer()->replaceDocument(scriptResult);2274 m_frame->loader()->writer()->replaceDocument(scriptResult); 2275 2275 } 2276 2276 -
trunk/WebKit/chromium/src/WebPageSerializerImpl.cpp
r73392 r73436 169 169 String xmlEncoding = param->document->xmlEncoding(); 170 170 if (xmlEncoding.isEmpty()) 171 xmlEncoding = param->document-> loader()->writer()->encoding();171 xmlEncoding = param->document->frame()->loader()->writer()->encoding(); 172 172 if (xmlEncoding.isEmpty()) 173 173 xmlEncoding = UTF8Encoding().name(); … … 506 506 didSerialization = true; 507 507 508 String encoding = document->loader()->writer()->encoding();508 String encoding = webFrame->frame()->loader()->writer()->encoding(); 509 509 const TextEncoding& textEncoding = encoding.isEmpty() ? UTF8Encoding() : TextEncoding(encoding); 510 510 String directoryName = url == mainURL ? m_localDirectoryName : ""; -
trunk/WebKit/chromium/src/WebSearchableFormData.cpp
r73430 r73436 62 62 return; 63 63 } 64 *encoding = TextEncoding(form->document()->loader()->writer()->encoding()); 64 const Frame* frame = form->document()->frame(); 65 *encoding = frame ? TextEncoding(frame->loader()->writer()->encoding()) : Latin1Encoding(); 65 66 } 66 67 -
trunk/WebKit/chromium/src/WebViewImpl.cpp
r73392 r73436 1432 1432 return WebString(); 1433 1433 1434 return m_page->mainFrame()-> document()->loader()->writer()->encoding();1434 return m_page->mainFrame()->loader()->writer()->encoding(); 1435 1435 } 1436 1436 -
trunk/WebKit/gtk/ChangeLog
r73392 r73436 1 2010-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 1 14 2010-12-06 Nate Chapin <japhet@chromium.org> 2 15 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r73392 r73436 1017 1017 void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader) 1018 1018 { 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 { 1022 1023 m_pluginView->didFinishLoading(); 1023 1024 m_pluginView = 0; -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r73392 r73436 4510 4510 { 4511 4511 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(); 4513 4513 if (encoding.isEmpty()) 4514 4514 return 0; -
trunk/WebKit/mac/ChangeLog
r73430 r73436 1 2010-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 1 12 2010-12-07 Kenichi Ishibashi <bashi@google.com> 2 13 -
trunk/WebKit/mac/WebView/WebFrame.mm
r73392 r73436 934 934 { 935 935 Frame* frame = _private->coreFrame; 936 String mimeType = frame-> document()->loader()->writer()->mimeType();936 String mimeType = frame->loader()->writer()->mimeType(); 937 937 PluginData* pluginData = frame->page() ? frame->page()->pluginData() : 0; 938 938 -
trunk/WebKit/qt/Api/qwebframe.cpp
r73392 r73436 704 704 { 705 705 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(); 708 708 load(absolute); 709 709 } -
trunk/WebKit/qt/ChangeLog
r73392 r73436 1 2010-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 1 14 2010-12-06 Nate Chapin <japhet@chromium.org> 2 15 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r73392 r73436 620 620 // match the behavior on the Mac. 621 621 if (m_hasRepresentation) 622 loader-> writer()->setEncoding("", false);622 loader->frameLoader()->writer()->setEncoding("", false); 623 623 return; 624 624 } -
trunk/WebKit/wince/ChangeLog
r73392 r73436 1 2010-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 1 12 2010-12-06 Nate Chapin <japhet@chromium.org> 2 13 -
trunk/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp
r73392 r73436 451 451 { 452 452 if (!m_pluginView) { 453 documentLoader->writer()->setEncoding(m_response.textEncodingName(), false); 453 FrameLoader* loader = documentLoader->frameLoader(); 454 loader->writer()->setEncoding(m_response.textEncodingName(), false); 454 455 return; 455 456 } -
trunk/WebKit/wx/ChangeLog
r73392 r73436 1 2010-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 1 12 2010-12-06 Nate Chapin <japhet@chromium.org> 2 13 -
trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
r73392 r73436 435 435 if (!m_pluginView) { 436 436 if (m_firstData) { 437 loader->writer()->setEncoding(m_response.textEncodingName(), false); 437 FrameLoader* fl = loader->frameLoader(); 438 fl->writer()->setEncoding(m_response.textEncodingName(), false); 438 439 m_firstData = false; 439 440 }
Note: See TracChangeset
for help on using the changeset viewer.