Skip to content
Permalink
Browse files
Roll out r57823.
It adds methods to IWebFrameLoadDelegatePrivate2, a delegate interface that is implemented
by shipping clients of WebKit on Windows.  Adding methods to a delegate interface in this
manner breaks ABI compatibility and leads to crashes or other unexpected behavior when the
methods are used.

Canonical link: https://commits.webkit.org/49137@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@57856 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
bdash committed Apr 20, 2010
1 parent 34c48db commit 20d89bf64c085976927971a84e033c0d4bb6523b
Showing 40 changed files with 1 addition and 333 deletions.
@@ -82,18 +82,6 @@
* platform/chromium/fast/url/relative-win-expected.txt: Added.
* platform/chromium/test_expectations.txt:

2010-04-19 Dave Moore <davemoore@chromium.org>

Reviewed by Dimitri Glazkov.

Add test for icon change notifications.

https://bugs.webkit.org/show_bug.cgi?id=33812

* fast/dom/icon-url-property-expected.txt: Added.
* fast/dom/icon-url-property.html: Added.
* Skipped on all platforms but Win

2010-04-19 Eric Carlson <eric.carlson@apple.com>

Reviewed by Simon Fraser.

This file was deleted.

This file was deleted.

@@ -2786,8 +2786,6 @@ BUG41455 SKIP : http/tests/security/local-image-from-remote-whitelisted.html = T
// Caused by r57695. Will investigate.
BUG_JIANLI LINUX : http/tests/local/formdata/send-form-data-with-sliced-file.html = TEXT

BUG33812 SKIP : fast/dom/icon-url-property.html = FAIL

// Failing with webkit roll 57659 -> 57677.
BUGAJWONG LINUX DEBUG : fast/canvas/toDataURL-noData.html = CRASH
BUGAJWONG WIN LINUX : fast/backgrounds/svg-as-background-1.html = IMAGE PASS
@@ -2170,7 +2170,6 @@ fast/dom/dom-parse-serialize-display.html
fast/dom/dom-parse-serialize.html
fast/dom/focus-contenteditable.html
fast/dom/gc-10.html
fast/dom/icon-url-property.html
fast/dom/importNodeHTML.html
fast/dom/importNodeXML.xhtml
fast/dom/inner-text.html
@@ -158,6 +158,3 @@ fast/overflow/scrollbar-restored-and-then-locked.html
# Mac port doesn't put text/html on the pasteboard for app compatibility: https://bugs.webkit.org/show_bug.cgi?id=19893
editing/pasteboard/onpaste-text-html.html
fast/events/ondrop-text-html.html

# https://bugs.webkit.org/show_bug.cgi?id=33812
fast/dom/icon-url-property.html
@@ -2785,7 +2785,6 @@ fast/dom/HTMLStyleElement/insert-parser-generated.html
fast/dom/HTMLTableElement/colSpan.html
fast/dom/HTMLTableElement/createCaption.html
fast/dom/HTMLTextAreaElement/reset-textarea.html
fast/dom/icon-url-property.html
fast/dom/importNodeHTML.html
fast/dom/importNodeXML.xhtml
fast/dom/inner-text.html
@@ -140,34 +140,6 @@
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:

2010-04-19 Dave Moore <davemoore@chromium.org>

Reviewed by Dimitri Glazkov.

Added notification when the favicons for a page are changed
from a script.
The Document object will notify the frame loader, which will
notify the client. Implementations of FrameLoaderClient will
have to add one method; dispatchDidChangeIcons().

https://bugs.webkit.org/show_bug.cgi?id=33812

Test: fast/dom/icon-url-property.html

* dom/Document.cpp:
(WebCore::Document::setIconURL):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::setIconURL):
* loader/DocumentLoader.h:
(WebCore::DocumentLoader::iconURL):
* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::dispatchDidChangeIcons):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::setIconURL):
(WebCore::FrameLoader::didChangeIcons):
* loader/FrameLoader.h:
* loader/FrameLoaderClient.h:

2010-04-19 Ada Chan <adachan@apple.com>

Reviewed by Jeremy Orlow.
@@ -4484,8 +4484,6 @@ void Document::setIconURL(const String& iconURL, const String& type)
m_iconURL = iconURL;
else if (!type.isEmpty())
m_iconURL = iconURL;
if (Frame* f = frame())
f->loader()->setIconURL(m_iconURL);
}

