Changeset 58106 in webkit


Ignore:
Timestamp:
Apr 22, 2010 10:57:25 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-22 Leandro Pereira <​leandro@profusion.mobi>

Reviewed by Gustavo Noronha Silva.

Update EFL port files to match recent API changes.
​http://webkit.org/b/37876

  • efl/WebCoreSupport/ChromeClientEfl.cpp: (kit): Added. (WebCore::ChromeClientEfl::ChromeClientEfl): Coding style fix. (WebCore::ChromeClientEfl::runBeforeUnloadConfirmPanel): Coding style fix. (WebCore::ChromeClientEfl::mouseDidMoveOverElement): Coding style fix. (WebCore::ChromeClientEfl::runOpenPanel): Implemented. (WebCore::ChromeClientEfl::cancelGeolocationPermissionRequestForFrame): Stubbed. (WebCore::ChromeClientEfl::cancelGeolocationPermissionForFrame): Stubbed. (WebCore::ChromeClientEfl::invalidateContents): Stubbed. (WebCore::ChromeClientEfl::invalidateWindow): Stubbed. (WebCore::ChromeClientEfl::invalidateContentsAndWindow): Implemented. (WebCore::ChromeClientEfl::invalidateContentsForSlowScroll): Implemented. (WebCore::ChromeClientEfl::scroll): Updated. (WebCore::ChromeClientEfl::iconForFiles): Stubbed. (WebCore::ChromeClientEfl::chooseIconForFiles): Stubbed.
  • efl/WebCoreSupport/ChromeClientEfl.h: Add new method prototypes.
  • efl/WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::committedLoad): Call setEncoding() from FrameLoader::writer. (WebCore::FrameLoaderClientEfl::finishedLoading): Ditto. (WebCore::FrameLoaderClientEfl::dispatchDidFailLoading): Ditto. (WebCore::FrameLoaderClientEfl::setMainDocumentError): Ditto.
