Changeset 69549 in webkit


Ignore:
Timestamp:
Oct 11, 2010 6:31:15 PM (14 years ago)
Author:
andersca@apple.com
Message:

Remove WebIconFetcher from WebKit and IconFetcher from WebCore
​https://bugs.webkit.org/show_bug.cgi?id=47523

Reviewed by Darin Adler.

WebCore:

Remove all traces of the WebCore IconFetcher class. It's SPI that nobody uses.

  • GNUmakefile.am:
  • WebCore.exp.in:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • loader/icon/IconFetcher.cpp: Removed.
  • loader/icon/IconFetcher.h: Removed.

WebKit:

Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.

  • WebKit.xcodeproj/project.pbxproj:

WebKit/mac:

Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.

  • Misc/WebIconFetcher.h: Removed.
  • Misc/WebIconFetcher.mm: Removed.
  • Misc/WebIconFetcherInternal.h: Removed.
  • WebView/WebFrame.mm:
  • WebView/WebFramePrivate.h:

WebKit/win:

Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.

  • Interfaces/IWebFramePrivate.idl:
  • Interfaces/IWebIconFetcher.idl: Removed.
  • Interfaces/WebKit.idl:
  • WebFrame.cpp:

(WebFrame::unused1):

  • WebFrame.h:
  • WebIconFetcher.cpp: Removed.
  • WebIconFetcher.h: Removed.
  • WebKit.vcproj/Interfaces.vcproj:
  • WebKit.vcproj/WebKit.vcproj:
Location:
trunk
Files:
8 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r69548 r69549  
     12010-10-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove WebIconFetcher from WebKit and IconFetcher from WebCore
     6        https://bugs.webkit.org/show_bug.cgi?id=47523
     7
     8        Remove all traces of the WebCore IconFetcher class. It's SPI that nobody uses.
     9
     10        * GNUmakefile.am:
     11        * WebCore.exp.in:
     12        * WebCore.gyp/WebCore.gyp:
     13        * WebCore.gypi:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * loader/icon/IconFetcher.cpp: Removed.
     17        * loader/icon/IconFetcher.h: Removed.
     18
    1192010-10-11  Jia Pu  <jpu@apple.com>
    220

  • trunk/WebCore/GNUmakefile.am

    r69452 r69549  
    19221922        WebCore/loader/icon/IconDatabase.h \
    19231923        WebCore/loader/icon/IconDatabaseNone.cpp \
    1924         WebCore/loader/icon/IconFetcher.h \
    19251924        WebCore/loader/icon/IconLoader.cpp \
    19261925        WebCore/loader/icon/IconLoader.h \

  • trunk/WebCore/WebCore.exp.in

    r69545 r69549  
    201201__ZN7WebCore11HistoryItemC1Ev
    202202__ZN7WebCore11HistoryItemD1Ev
    203 __ZN7WebCore11IconFetcher6cancelEv
    204 __ZN7WebCore11IconFetcher6createEPNS_5FrameEPNS_17IconFetcherClientE
    205203__ZN7WebCore11RenderLayer19scrollRectToVisibleERKNS_7IntRectEbRKNS_15ScrollAlignmentES6_
    206204__ZN7WebCore11globalPointERK8_NSPointP8NSWindow

  • trunk/WebCore/WebCore.gyp/WebCore.gyp

    r68615 r69549  
    12791279        # compile.
    12801280        ['exclude', 'dom/StaticStringList\\.cpp$'],
    1281         ['exclude', 'loader/icon/IconFetcher\\.cpp$'],
    12821281        ['exclude', 'loader/UserStyleSheetLoader\\.cpp$'],
    12831282

  • trunk/WebCore/WebCore.gypi

    r69284 r69549  
    19831983            'loader/icon/IconDatabaseClient.h',
    19841984            'loader/icon/IconDatabaseNone.cpp',
    1985             'loader/icon/IconFetcher.cpp',
    1986             'loader/icon/IconFetcher.h',
    19871985            'loader/icon/IconLoader.cpp',
    19881986            'loader/icon/IconLoader.h',

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r69404 r69549  
    2400724007                                </File>
    2400824008                                <File
    24009                                         RelativePath="..\loader\icon\IconFetcher.cpp"
    24010                                         >
    24011                                 </File>
    24012                                 <File
    24013                                         RelativePath="..\loader\icon\IconFetcher.h"
    24014                                         >
    24015                                 </File>
    24016                                 <File
    2401724009                                        RelativePath="..\loader\icon\IconLoader.cpp"
    2401824010                                        >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r69516 r69549  
    380380                1A2AAC590DC2A3B100A20D9A /* ApplicationCacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2AAC570DC2A3B100A20D9A /* ApplicationCacheStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
    381381                1A2C40AB0DEB55AA005AF19E /* JSTextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2C40AA0DEB55AA005AF19E /* JSTextCustom.cpp */; };
    382                 1A2D753D0DE47FAB00F0A648 /* IconFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D753B0DE47FAB00F0A648 /* IconFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
    383                 1A2D753E0DE47FAB00F0A648 /* IconFetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D753C0DE47FAB00F0A648 /* IconFetcher.cpp */; };
    384382                1A2E6E590CC55213004A2062 /* SQLValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2E6E570CC55213004A2062 /* SQLValue.cpp */; };
    385383                1A2E6E5A0CC55213004A2062 /* SQLValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2E6E580CC55213004A2062 /* SQLValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    63686366                1A2AAC570DC2A3B100A20D9A /* ApplicationCacheStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCacheStorage.h; sourceTree = "<group>"; };
    63696367                1A2C40AA0DEB55AA005AF19E /* JSTextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextCustom.cpp; sourceTree = "<group>"; };
    6370                 1A2D753B0DE47FAB00F0A648 /* IconFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconFetcher.h; sourceTree = "<group>"; };
    6371                 1A2D753C0DE47FAB00F0A648 /* IconFetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconFetcher.cpp; sourceTree = "<group>"; };
    63726368                1A2E6E570CC55213004A2062 /* SQLValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SQLValue.cpp; path = sql/SQLValue.cpp; sourceTree = "<group>"; };
    63736369                1A2E6E580CC55213004A2062 /* SQLValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLValue.h; path = sql/SQLValue.h; sourceTree = "<group>"; };
    … …  
    1266912665                                51E1ECB80C91C90400DC255B /* IconDatabaseClient.h */,
    1267012666                                445C8DB610015FC90031531A /* IconDatabaseNone.cpp */,
    12671                                 1A2D753C0DE47FAB00F0A648 /* IconFetcher.cpp */,
    12672                                 1A2D753B0DE47FAB00F0A648 /* IconFetcher.h */,
    1267312667                                513F14510AB634C400094DDF /* IconLoader.cpp */,
    1267412668                                513F14520AB634C400094DDF /* IconLoader.h */,
    … …  
    1959319587                                5126E6BC0A2E3B12005C29FA /* IconDatabase.h in Headers */,
    1959419588                                51E1ECBE0C91C90400DC255B /* IconDatabaseClient.h in Headers */,
    19595                                 1A2D753D0DE47FAB00F0A648 /* IconFetcher.h in Headers */,
    1959619589                                513F14540AB634C400094DDF /* IconLoader.h in Headers */,
    1959719590                                51E1ECC10C91C90400DC255B /* IconRecord.h in Headers */,
    … …  
    2217922172                                5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */,
    2218022173                                445C8DB710015FC90031531A /* IconDatabaseNone.cpp in Sources */,
    22181                                 1A2D753E0DE47FAB00F0A648 /* IconFetcher.cpp in Sources */,
    2218222174                                513F14530AB634C400094DDF /* IconLoader.cpp in Sources */,
    2218322175                                B275358E0B053A66002CE64F /* IconMac.mm in Sources */,

  • trunk/WebKit/ChangeLog

    r69415 r69549  
     12010-10-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove WebIconFetcher from WebKit and IconFetcher from WebCore
     6        https://bugs.webkit.org/show_bug.cgi?id=47523
     7
     8        Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.
     9
     10        * WebKit.xcodeproj/project.pbxproj:
     11
    1122010-10-07  Jessie Berlin  <jberlin@apple.com>
    213

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r69415 r69549  
    3030                14D825300AF955090004F057 /* WebChromeClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14D8252E0AF955090004F057 /* WebChromeClient.mm */; };
    3131                1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A20D08A0ED384F20043FA9F /* QuartzCore.framework */; };
    32                 1A2D754D0DE480B900F0A648 /* WebIconFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D754B0DE480B900F0A648 /* WebIconFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
    33                 1A2D754E0DE480B900F0A648 /* WebIconFetcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D754C0DE480B900F0A648 /* WebIconFetcher.mm */; };
    34                 1A2D75500DE4810E00F0A648 /* WebIconFetcherInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D754F0DE4810E00F0A648 /* WebIconFetcherInternal.h */; };
    3532                1A2DBE9F0F251E3A0036F8A6 /* ProxyInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */; };
    3633                1A2DBEA00F251E3A0036F8A6 /* ProxyInstance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */; };
    … …  
    407404                14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
    408405                1A20D08A0ED384F20043FA9F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
    409                 1A2D754B0DE480B900F0A648 /* WebIconFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconFetcher.h; sourceTree = "<group>"; };
    410                 1A2D754C0DE480B900F0A648 /* WebIconFetcher.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebIconFetcher.mm; sourceTree = "<group>"; };
    411                 1A2D754F0DE4810E00F0A648 /* WebIconFetcherInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconFetcherInternal.h; sourceTree = "<group>"; };
    412406                1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; };
    413407                1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; };
    … …  
    953947                                9304B2FF0B02341500F7850D /* WebIconDatabaseInternal.h */,
    954948                                F528E3EB031E91AD01CA2ACA /* WebIconDatabasePrivate.h */,
    955                                 1A2D754B0DE480B900F0A648 /* WebIconFetcher.h */,
    956                                 1A2D754C0DE480B900F0A648 /* WebIconFetcher.mm */,
    957                                 1A2D754F0DE4810E00F0A648 /* WebIconFetcherInternal.h */,
    958949                                2568C72C0174912D0ECA149E /* WebKit.h */,
    959950                                F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */,
    … …  
    15121503                                9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */,
    15131504                                939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */,
    1514                                 1A2D754D0DE480B900F0A648 /* WebIconFetcher.h in Headers */,
    1515                                 1A2D75500DE4810E00F0A648 /* WebIconFetcherInternal.h in Headers */,
    15161505                                5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */,
    15171506                                06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */,
    … …  
    19131902                                939810C10824BF01008DF038 /* WebIconDatabase.mm in Sources */,
    19141903                                51494CD70C7EBDE0004178C5 /* WebIconDatabaseClient.mm in Sources */,
    1915                                 1A2D754E0DE480B900F0A648 /* WebIconFetcher.mm in Sources */,
    19161904                                939810E30824BF01008DF038 /* WebImageRendererFactory.m in Sources */,
    19171905                                5D7BF8150C2A1D90008CE06D /* WebInspector.mm in Sources */,

  • trunk/WebKit/mac/ChangeLog

    r69524 r69549  
     12010-10-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove WebIconFetcher from WebKit and IconFetcher from WebCore
     6        https://bugs.webkit.org/show_bug.cgi?id=47523
     7
     8        Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.
     9
     10        * Misc/WebIconFetcher.h: Removed.
     11        * Misc/WebIconFetcher.mm: Removed.
     12        * Misc/WebIconFetcherInternal.h: Removed.
     13        * WebView/WebFrame.mm:
     14        * WebView/WebFramePrivate.h:
     15
    1162010-10-11  Jessie Berlin  <jberlin@apple.com>
    217

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

    r67362 r69549  
    4545#import "WebHTMLView.h"
    4646#import "WebHTMLViewInternal.h"
    47 #import "WebIconFetcherInternal.h"
    4847#import "WebKitStatisticsPrivate.h"
    4948#import "WebKitVersionChecks.h"
    … …  
    10091008}
    10101009
    1011 - (WebIconFetcher *)fetchApplicationIcon:(id)target
    1012                                 selector:(SEL)selector
    1013 {
    1014     return [WebIconFetcher _fetchApplicationIconForFrame:self
    1015                                                   target:target
    1016                                                 selector:selector];
    1017 }
    1018 
    10191010- (void)_setIsDisconnected:(bool)isDisconnected
    10201011{

  • trunk/WebKit/mac/WebView/WebFramePrivate.h

    r66721 r69549  
    3939@class DOMNode;
    4040@class DOMRange;
    41 @class WebIconFetcher;
    4241@class WebScriptObject;
    4342@class WebScriptWorld;
    … …  
    8786
    8887- (unsigned)_pendingFrameUnloadEventCount;
    89 
    90 - (WebIconFetcher *)fetchApplicationIcon:(id)target
    91                                 selector:(SEL)selector;
    9288
    9389- (void)_setIsDisconnected:(bool)isDisconnected;

  • trunk/WebKit/win/ChangeLog

    r69524 r69549  
     12010-10-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Remove WebIconFetcher from WebKit and IconFetcher from WebCore
     6        https://bugs.webkit.org/show_bug.cgi?id=47523
     7
     8        Remove all traces of the WebKit WebIconFetcher class. It's SPI that nobody uses.
     9
     10        * Interfaces/IWebFramePrivate.idl:
     11        * Interfaces/IWebIconFetcher.idl: Removed.
     12        * Interfaces/WebKit.idl:
     13        * WebFrame.cpp:
     14        (WebFrame::unused1):
     15        * WebFrame.h:
     16        * WebIconFetcher.cpp: Removed.
     17        * WebIconFetcher.h: Removed.
     18        * WebKit.vcproj/Interfaces.vcproj:
     19        * WebKit.vcproj/WebKit.vcproj:
     20
    1212010-10-11  Jessie Berlin  <jberlin@apple.com>
    222

  • trunk/WebKit/win/Interfaces/IWebFramePrivate.idl

    r67497 r69549  
    3131
    3232interface IWebFrame;
    33 interface IWebIconFetcher;
    34 interface IWebIconFetcherDelegate;
    3533interface IWebScriptWorld;
    3634
    … …  
    8280    HRESULT pendingFrameUnloadEventCount([out, retval] UINT* result);
    8381
    84     HRESULT fetchApplicationIcon([in] IWebIconFetcherDelegate* delegate, [out, retval] IWebIconFetcher** result);
     82    HRESULT unused1();
    8583
    8684    HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE deviceContext);

  • trunk/WebKit/win/Interfaces/WebKit.idl

    r69415 r69549  
    101101#include "IWebHistoryPrivate.idl"
    102102#include "IWebIconDatabase.idl"
    103 #include "IWebIconFetcher.idl"
    104103#include "IWebInspector.idl"
    105104#include "IWebInspectorPrivate.idl"

  • trunk/WebKit/win/WebFrame.cpp

    r68384 r69549  
    4747#include "WebHistory.h"
    4848#include "WebHistoryItem.h"
    49 #include "WebIconFetcher.h"
    5049#include "WebKit.h"
    5150#include "WebKitStatisticsPrivate.h"
    … …  
    10161015}
    10171016
    1018 HRESULT STDMETHODCALLTYPE WebFrame::fetchApplicationIcon(
    1019     /* [in] */ IWebIconFetcherDelegate *delegate,
    1020     /* [retval][out] */ IWebIconFetcher **result)
    1021 {
    1022     if (!result)
    1023         return E_POINTER;
    1024 
    1025     *result = 0;
    1026 
    1027     if (!delegate)
    1028         return E_FAIL;
    1029 
    1030     Frame* coreFrame = core(this);
    1031     if (!coreFrame)
    1032         return E_FAIL;
    1033 
    1034     *result = WebIconFetcher::fetchApplicationIcon(coreFrame, delegate);
    1035     if (!*result)
    1036         return E_FAIL;
    1037 
    1038     return S_OK;
     1017HRESULT STDMETHODCALLTYPE WebFrame::unused1()
     1018{
     1019    return E_NOTIMPL;
    10391020}
    10401021

  • trunk/WebKit/win/WebFrame.h

    r67497 r69549  
    188188        /* [retval][out] */ UINT* result);
    189189
    190     virtual HRESULT STDMETHODCALLTYPE fetchApplicationIcon(
    191         /* [in] */ IWebIconFetcherDelegate *delegate,
    192         /* [retval][out] */ IWebIconFetcher **result);
     190    virtual HRESULT STDMETHODCALLTYPE unused1();
    193191   
    194192    virtual HRESULT STDMETHODCALLTYPE setInPrintingMode(

  • trunk/WebKit/win/WebKit.vcproj/Interfaces.vcproj

    r69415 r69549  
    10051005                </File>
    10061006                <File
    1007                         RelativePath="..\Interfaces\IWebIconFetcher.idl"
    1008                         >
    1009                         <FileConfiguration
    1010                                 Name="Debug|Win32"
    1011                                 ExcludedFromBuild="true"
    1012                                 >
    1013                                 <Tool
    1014                                         Name="VCMIDLTool"
    1015                                 />
    1016                         </FileConfiguration>
    1017                         <FileConfiguration
    1018                                 Name="Release|Win32"
    1019                                 ExcludedFromBuild="true"
    1020                                 >
    1021                                 <Tool
    1022                                         Name="VCMIDLTool"
    1023                                 />
    1024                         </FileConfiguration>
    1025                 </File>
    1026                 <File
    10271007                        RelativePath="..\Interfaces\IWebInspector.idl"
    10281008                        >

  • trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj

    r65579 r69549  
    613613                        </File>
    614614                        <File
    615                                 RelativePath="..\WebIconFetcher.h"
    616                                 >
    617                         </File>
    618                         <File
    619615                                RelativePath="..\WebInspector.h"
    620616                                >
    … …  
    10341030                        <File
    10351031                                RelativePath="..\WebIconDatabase.cpp"
    1036                                 >
    1037                         </File>
    1038                         <File
    1039                                 RelativePath="..\WebIconFetcher.cpp"
    10401032                                >
    10411033                        </File>
Note: See TracChangeset for help on using the changeset viewer.