void Document::setUseSecureKeyboardEntryWhenActive(bool usesSecureKeyboard)
@@ -607,17 +607,6 @@ void DocumentLoader::setTitle(const String& title)
}
}

void DocumentLoader::setIconURL(const String& iconURL)
{
if (iconURL.isEmpty())
return;

if (m_pageIconURL != iconURL) {
m_pageIconURL = iconURL;
frameLoader()->didChangeIcons(this);
}
}

KURL DocumentLoader::urlForHistory() const
{
// Return the URL to be used for history and B/F list.
@@ -109,7 +109,6 @@ namespace WebCore {
bool isLoadingInAPISense() const;
void setPrimaryLoadComplete(bool);
void setTitle(const String&);
void setIconURL(const String&);
const String& overrideEncoding() const { return m_overrideEncoding; }

#if PLATFORM(MAC)
@@ -151,7 +150,6 @@ namespace WebCore {

void stopRecordingResponses();
const String& title() const { return m_pageTitle; }
const String& iconURL() const { return m_pageIconURL; }

KURL urlForHistory() const;
bool urlForHistoryReflectsFailure() const;
@@ -259,7 +257,6 @@ namespace WebCore {
bool m_isClientRedirect;

String m_pageTitle;
String m_pageIconURL;

String m_overrideEncoding;

@@ -212,7 +212,6 @@ class EmptyFrameLoaderClient : public FrameLoaderClient, public Noncopyable {
virtual void dispatchDidReceiveIcon() { }
virtual void dispatchDidStartProvisionalLoad() { }
virtual void dispatchDidReceiveTitle(const String&) { }
virtual void dispatchDidChangeIcons() { }
virtual void dispatchDidCommitLoad() { }
virtual void dispatchDidFailProvisionalLoad(const ResourceError&) { }
virtual void dispatchDidFailLoad(const ResourceError&) { }
@@ -3972,11 +3972,6 @@ void FrameLoader::setTitle(const String& title)
documentLoader()->setTitle(title);
}

void FrameLoader::setIconURL(const String& iconURL)
{
documentLoader()->setIconURL(iconURL);
}

KURL FrameLoader::originalRequestURL() const
{
return activeDocumentLoader()->originalRequest().url();
@@ -4094,12 +4089,6 @@ void FrameLoader::didChangeTitle(DocumentLoader* loader)
}
}

void FrameLoader::didChangeIcons(DocumentLoader* loader)
{
if (loader == m_documentLoader)
m_client->dispatchDidChangeIcons();
}

void FrameLoader::dispatchDidCommitLoad()
{
if (m_creatingInitialEmptyDocument)
@@ -187,7 +187,6 @@ class FrameLoader : public Noncopyable {
bool subframeIsLoading() const;
void willChangeTitle(DocumentLoader*);
void didChangeTitle(DocumentLoader*);
void didChangeIcons(DocumentLoader*);

FrameLoadType loadType() const;
CachePolicy subresourceCachePolicy() const;
@@ -306,7 +305,6 @@ class FrameLoader : public Noncopyable {
void cancelAndClear();

void setTitle(const String&);
void setIconURL(const String&);

void commitProvisionalLoad(PassRefPtr<CachedPage>);
bool isLoadingFromCachedPage() const { return m_loadingFromCachedPage; }
@@ -126,7 +126,6 @@ namespace WebCore {
virtual void dispatchDidReceiveIcon() = 0;
virtual void dispatchDidStartProvisionalLoad() = 0;
virtual void dispatchDidReceiveTitle(const String& title) = 0;
virtual void dispatchDidChangeIcons() = 0;
virtual void dispatchDidCommitLoad() = 0;
virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0;
virtual void dispatchDidFailLoad(const ResourceError&) = 0;
@@ -1,21 +1,3 @@
2010-04-19 Dave Moore <davemoore@chromium.org>

Reviewed by Dimitri Glazkov.

Added notification when the favicons for a page are changed
from a script.
The Document object will notify the frame loader, which will
notify the client. Implementations of FrameLoaderClient will
have to add one method; dispatchDidChangeIcons().

https://bugs.webkit.org/show_bug.cgi?id=33812

* public/WebFrameClient.h:
(WebKit::WebFrameClient::didChangeIcons):
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
* src/FrameLoaderClientImpl.h:

2010-04-19 Ada Chan <adachan@apple.com>

Reviewed by Jeremy Orlow.
@@ -192,9 +192,6 @@ class WebFrameClient {
// The page title is available.
virtual void didReceiveTitle(WebFrame*, const WebString& title) { }

// The icons for the page have changed.
virtual void didChangeIcons(WebFrame*) { }

// The frame's document finished loading.
virtual void didFinishDocumentLoad(WebFrame*) { }

@@ -726,12 +726,6 @@ void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title)
m_webFrame->client()->didReceiveTitle(m_webFrame, title);
}

void FrameLoaderClientImpl::dispatchDidChangeIcons()
{
if (m_webFrame->client())
m_webFrame->client()->didChangeIcons(m_webFrame);
}

void FrameLoaderClientImpl::dispatchDidCommitLoad()
{
WebViewImpl* webview = m_webFrame->viewImpl();
@@ -102,7 +102,6 @@ class FrameLoaderClientImpl : public WebCore::FrameLoaderClient {
virtual void dispatchDidReceiveIcon();
virtual void dispatchDidStartProvisionalLoad();
virtual void dispatchDidReceiveTitle(const WebCore::String& title);
virtual void dispatchDidChangeIcons();
virtual void dispatchDidCommitLoad();
virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
@@ -1,19 +1,3 @@
2010-04-19 Dave Moore <davemoore@chromium.org>

Reviewed by Dimitri Glazkov.

Added notification when the favicons for a page are changed
from a script.
The Document object will notify the frame loader, which will
notify the client. Implementations of FrameLoaderClient will
have to add one method; dispatchDidChangeIcons().

https://bugs.webkit.org/show_bug.cgi?id=33812

* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::dispatchDidChangeIcons):
* WebCoreSupport/FrameLoaderClientGtk.h:

2010-04-19 Diego Escalante Urrelo <descalante@igalia.com>

Reviewed by Xan Lopez.
@@ -753,11 +753,6 @@ void FrameLoaderClient::dispatchDidReceiveTitle(const String& title)
}
}

void FrameLoaderClient::dispatchDidChangeIcons()
{
notImplemented();
}

void FrameLoaderClient::dispatchDidCommitLoad()
{
if (m_loadingErrorPage)
@@ -82,7 +82,6 @@ namespace WebKit {
virtual void dispatchDidReceiveIcon();
virtual void dispatchDidStartProvisionalLoad();
virtual void dispatchDidReceiveTitle(const WebCore::String&);
virtual void dispatchDidChangeIcons();
virtual void dispatchDidCommitLoad();
virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
@@ -1,19 +1,3 @@
2010-04-19 Dave Moore <davemoore@chromium.org>

Reviewed by Dimitri Glazkov.

Added notification when the favicons for a page are changed
from a script.
The Document object will notify the frame loader, which will
notify the client. Implementations of FrameLoaderClient will
have to add one method; dispatchDidChangeIcons().

https://bugs.webkit.org/show_bug.cgi?id=33812

* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidChangeIcons):

2010-04-19 Dan Bernstein <mitz@apple.com>

Reviewed by Sam Weinig.
@@ -99,7 +99,6 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void dispatchDidReceiveIcon();
virtual void dispatchDidStartProvisionalLoad();
virtual void dispatchDidReceiveTitle(const WebCore::String& title);
virtual void dispatchDidChangeIcons();
virtual void dispatchDidCommitLoad();
virtual void dispatchDidFailProvisionalLoad(const WebCore::ResourceError&);
virtual void dispatchDidFailLoad(const WebCore::ResourceError&);
@@ -593,11 +593,6 @@ static inline void applyAppleDictionaryApplicationQuirk(WebFrameLoaderClient* cl
CallFrameLoadDelegate(implementations->didReceiveTitleForFrameFunc, webView, @selector(webView:didReceiveTitle:forFrame:), (NSString *)title, m_webFrame.get());
}

void WebFrameLoaderClient::dispatchDidChangeIcons()
{
// FIXME: Implement this to allow container to update favicon.
}

void WebFrameLoaderClient::dispatchDidCommitLoad()
{
// Tell the client we've committed this URL.

0 comments on commit 20d89bf

Please sign in to comment.