Location:
trunk/WebKit
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/ChangeLog

    r58034 r58106  
     12010-04-22  Leandro Pereira  <leandro@profusion.mobi>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        Update EFL port files to match recent API changes.
     6        http://webkit.org/b/37876
     7
     8        * efl/WebCoreSupport/ChromeClientEfl.cpp:
     9        (kit): Added.
     10        (WebCore::ChromeClientEfl::ChromeClientEfl): Coding style fix.
     11        (WebCore::ChromeClientEfl::runBeforeUnloadConfirmPanel): Coding
     12        style fix.
     13        (WebCore::ChromeClientEfl::mouseDidMoveOverElement): Coding style fix.
     14        (WebCore::ChromeClientEfl::runOpenPanel): Implemented.
     15        (WebCore::ChromeClientEfl::cancelGeolocationPermissionRequestForFrame): Stubbed.
     16        (WebCore::ChromeClientEfl::cancelGeolocationPermissionForFrame): Stubbed.
     17        (WebCore::ChromeClientEfl::invalidateContents): Stubbed.
     18        (WebCore::ChromeClientEfl::invalidateWindow): Stubbed.
     19        (WebCore::ChromeClientEfl::invalidateContentsAndWindow): Implemented.
     20        (WebCore::ChromeClientEfl::invalidateContentsForSlowScroll): Implemented.
     21        (WebCore::ChromeClientEfl::scroll): Updated.
     22        (WebCore::ChromeClientEfl::iconForFiles): Stubbed.
     23        (WebCore::ChromeClientEfl::chooseIconForFiles): Stubbed.
     24        * efl/WebCoreSupport/ChromeClientEfl.h: Add new method prototypes.
     25        * efl/WebCoreSupport/FrameLoaderClientEfl.cpp:
     26        (WebCore::FrameLoaderClientEfl::committedLoad): Call setEncoding()
     27        from FrameLoader::writer.
     28        (WebCore::FrameLoaderClientEfl::finishedLoading): Ditto.
     29        (WebCore::FrameLoaderClientEfl::dispatchDidFailLoading): Ditto.
     30        (WebCore::FrameLoaderClientEfl::setMainDocumentError): Ditto.
     31
    1322010-04-21  Gustavo Sverzut Barbieri  <barbieri@profusion.mobi>
    233

  • trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

    r56825 r58106  
    5050using namespace WebCore;
    5151
    52 static inline Evas_Object* kit(WebCore::Frame* frame)
     52static inline Evas_Object* kit(Frame* frame)
    5353{
    5454    if (!frame)
    … …  
    6161namespace WebCore {
    6262
    63 ChromeClientEfl::ChromeClientEfl(Evas_Object *view)
     63ChromeClientEfl::ChromeClientEfl(Evas_Object* view)
    6464    : m_view(view)
    6565{
    … …  
    214214}
    215215
    216 bool ChromeClientEfl::runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame* frame)
     216bool ChromeClientEfl::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
    217217{
    218218    return runJavaScriptConfirm(frame, message);
    … …  
    275275}
    276276
    277 void ChromeClientEfl::repaint(const IntRect& windowRect, bool contentChanged, bool immediate, bool repaintContentOnly)
    278 {
    279     Evas_Coord x, y, w, h;
    280 
    281     if (!contentChanged)
    282         return;
    283 
    284     x = windowRect.x();
    285     y = windowRect.y();
    286     w = windowRect.width();
    287     h = windowRect.height();
    288     ewk_view_repaint(m_view, x, y, w, h);
    289 }
    290 
    291277void ChromeClientEfl::contentsSizeChanged(Frame* frame, const IntSize& size) const
    292278{
    293279    ewk_frame_contents_size_changed(kit(frame), size.width(), size.height());
    294 }
    295 
    296 bool ChromeClientEfl::scroll(const IntSize& delta, const IntRect& scrollViewRect, const IntRect& clipRect, bool canBlit, bool isMainFrame)
    297 {
    298     ewk_view_scroll(m_view, delta.width(), delta.height(), scrollViewRect.x(), scrollViewRect.y(), scrollViewRect.width(), scrollViewRect.height(), clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height(), isMainFrame);
    299     return canBlit;
    300280}
    301281
    … …  
    328308        KURL url = hit.absoluteLinkURL();
    329309        if (!url.isEmpty() && url != m_hoveredLinkURL) {
    330             const char *link[2];
     310            const char* link[2];
    331311            TextDirection dir;
    332312            CString urlStr = url.prettyURL().utf8();
    … …  
    371351}
    372352
    373 void ChromeClientEfl::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
     353void ChromeClientEfl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
    374354{
    375355    notImplemented();
    … …  
    393373}
    394374
    395 }
     375void ChromeClientEfl::cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*)
     376{
     377    notImplemented();
     378}
     379
     380void ChromeClientEfl::cancelGeolocationPermissionForFrame(Frame*, Geolocation*)
     381{
     382    notImplemented();
     383}
     384
     385void ChromeClientEfl::invalidateContents(const IntRect& updateRect, bool immediate)
     386{
     387    notImplemented();
     388}
     389
     390void ChromeClientEfl::invalidateWindow(const IntRect& updateRect, bool immediate)
     391{
     392    notImplemented();
     393}
     394
     395void ChromeClientEfl::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
     396{
     397    Evas_Coord x, y, w, h;
     398
     399    x = updateRect.x();
     400    y = updateRect.y();
     401    w = updateRect.width();
     402    h = updateRect.height();
     403    ewk_view_repaint(m_view, x, y, w, h);
     404}
     405
     406void ChromeClientEfl::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
     407{
     408    invalidateContentsAndWindow(updateRect, immediate);
     409}
     410
     411void ChromeClientEfl::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
     412{
     413    ewk_view_scroll(m_view, scrollDelta.width(), scrollDelta.height(), rectToScroll.x(), rectToScroll.y(), rectToScroll.width(), rectToScroll.height(), clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height(), EINA_TRUE);
     414}
     415
     416void ChromeClientEfl::cancelGeolocationPermissionRequestForFrame(Frame*)
     417{
     418    notImplemented();
     419}
     420
     421void ChromeClientEfl::iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>)
     422{
     423    notImplemented();
     424}
     425
     426void ChromeClientEfl::chooseIconForFiles(const Vector<String>&, FileChooser*)
     427{
     428    notImplemented();
     429}
     430
     431}

  • trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

    r55812 r58106  
    3232class ChromeClientEfl : public ChromeClient {
    3333public:
    34     explicit ChromeClientEfl(Evas_Object *view);
     34    explicit ChromeClientEfl(Evas_Object* view);
    3535    virtual ~ChromeClientEfl();
    3636
    … …  
    5050    virtual void takeFocus(FocusDirection);
    5151
    52     virtual void focusedNodeChanged(WebCore::Node*);
     52    virtual void focusedNodeChanged(Node*);
    5353
    5454    virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&);
    … …  
    8989    virtual IntRect windowResizerRect() const;
    9090
    91     virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
    9291    virtual void contentsSizeChanged(Frame*, const IntSize&) const;
    93     virtual bool scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect, bool canBlit, bool isMainFrame);
    9492    virtual IntPoint screenToWindow(const IntPoint&) const;
    9593    virtual IntRect windowToScreen(const IntRect&) const;
    … …  
    112110
    113111    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
     112    virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
    114113    virtual void formStateDidChange(const Node*);
    115114
    … …  
    121120
    122121    virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
     122    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
     123    virtual void cancelGeolocationPermissionForFrame(Frame*, Geolocation*);
    123124
    124     Evas_Object *m_view;
     125    virtual void invalidateContents(const IntRect&, bool);
     126    virtual void invalidateWindow(const IntRect&, bool);
     127    virtual void invalidateContentsAndWindow(const IntRect&, bool);
     128    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
     129    virtual void scroll(const IntSize&, const IntRect&, const IntRect&);
     130    virtual void cancelGeolocationPermissionRequestForFrame(Frame*);
     131    virtual void iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>);
     132
     133    Evas_Object* m_view;
    125134    KURL m_hoveredLinkURL;
    126135};

  • trunk/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r57970 r58106  
    189189        FrameLoader* fl = loader->frameLoader();
    190190        if (m_firstData) {
    191             fl->setEncoding(m_response.textEncodingName(), false);
     191            fl->writer()->setEncoding(m_response.textEncodingName(), false);
    192192            m_firstData = false;
    193193        }
    … …  
    667667        if (m_firstData) {
    668668            FrameLoader* fl = loader->frameLoader();
    669             fl->setEncoding(m_response.textEncodingName(), false);
     669            fl->writer()->setEncoding(m_response.textEncodingName(), false);
    670670            m_firstData = false;
    671671        }
    … …  
    712712    if (m_firstData) {
    713713        FrameLoader* fl = loader->frameLoader();
    714         fl->setEncoding(m_response.textEncodingName(), false);
     714        fl->writer()->setEncoding(m_response.textEncodingName(), false);
    715715        m_firstData = false;
    716716    }
    … …  
    830830    if (!m_pluginView) {
    831831        if (m_firstData) {
    832             loader->frameLoader()->setEncoding(m_response.textEncodingName(), false);
     832            loader->frameLoader()->writer()->setEncoding(m_response.textEncodingName(), false);
    833833            m_firstData = false;
    834834        }
Note: See TracChangeset for help on using the changeset viewer.