Skip to content
  • beidson's avatar
    Reviewed by John · c4640ed9
    beidson authored
            http://bugzilla.opendarwin.org/show_bug.cgi?id=10907
            REGRESSION: New Icon Loaders don't handle certain non-server-root URLs correctly
    
            * bridge/mac/FrameMac.h: Changed originalRequestURL() to virtual
            * bridge/win/FrameWin.h: Added originalRequestURL()
            * loader/icon/IconLoader.cpp:
            (IconLoader::receivedAllData): Moved the "pageURL to iconURL mapping logic" to Frame::commitIconURLToIconDatabase()
            * page/Frame.cpp:
            (WebCore::Frame::iconURL): Construct the icon URL from *only* the protocol and host of the frame's url.
            (WebCore::Frame::endIfNotLoading): Call commitIconURLToIconDatabase() if we're not kicking off an icon load
            (WebCore::Frame::commitIconURLToIconDatabase): Map the completed doc's pageURL to the iconURL
            * page/Frame.h: Added pure virtual originalRequestURL()
            * platform/win/TemporaryLinkStubs.cpp:
            (FrameWin::originalRequestURL): Added
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16423 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    c4640ed9