Changeset 57856 in webkit
- Timestamp:
- Apr 19, 2010 5:16:42 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 38 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r57848 r57856 82 82 * platform/chromium/fast/url/relative-win-expected.txt: Added. 83 83 * platform/chromium/test_expectations.txt: 84 85 2010-04-19 Dave Moore <davemoore@chromium.org>86 87 Reviewed by Dimitri Glazkov.88 89 Add test for icon change notifications.90 91 https://bugs.webkit.org/show_bug.cgi?id=3381292 93 * fast/dom/icon-url-property-expected.txt: Added.94 * fast/dom/icon-url-property.html: Added.95 * Skipped on all platforms but Win96 84 97 85 2010-04-19 Eric Carlson <eric.carlson@apple.com> -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r57838 r57856 2787 2787 BUG_JIANLI LINUX : http/tests/local/formdata/send-form-data-with-sliced-file.html = TEXT 2788 2788 2789 BUG33812 SKIP : fast/dom/icon-url-property.html = FAIL2790 2791 2789 // Failing with webkit roll 57659 -> 57677. 2792 2790 BUGAJWONG LINUX DEBUG : fast/canvas/toDataURL-noData.html = CRASH -
trunk/LayoutTests/platform/gtk/Skipped
r57823 r57856 2171 2171 fast/dom/focus-contenteditable.html 2172 2172 fast/dom/gc-10.html 2173 fast/dom/icon-url-property.html2174 2173 fast/dom/importNodeHTML.html 2175 2174 fast/dom/importNodeXML.xhtml -
trunk/LayoutTests/platform/mac/Skipped
r57823 r57856 159 159 editing/pasteboard/onpaste-text-html.html 160 160 fast/events/ondrop-text-html.html 161 162 # https://bugs.webkit.org/show_bug.cgi?id=33812163 fast/dom/icon-url-property.html -
trunk/LayoutTests/platform/qt/Skipped
r57823 r57856 2786 2786 fast/dom/HTMLTableElement/createCaption.html 2787 2787 fast/dom/HTMLTextAreaElement/reset-textarea.html 2788 fast/dom/icon-url-property.html2789 2788 fast/dom/importNodeHTML.html 2790 2789 fast/dom/importNodeXML.xhtml -
trunk/WebCore/ChangeLog
r57853 r57856 112 112 (WebCore::Settings::Settings): 113 113 * page/Settings.h: 114 115 2010-04-19 Dave Moore <davemoore@chromium.org>116 117 Reviewed by Dimitri Glazkov.118 119 Added notification when the favicons for a page are changed120 from a script.121 The Document object will notify the frame loader, which will122 notify the client. Implementations of FrameLoaderClient will123 have to add one method; dispatchDidChangeIcons().124 125 https://bugs.webkit.org/show_bug.cgi?id=33812126 127 Test: fast/dom/icon-url-property.html128 129 * dom/Document.cpp:130 (WebCore::Document::setIconURL):131 * loader/DocumentLoader.cpp:132 (WebCore::DocumentLoader::setIconURL):133 * loader/DocumentLoader.h:134 (WebCore::DocumentLoader::iconURL):135 * loader/EmptyClients.h:136 (WebCore::EmptyFrameLoaderClient::dispatchDidChangeIcons):137 * loader/FrameLoader.cpp:138 (WebCore::FrameLoader::setIconURL):139 (WebCore::FrameLoader::didChangeIcons):140 * loader/FrameLoader.h:141 * loader/FrameLoaderClient.h:142 114 143 115 2010-04-19 Dave Moore <davemoore@chromium.org> -
trunk/WebCore/dom/Document.cpp
r57823 r57856 4485 4485 else if (!type.isEmpty()) 4486 4486 m_iconURL = iconURL; 4487 if (Frame* f = frame())4488 f->loader()->setIconURL(m_iconURL);4489 4487 } 4490 4488 -
trunk/WebCore/loader/DocumentLoader.cpp
r57823 r57856 608 608 } 609 609 610 void DocumentLoader::setIconURL(const String& iconURL)611 {612 if (iconURL.isEmpty())613 return;614 615 if (m_pageIconURL != iconURL) {616 m_pageIconURL = iconURL;617 frameLoader()->didChangeIcons(this);618 }619 }620 621 610 KURL DocumentLoader::urlForHistory() const 622 611 { -
trunk/WebCore/loader/DocumentLoader.h
r57823 r57856 110 110 void setPrimaryLoadComplete(bool); 111 111 void setTitle(const String&); 112 void setIconURL(const String&);113 112 const String& overrideEncoding() const { return m_overrideEncoding; } 114 113 … … 152 151 void stopRecordingResponses(); 153 152 const String& title() const { return m_pageTitle; } 154 const String& iconURL() const { return m_pageIconURL; }155 153 156 154 KURL urlForHistory() const; … … 260 258 261 259 String m_pageTitle; 262 String m_pageIconURL;263 260 264 261 String m_overrideEncoding; -
trunk/WebCore/loader/EmptyClients.h
r57823 r57856 213 213 virtual void dispatchDidStartProvisionalLoad() { } 214 214 virtual void dispatchDidReceiveTitle(const String&) { } 215 virtual void dispatchDidChangeIcons() { }216 215 virtual void dispatchDidCommitLoad() { } 217 216 virtual void dispatchDidFailProvisionalLoad(const ResourceError&) { } -
trunk/WebCore/loader/FrameLoader.cpp
r57823 r57856 3973 3973 } 3974 3974 3975 void FrameLoader::setIconURL(const String& iconURL)3976 {3977 documentLoader()->setIconURL(iconURL);3978 }3979 3980 3975 KURL FrameLoader::originalRequestURL() const 3981 3976 { … … 4095 4090 } 4096 4091 4097 void FrameLoader::didChangeIcons(DocumentLoader* loader)4098 {4099 if (loader == m_documentLoader)4100 m_client->dispatchDidChangeIcons();4101 }4102 4103 4092 void FrameLoader::dispatchDidCommitLoad() 4104 4093 { -
trunk/WebCore/loader/FrameLoader.h
r57823 r57856 188 188 void willChangeTitle(DocumentLoader*); 189 189 void didChangeTitle(DocumentLoader*); 190 void didChangeIcons(DocumentLoader*);191 190 192 191 FrameLoadType loadType() const; … … 307 306 308 307 void setTitle(const String&); 309 void setIconURL(const String&);310 308 311 309 void commitProvisionalLoad(PassRefPtr<CachedPage>); -
trunk/WebCore/loader/FrameLoaderClient.h
r57823 r57856 127 127 virtual void dispatchDidStartProvisionalLoad() = 0; 128 128 virtual void dispatchDidReceiveTitle(const String& title) = 0; 129 virtual void dispatchDidChangeIcons() = 0;130 129 virtual void dispatchDidCommitLoad() = 0; 131 130 virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0; -
trunk/WebKit/chromium/ChangeLog
r57823 r57856 1 2010-04-19 Dave Moore <davemoore@chromium.org>2 3 Reviewed by Dimitri Glazkov.4 5 Added notification when the favicons for a page are changed6 from a script.7 The Document object will notify the frame loader, which will8 notify the client. Implementations of FrameLoaderClient will9 have to add one method; dispatchDidChangeIcons().10 11 https://bugs.webkit.org/show_bug.cgi?id=3381212 13 * public/WebFrameClient.h:14 (WebKit::WebFrameClient::didChangeIcons):15 * src/FrameLoaderClientImpl.cpp:16 (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):17 * src/FrameLoaderClientImpl.h:18 19 1 2010-04-19 Ada Chan <adachan@apple.com> 20 2 -
trunk/WebKit/chromium/public/WebFrameClient.h
r57823 r57856 193 193 virtual void didReceiveTitle(WebFrame*, const WebString& title) { } 194 194 195 // The icons for the page have changed.196 virtual void didChangeIcons(WebFrame*) { }197 198 195 // The frame's document finished loading. 199 196 virtual void didFinishDocumentLoad(WebFrame*) { } -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r57823 r57856 727 727 } 728 728 729 void FrameLoaderClientImpl::dispatchDidChangeIcons()730 {731 if (m_webFrame->client())732 m_webFrame->client()->didChangeIcons(m_webFrame);733 }734 735 729 void FrameLoaderClientImpl::dispatchDidCommitLoad() 736 730 { -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.h
r57823 r57856 103 103 virtual void dispatchDidStartProvisionalLoad(); 104 104 virtual void dispatchDidReceiveTitle(const WebCore::String& title); 105 virtual void dispatchDidChangeIcons();106 105 virtual void dispatchDidCommitLoad(); 107 106 virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&); -
trunk/WebKit/gtk/ChangeLog
r57823 r57856 1 2010-04-19 Dave Moore <davemoore@chromium.org>2 3 Reviewed by Dimitri Glazkov.4 5 Added notification when the favicons for a page are changed6 from a script.7 The Document object will notify the frame loader, which will8 notify the client. Implementations of FrameLoaderClient will9 have to add one method; dispatchDidChangeIcons().10 11 https://bugs.webkit.org/show_bug.cgi?id=3381212 13 * WebCoreSupport/FrameLoaderClientGtk.cpp:14 (WebKit::FrameLoaderClient::dispatchDidChangeIcons):15 * WebCoreSupport/FrameLoaderClientGtk.h:16 17 1 2010-04-19 Diego Escalante Urrelo <descalante@igalia.com> 18 2 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r57823 r57856 754 754 } 755 755 756 void FrameLoaderClient::dispatchDidChangeIcons()757 {758 notImplemented();759 }760 761 756 void FrameLoaderClient::dispatchDidCommitLoad() 762 757 { -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
r57823 r57856 83 83 virtual void dispatchDidStartProvisionalLoad(); 84 84 virtual void dispatchDidReceiveTitle(const WebCore::String&); 85 virtual void dispatchDidChangeIcons();86 85 virtual void dispatchDidCommitLoad(); 87 86 virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&); -
trunk/WebKit/mac/ChangeLog
r57823 r57856 1 2010-04-19 Dave Moore <davemoore@chromium.org>2 3 Reviewed by Dimitri Glazkov.4 5 Added notification when the favicons for a page are changed6 from a script.7 The Document object will notify the frame loader, which will8 notify the client. Implementations of FrameLoaderClient will9 have to add one method; dispatchDidChangeIcons().10 11 https://bugs.webkit.org/show_bug.cgi?id=3381212 13 * WebCoreSupport/WebFrameLoaderClient.h:14 * WebCoreSupport/WebFrameLoaderClient.mm:15 (WebFrameLoaderClient::dispatchDidChangeIcons):16 17 1 2010-04-19 Dan Bernstein <mitz@apple.com> 18 2 -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
r57823 r57856 100 100 virtual void dispatchDidStartProvisionalLoad(); 101 101 virtual void dispatchDidReceiveTitle(const WebCore::String& title); 102 virtual void dispatchDidChangeIcons();103 102 virtual void dispatchDidCommitLoad(); 104 103 virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&); -
trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r57823 r57856 594 594 } 595 595 596 void WebFrameLoaderClient::dispatchDidChangeIcons()597 {598 // FIXME: Implement this to allow container to update favicon.599 }600 601 596 void WebFrameLoaderClient::dispatchDidCommitLoad() 602 597 { -
trunk/WebKit/qt/ChangeLog
r57823 r57856 1 2010-04-19 Dave Moore <davemoore@chromium.org>2 3 Reviewed by Dimitri Glazkov.4 5 Added notification when the favicons for a page are changed6 from a script.7 The Document object will notify the frame loader, which will8 notify the client. Implementations of FrameLoaderClient will9 have to add one method; dispatchDidChangeIcons().10 11 https://bugs.webkit.org/show_bug.cgi?id=3381212 13 * WebCoreSupport/FrameLoaderClientQt.cpp:14 (WebCore::FrameLoaderClientQt::dispatchDidChangeIcons):15 (WebCore::FrameLoaderClientQt::didChangeTitle):16 * WebCoreSupport/FrameLoaderClientQt.h:17 18 1 2010-04-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 19 2 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r57823 r57856 382 382 383 383 384 void FrameLoaderClientQt::dispatchDidChangeIcons()385 {386 if (dumpFrameLoaderCallbacks)387 printf("%s - didChangeIcons\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));388 389 if (!m_webFrame)390 return;391 392 // FIXME: To be notified of changing icon URLS add notification393 // emit iconsChanged();394 }395 396 397 384 void FrameLoaderClientQt::dispatchDidCommitLoad() 398 385 { … … 539 526 540 527 541 void FrameLoaderClientQt::didChangeTitle(DocumentLoader *)528 void FrameLoaderClientQt::didChangeTitle(DocumentLoader *) 542 529 { 543 530 // no need for, dispatchDidReceiveTitle is the right callback -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
r57823 r57856 110 110 virtual void dispatchDidStartProvisionalLoad(); 111 111 virtual void dispatchDidReceiveTitle(const String& title); 112 virtual void dispatchDidChangeIcons();113 112 virtual void dispatchDidCommitLoad(); 114 113 virtual void dispatchDidFailProvisionalLoad(const ResourceError&); -
trunk/WebKit/win/ChangeLog
r57823 r57856 1 2010-04-19 Dave Moore <davemoore@chromium.org>2 3 Reviewed by Dimitri Glazkov.4 5 Added notification when the favicons for a page are changed6 from a script.7 The Document object will notify the frame loader, which will8 notify the client. Implementations of FrameLoaderClient will9 have to add one method; dispatchDidChangeIcons().10 11 https://bugs.webkit.org/show_bug.cgi?id=3381212 13 * Interfaces/IWebFrameLoadDelegatePrivate2.idl:14 * WebCoreSupport/WebFrameLoaderClient.cpp:15 (WebFrameLoaderClient::dispatchDidChangeIcons):16 * WebCoreSupport/WebFrameLoaderClient.h:17 * WebFrame.cpp:18 (WebFrame::didChangeIcons):19 * WebFrame.h:20 21 1 2010-04-16 Gavin Barraclough <barraclough@apple.com> 22 2 -
trunk/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate2.idl
r57823 r57856 53 53 HRESULT didReplaceStateWithinPageForFrame([in] IWebView* webView, [in] IWebFrame* frame); 54 54 HRESULT didPopStateWithinPageForFrame([in] IWebView* webView, [in] IWebFrame* frame); 55 HRESULT didChangeIcons([in] IWebView* webView, [in] IWebFrame* frame);56 57 55 } -
trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
r57823 r57856 373 373 } 374 374 375 void WebFrameLoaderClient::dispatchDidChangeIcons()376 {377 WebView* webView = m_webFrame->webView();378 COMPtr<IWebFrameLoadDelegatePrivate> frameLoadDelegatePriv;379 if (FAILED(webView->frameLoadDelegatePrivate(&frameLoadDelegatePriv)) || !frameLoadDelegatePriv)380 return;381 382 COMPtr<IWebFrameLoadDelegatePrivate2> frameLoadDelegatePriv2(Query, frameLoadDelegatePriv);383 if (!frameLoadDelegatePriv2)384 return;385 386 frameLoadDelegatePriv2->didChangeIcons(webView, m_webFrame);387 }388 389 375 void WebFrameLoaderClient::dispatchDidCommitLoad() 390 376 { -
trunk/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
r57823 r57856 72 72 virtual void dispatchDidStartProvisionalLoad(); 73 73 virtual void dispatchDidReceiveTitle(const WebCore::String&); 74 virtual void dispatchDidChangeIcons();75 74 virtual void dispatchDidCommitLoad(); 76 75 virtual void dispatchDidFinishDocumentLoad(); -
trunk/WebKit/win/WebFrame.cpp
r57823 r57856 1545 1545 } 1546 1546 1547 void WebFrame::didChangeIcons(DocumentLoader*)1548 {1549 notImplemented();1550 }1551 1552 1547 bool WebFrame::canHandleRequest(const ResourceRequest& request) const 1553 1548 { -
trunk/WebKit/win/WebFrame.h
r57823 r57856 292 292 virtual void willChangeTitle(WebCore::DocumentLoader*); 293 293 virtual void didChangeTitle(WebCore::DocumentLoader*); 294 virtual void didChangeIcons(WebCore::DocumentLoader*);295 294 virtual bool canHandleRequest(const WebCore::ResourceRequest&) const; 296 295 virtual bool canShowMIMEType(const WebCore::String& MIMEType) const; -
trunk/WebKitTools/ChangeLog
r57855 r57856 198 198 prohibit perl from parsing the arguments to exec() via the shell, 199 199 which would incorrectly split paths with spaces in them, etc. 200 201 2010-04-19 Dave Moore <davemoore@chromium.org>202 203 Reviewed by Dimitri Glazkov.204 205 Add test support for icon changes.206 207 https://bugs.webkit.org/show_bug.cgi?id=33812208 209 * DumpRenderTree/LayoutTestController.cpp:210 (LayoutTestController::LayoutTestController):211 (dumpIconChangesCallback):212 (LayoutTestController::staticFunctions):213 * DumpRenderTree/LayoutTestController.h:214 (LayoutTestController::dumpIconChanges):215 (LayoutTestController::setDumpIconChanges):216 * DumpRenderTree/win/FrameLoadDelegate.cpp:217 (FrameLoadDelegate::didChangeIcons):218 * DumpRenderTree/win/FrameLoadDelegate.h:219 * WinLauncher/WinLauncher.h:220 (WinLauncherWebHost::didChangeIcons):221 200 222 201 2010-04-19 Dimitri Glazkov <dglazkov@chromium.org> -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp
r57823 r57856 57 57 , m_dumpStatusCallbacks(false) 58 58 , m_dumpTitleChanges(false) 59 , m_dumpIconChanges(false)60 59 , m_dumpVisitedLinksCallback(false) 61 60 , m_dumpWillCacheResponse(false) … … 186 185 LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); 187 186 controller->setDumpTitleChanges(true); 188 return JSValueMakeUndefined(context);189 }190 191 static JSValueRef dumpIconChangesCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)192 {193 LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));194 controller->setDumpIconChanges(true);195 187 return JSValueMakeUndefined(context); 196 188 } … … 1499 1491 { "dumpStatusCallbacks", dumpStatusCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1500 1492 { "dumpTitleChanges", dumpTitleChangesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1501 { "dumpIconChanges", dumpIconChangesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },1502 1493 { "dumpWillCacheResponse", dumpWillCacheResponseCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1503 1494 { "elementDoesAutoCompleteForElementWithId", elementDoesAutoCompleteForElementWithIdCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.h
r57823 r57856 157 157 void setDumpTitleChanges(bool dumpTitleChanges) { m_dumpTitleChanges = dumpTitleChanges; } 158 158 159 bool dumpIconChanges() const { return m_dumpIconChanges; }160 void setDumpIconChanges(bool dumpIconChanges) { m_dumpIconChanges = dumpIconChanges; }161 162 159 bool dumpVisitedLinksCallback() const { return m_dumpVisitedLinksCallback; } 163 160 void setDumpVisitedLinksCallback(bool dumpVisitedLinksCallback) { m_dumpVisitedLinksCallback = dumpVisitedLinksCallback; } … … 277 274 bool m_dumpStatusCallbacks; 278 275 bool m_dumpTitleChanges; 279 bool m_dumpIconChanges;280 276 bool m_dumpVisitedLinksCallback; 281 277 bool m_dumpWillCacheResponse; -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
r57823 r57856 190 190 } 191 191 192 HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didChangeIcons(193 /* [in] */ IWebView* webView,194 /* [in] */ IWebFrame* frame)195 {196 if (!done && gLayoutTestController->dumpIconChanges())197 printf("%s - didChangeIcons\n", descriptionSuitableForTestResult(frame).c_str());198 199 return S_OK;200 }201 202 192 void FrameLoadDelegate::processWork() 203 193 { -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
r57823 r57856 73 73 /* [in] */ IWebView *webView, 74 74 /* [in] */ BSTR title, 75 /* [in] */ IWebFrame *frame);76 77 virtual HRESULT STDMETHODCALLTYPE didChangeIcons(78 /* [in] */ IWebView *webView,79 75 /* [in] */ IWebFrame *frame); 80 76 -
trunk/WebKitTools/WinLauncher/WinLauncher.h
r57823 r57856 62 62 /* [in] */ IWebFrame *frame) { return S_OK; } 63 63 64 virtual HRESULT STDMETHODCALLTYPE didChangeIcons(65 /* [in] */ IWebView *webView,66 /* [in] */ IWebFrame *frame) { return S_OK; }67 68 64 virtual HRESULT STDMETHODCALLTYPE didReceiveIcon( 69 65 /* [in] */ IWebView *webView,
Note: See TracChangeset
for help on using the changeset viewer.