Changeset 56439 in webkit


Ignore:
Timestamp:
Mar 24, 2010 2:36:38 AM (14 years ago)
Author:
tkent@chromium.org
Message:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

r54923 made Icon::createIconForFiles() deprecated. However moving
existing icon loading code to outside of WebCore is not good. So,
we assume:

  • ChromeClient::chooseIconForFiles(), renamed from iconForFiles(), is the primary API to load icons.
  • Icon::createIconForFiles() is an optional API to help implementing ChromeClient::iconForFiles().

This patch removes a call to Icon::createIconForFiles() from
FileChooser::loadIcon(), and ChromeClient::chooseIconForFiles() of
non-Chromium ports calls Icon::createIconForFiles().

  • WebCore.base.exp: Export FileChooser::iconLoaded(), Icon::createIconForFiles(), and Icon::~Icon().
  • WebCore.xcodeproj/project.pbxproj: Export Icon.h
  • loader/EmptyClient.h: Rename iconForFiles() to chooseIconForFiles().
  • page/Chrome.cpp: ditto.
  • page/Chrome.h: ditto.
  • page/ChromeClient.h: ditto.
  • platform/FileChooser.cpp: (WebCore::FileChooser::loadIcon):
  • platform/graphics/Icon.h: Remove a comment on createIconForFiles().
  • platform/graphics/chromium/IconChromiumLinux.cpp: Remove createIconForFiles().
  • platform/graphics/chromium/IconChromiumMac.cpp: ditto.
  • platform/graphics/chromium/IconChromiumWin.cpp: ditto.
  • rendering/RenderFileUploadControl.cpp: Rename iconForFiles() to chooseIconForFiles().
  • rendering/RenderFileUploadControl.h: ditto.

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::chooseIconForFiles):
  • src/ChromeClientImpl.h:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebCoreSupport/ChromeClientGtk.cpp:
  • WebCoreSupport/ChromeClientGtk.h:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebCoreSupport/ChromeClientHaiku.cpp: (WebCore::ChromeClientHaiku::chooseIconForFiles):
  • WebCoreSupport/ChromeClientHaiku.h:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebCoreSupport/WebChromeClient.h:
  • WebCoreSupport/WebChromeClient.mm: (WebChromeClient::chooseIconForFiles):

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::chooseIconForFiles):
  • WebCoreSupport/ChromeClientQt.h:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebCoreSupport/WebChromeClient.cpp: (WebChromeClient::chooseIconForFiles):
  • WebCoreSupport/WebChromeClient.h:

2010-03-24 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Make Icon::createIconForFiles() optional.
​https://bugs.webkit.org/show_bug.cgi?id=35072

  • Rename iconForFiles() to chooseIconForFiles().
  • Call Icon::createIconForFiles() from chooseIconForFiles().
  • WebKitSupport/ChromeClientWx.cpp: (WebCore::ChromeClientWx::chooseIconForFiles):
  • WebKitSupport/ChromeClientWx.h:
Location:
trunk
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56430 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        r54923 made Icon::createIconForFiles() deprecated. However moving
     9        existing icon loading code to outside of WebCore is not good.  So,
     10        we assume:
     11        - ChromeClient::chooseIconForFiles(), renamed from iconForFiles(), is
     12          the primary API to load icons.
     13        - Icon::createIconForFiles() is an optional API to help
     14          implementing ChromeClient::iconForFiles().
     15
     16        This patch removes a call to Icon::createIconForFiles() from
     17        FileChooser::loadIcon(), and ChromeClient::chooseIconForFiles() of
     18        non-Chromium ports calls Icon::createIconForFiles().
     19
     20        * WebCore.base.exp: Export FileChooser::iconLoaded(),
     21          Icon::createIconForFiles(), and Icon::~Icon().
     22        * WebCore.xcodeproj/project.pbxproj: Export Icon.h
     23        * loader/EmptyClient.h: Rename iconForFiles() to chooseIconForFiles().
     24        * page/Chrome.cpp: ditto.
     25        * page/Chrome.h: ditto.
     26        * page/ChromeClient.h: ditto.
     27        * platform/FileChooser.cpp:
     28        (WebCore::FileChooser::loadIcon):
     29        * platform/graphics/Icon.h: Remove a comment on createIconForFiles().
     30        * platform/graphics/chromium/IconChromiumLinux.cpp: Remove createIconForFiles().
     31        * platform/graphics/chromium/IconChromiumMac.cpp: ditto.
     32        * platform/graphics/chromium/IconChromiumWin.cpp: ditto.
     33        * rendering/RenderFileUploadControl.cpp: Rename iconForFiles() to chooseIconForFiles().
     34        * rendering/RenderFileUploadControl.h: ditto.
     35
    1362010-03-23  Dan Bernstein  <mitz@apple.com>
    237

  • trunk/WebCore/WebCore.base.exp

    r56188 r56439  
    152152__ZN7WebCore11EditCommand7unapplyEv
    153153__ZN7WebCore11FileChooser10chooseFileERKNS_6StringE
     154__ZN7WebCore11FileChooser10iconLoadedEN3WTF10PassRefPtrINS_4IconEEE
    154155__ZN7WebCore11FileChooser11chooseFilesERKN3WTF6VectorINS_6StringELm0EEE
    155156__ZN7WebCore11FileChooserD1Ev
    … …  
    482483__ZN7WebCore4FontD1Ev
    483484__ZN7WebCore4FontaSERKS0_
     485__ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS_6StringELm0EEE
     486__ZN7WebCore4IconD1Ev
    484487__ZN7WebCore4KURL10invalidateEv
    485488__ZN7WebCore4KURLC1ENS_18ParsedURLStringTagERKNS_6StringE

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

    r56412 r56439  
    37463746                B275356C0B053814002CE64F /* FloatSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B275353E0B053814002CE64F /* FloatSize.cpp */; };
    37473747                B275356D0B053814002CE64F /* FloatSize.h in Headers */ = {isa = PBXBuildFile; fileRef = B275353F0B053814002CE64F /* FloatSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3748                 B275356E0B053814002CE64F /* Icon.h in Headers */ = {isa = PBXBuildFile; fileRef = B27535400B053814002CE64F /* Icon.h */; };
     3748                B275356E0B053814002CE64F /* Icon.h in Headers */ = {isa = PBXBuildFile; fileRef = B27535400B053814002CE64F /* Icon.h */; settings = {ATTRIBUTES = (Private, ); }; };
    37493749                B275356F0B053814002CE64F /* Image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B27535410B053814002CE64F /* Image.cpp */; };
    37503750                B27535700B053814002CE64F /* Image.h in Headers */ = {isa = PBXBuildFile; fileRef = B27535420B053814002CE64F /* Image.h */; settings = {ATTRIBUTES = (Private, ); }; };

  • trunk/WebCore/loader/EmptyClients.h

    r56051 r56439  
    145145
    146146    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
    147     virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>) { }
     147    virtual void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>) { }
    148148
    149149    virtual void formStateDidChange(const Node*) { }

  • trunk/WebCore/page/Chrome.cpp

    r56128 r56439  
    431431}
    432432
    433 void Chrome::iconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> fileChooser)
    434 {
    435     m_client->iconForFiles(filenames, fileChooser);
     433void Chrome::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> fileChooser)
     434{
     435    m_client->chooseIconForFiles(filenames, fileChooser);
    436436}
    437437

  • trunk/WebCore/page/Chrome.h

    r55864 r56439  
    136136
    137137        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    138         void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
     138        void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
    139139
    140140        bool setCursor(PlatformCursorHandle);

  • trunk/WebCore/page/ChromeClient.h

    r55864 r56439  
    190190        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
    191191        // Asynchronous request to load an icon for specified filenames.
    192         // This is called only if Icon::createIconForFiles() returns 0.
    193         virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>) = 0;
     192        virtual void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>) = 0;
    194193
    195194        virtual bool setCursor(PlatformCursorHandle) = 0;

  • trunk/WebCore/platform/FileChooser.cpp

    r54923 r56439  
    7979void FileChooser::loadIcon()
    8080{
    81     m_icon = Icon::createIconForFiles(m_filenames);
    82     // If synchronous icon loading failed, try asynchronous loading.
    83     if (!m_icon && m_filenames.size() && m_client)
    84         m_client->iconForFiles(m_filenames);
     81    if (m_filenames.size() && m_client)
     82        m_client->chooseIconForFiles(m_filenames);
    8583}
    8684

  • trunk/WebCore/platform/FileChooser.h

    r54923 r56439  
    4545    virtual bool allowsMultipleFiles() = 0;
    4646    virtual String acceptTypes() = 0;
    47     virtual void iconForFiles(const Vector<String>&) = 0;
     47    virtual void chooseIconForFiles(const Vector<String>&) = 0;
    4848    virtual ~FileChooserClient();
    4949};

  • trunk/WebCore/platform/graphics/Icon.h

    r54923 r56439  
    5252class Icon : public RefCounted<Icon> {
    5353public:
    54     // Deprecated.  This function will be removed.
    55     // FIXME: Remove it when all implementations are moved to ChromeClient::iconForFiles().
    5654    static PassRefPtr<Icon> createIconForFiles(const Vector<String>& filenames);
    5755

  • trunk/WebCore/platform/graphics/chromium/IconChromiumLinux.cpp

    r50632 r56439  
    4747}
    4848
    49 PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>&)
    50 {
    51     notImplemented();
    52     return 0;
    53 }
    54 
    5549void Icon::paint(GraphicsContext*, const IntRect&)
    5650{

  • trunk/WebCore/platform/graphics/chromium/IconChromiumMac.cpp

    r50632 r56439  
    4040namespace WebCore {
    4141
    42 PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>&)
    43 {
    44     return 0;
    45 }
    46 
    4742Icon::~Icon()
    4843{

  • trunk/WebCore/platform/graphics/chromium/IconChromiumWin.cpp

    r50632 r56439  
    5353}
    5454
    55 PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames)
    56 {
    57     // FIXME: We can't access icons directly from renderer processes.
    58     // http://code.google.com/p/chromium/issues/detail?id=4092
    59     return 0;
    60 }
    61 
    6255void Icon::paint(GraphicsContext* context, const IntRect& rect)
    6356{

  • trunk/WebCore/rendering/RenderFileUploadControl.cpp

    r54923 r56439  
    115115}
    116116
    117 void RenderFileUploadControl::iconForFiles(const Vector<String>& filenames)
     117void RenderFileUploadControl::chooseIconForFiles(const Vector<String>& filenames)
    118118{
    119119    if (Chrome* chromePointer = chrome())
    120         chromePointer->iconForFiles(filenames, m_fileChooser);
     120        chromePointer->chooseIconForFiles(filenames, m_fileChooser);
    121121}
    122122

  • trunk/WebCore/rendering/RenderFileUploadControl.h

    r54923 r56439  
    6262    bool allowsMultipleFiles();
    6363    String acceptTypes();
    64     void iconForFiles(const Vector<String>&);
     64    void chooseIconForFiles(const Vector<String>&);
    6565
    6666    Chrome* chrome() const;

  • trunk/WebKit/chromium/ChangeLog

    r56426 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * src/ChromeClientImpl.cpp:
     12        (WebKit::ChromeClientImpl::chooseIconForFiles):
     13        * src/ChromeClientImpl.h:
     14
    1152010-03-23  Kenneth Russell  <kbr@google.com>
    216

  • trunk/WebKit/chromium/src/ChromeClientImpl.cpp

    r56416 r56439  
    589589}
    590590
    591 void ChromeClientImpl::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>)
     591void ChromeClientImpl::chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>)
    592592{
    593593    notImplemented();

  • trunk/WebKit/chromium/src/ChromeClientImpl.h

    r56416 r56439  
    125125    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
    126126    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    127     virtual void iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     127    virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
    128128    virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
    129129    virtual void formStateDidChange(const WebCore::Node*);

  • trunk/WebKit/gtk/ChangeLog

    r56387 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebCoreSupport/ChromeClientGtk.cpp:
     12        * WebCoreSupport/ChromeClientGtk.h:
     13
    1142010-03-23  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    215

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r56387 r56439  
    3434#include "CString.h"
    3535#include "HitTestResult.h"
     36#include "Icon.h"
    3637#include "KURL.h"
    3738#include "webkitgeolocationpolicydecision.h"
    … …  
    559560}
    560561
    561 void ChromeClient::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>)
    562 {
    563     // FIXME: Move the code in Icon::createIconForFiles() here.
    564     notImplemented();
     562void ChromeClient::chooseIconForFiles(const Vector<WebCore::String>& filenames, PassRefPtr<WebCore::FileChooser> chooser)
     563{
     564    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    565565}
    566566

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r55864 r56439  
    111111#endif
    112112        virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    113         virtual void iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     113        virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
    114114
    115115        virtual void formStateDidChange(const WebCore::Node*) { }

  • trunk/WebKit/haiku/ChangeLog

    r56051 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebCoreSupport/ChromeClientHaiku.cpp:
     12        (WebCore::ChromeClientHaiku::chooseIconForFiles):
     13        * WebCoreSupport/ChromeClientHaiku.h:
     14
    1152010-03-16  Yury Semikhatsky <yurys@chromium.org>
    216

  • trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp

    r55864 r56439  
    3333#include "FrameView.h"
    3434#include "HitTestResult.h"
     35#include "Icon.h"
    3536#include "NotImplemented.h"
    3637#include "PlatformString.h"
    … …  
    357358}
    358359
    359 void ChromeClientHaiku::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
    360 {
    361     notImplemented();
     360void ChromeClientHaiku::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> chooser)
     361{
     362    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    362363}
    363364

  • trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h

    r55864 r56439  
    139139
    140140        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    141         void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
     141        void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
    142142
    143143        bool setCursor(PlatformCursorHandle);

  • trunk/WebKit/mac/ChangeLog

    r56431 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebCoreSupport/WebChromeClient.h:
     12        * WebCoreSupport/WebChromeClient.mm:
     13        (WebChromeClient::chooseIconForFiles):
     14
    1152010-03-23  Dan Bernstein  <mitz@apple.com>
    216

  • trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r55864 r56439  
    124124
    125125    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    126     virtual void iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     126    virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
    127127
    128128    virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }

  • trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r55864 r56439  
    5757#import <WebCore/HitTestResult.h>
    5858#import <WebCore/HTMLNames.h>
     59#import <WebCore/Icon.h>
    5960#import <WebCore/IntRect.h>
    6061#import <WebCore/Page.h>
    … …  
    644645}
    645646
    646 void WebChromeClient::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
    647 {
    648     // FIXME: Move the code of Icon::createIconForFiles() here.
     647void WebChromeClient::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> chooser)
     648{
     649    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    649650}
    650651

  • trunk/WebKit/qt/ChangeLog

    r56424 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebCoreSupport/ChromeClientQt.cpp:
     12        (WebCore::ChromeClientQt::chooseIconForFiles):
     13        * WebCoreSupport/ChromeClientQt.h:
     14
    1152010-03-23  Luiz Agostini  <luiz.agostini@openbossa.org>
    216

  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r55864 r56439  
    3737#include "FrameView.h"
    3838#include "HitTestResult.h"
     39#include "Icon.h"
    3940#include "NotImplemented.h"
    4041#include "WindowFeatures.h"
    … …  
    472473}
    473474
    474 void ChromeClientQt::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
    475 {
    476     // FIXME: Move the code of Icon::createIconForFiles() here.
    477     notImplemented();
     475void ChromeClientQt::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> chooser)
     476{
     477    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    478478}
    479479

  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h

    r55864 r56439  
    142142
    143143        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    144         virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
     144        virtual void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
    145145
    146146        virtual void formStateDidChange(const Node*) { }

  • trunk/WebKit/win/ChangeLog

    r56339 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebCoreSupport/WebChromeClient.cpp:
     12        (WebChromeClient::chooseIconForFiles):
     13        * WebCoreSupport/WebChromeClient.h:
     14
    1152010-03-22  Darin Adler  <darin@apple.com>
    216

  • trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp

    r55864 r56439  
    5151#endif
    5252#include <WebCore/HTMLNames.h>
     53#include <WebCore/Icon.h>
    5354#include <WebCore/LocalizedStrings.h>
    5455#include <WebCore/NotImplemented.h>
    … …  
    750751}
    751752
    752 void WebChromeClient::iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>)
    753 {
    754     // FIXME: Move the code of Icon::createIconForFiles() here.
    755     notImplemented();
     753void WebChromeClient::chooseIconForFiles(const Vector<WebCore::String>& filenames, PassRefPtr<WebCore::FileChooser> chooser)
     754{
     755    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    756756}
    757757

  • trunk/WebKit/win/WebCoreSupport/WebChromeClient.h

    r55864 r56439  
    127127
    128128    virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
    129     virtual void iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
     129    virtual void chooseIconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
    130130
    131131    virtual bool setCursor(WebCore::PlatformCursorHandle cursor);

  • trunk/WebKit/wx/ChangeLog

    r56309 r56439  
     12010-03-24  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Make Icon::createIconForFiles() optional.
     6        https://bugs.webkit.org/show_bug.cgi?id=35072
     7
     8        - Rename iconForFiles() to chooseIconForFiles().
     9        - Call Icon::createIconForFiles() from chooseIconForFiles().
     10
     11        * WebKitSupport/ChromeClientWx.cpp:
     12        (WebCore::ChromeClientWx::chooseIconForFiles):
     13        * WebKitSupport/ChromeClientWx.h:
     14
    1152010-03-20  Kevin Ollivier  <kevino@theolliviers.com>
    216

  • trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

    r55864 r56439  
    3636#include "Frame.h"
    3737#include "FrameLoadRequest.h"
     38#include "Icon.h"
    3839#include "NotImplemented.h"
    3940#include "PlatformString.h"
    … …  
    442443}
    443444
    444 void ChromeClientWx::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>)
    445 {
    446     notImplemented();
     445void ChromeClientWx::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> chooser)
     446{
     447    chooser->iconLoaded(Icon::createIconForFiles(filenames));
    447448}
    448449

  • trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h

    r55864 r56439  
    129129
    130130    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    131     virtual void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
     131    virtual void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
    132132
    133133    virtual void formStateDidChange(const Node*) { }
Note: See TracChangeset for help on using the changeset viewer.