Changeset 89773 in webkit


Ignore:
Timestamp:
Jun 26, 2011 1:21:01 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-06-26 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[Chromium] Remove code behind WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
​https://bugs.webkit.org/show_bug.cgi?id=63402

These old APIs are no longer needed.

  • public/WebFrame.h:
  • src/WebFrameImpl.cpp:
  • src/WebFrameImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r89764 r89773  
     12011-06-26  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Chromium] Remove code behind WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
     6        https://bugs.webkit.org/show_bug.cgi?id=63402
     7
     8        These old APIs are no longer needed.
     9
     10        * public/WebFrame.h:
     11        * src/WebFrameImpl.cpp:
     12        * src/WebFrameImpl.h:
     13
    1142011-06-25  Adam Barth  <abarth@webkit.org>
    215

  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r89504 r89773  
    129129    virtual long long identifier() const = 0;
    130130
    131 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    132     // The url of the document loaded in this frame.
    133     virtual WebURL url() const = 0;
    134 #endif
    135 
    136131    // The urls of the given combination types of favicon (if any) specified by
    137132    // the document loaded in this frame. The iconTypes is a bit-mask of
    … …  
    140135    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
    141136
    142 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    143     // The url of the OpenSearch Desription Document (if any) specified by
    144     // the document loaded in this frame.
    145     virtual WebURL openSearchDescriptionURL() const = 0;
    146 
    147     // Return the frame's encoding.
    148     virtual WebString encoding() const = 0;
    149 #endif
    150 
    151137
    152138    // Geometry -----------------------------------------------------------
    … …  
    220206    virtual WebDocument document() const = 0;
    221207
    222 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    223     virtual void forms(WebVector<WebFormElement>&) const = 0;
    224 #endif
    225 
    226208    virtual WebAnimationController* animationController() = 0;
    227209
    … …  
    230212
    231213    // Scripting ----------------------------------------------------------
    232 
    233 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    234     // Returns the security origin of the current document.
    235     virtual WebSecurityOrigin securityOrigin() const = 0;
    236 
    237     // This grants the currently loaded document access to all security
    238     // origins (including file URLs).  Use with care.  The access is
    239     // revoked when a new document is loaded into this frame.
    240     virtual void grantUniversalAccess() = 0;
    241 #endif
    242214
    243215    // Returns a NPObject corresponding to this frame's DOMWindow.
    … …  
    297269                                                  const WebString& filePath,
    298270                                                  bool isDirectory) = 0;
    299 #endif
    300 
    301 
    302     // Styling -------------------------------------------------------------
    303 
    304 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    305     // Insert the given text as a STYLE element at the beginning of the
    306     // document. |elementId| can be empty, but if specified then it is used
    307     // as the id for the newly inserted element (replacing an existing one
    308     // with the same id, if any).
    309     virtual bool insertStyleText(const WebString& styleText,
    310                                  const WebString& elementId) = 0;
    311271#endif
    312272

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r89504 r89773  
    517517}
    518518
    519 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    520 WebURL WebFrameImpl::url() const
    521 {
    522     return document().url();
    523 }
    524 #endif
    525 
    526519WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
    527520{
    … …  
    533526    return WebVector<WebIconURL>();
    534527}
    535 
    536 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    537 WebURL WebFrameImpl::openSearchDescriptionURL() const
    538 {
    539     return document().openSearchDescriptionURL();
    540 }
    541 
    542 WebString WebFrameImpl::encoding() const
    543 {
    544     return document().encoding();
    545 }
    546 #endif
    547528
    548529WebSize WebFrameImpl::scrollOffset() const
    … …  
    688669}
    689670
    690 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    691 void WebFrameImpl::forms(WebVector<WebFormElement>& results) const
    692 {
    693     document().forms(results);
    694 }
    695 #endif
    696 
    697671WebAnimationController* WebFrameImpl::animationController()
    698672{
    … …  
    707681    return WebPerformance(m_frame->domWindow()->performance());
    708682}
    709 
    710 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    711 WebSecurityOrigin WebFrameImpl::securityOrigin() const
    712 {
    713     return document().securityOrigin();
    714 }
    715 
    716 void WebFrameImpl::grantUniversalAccess()
    717 {
    718     document().securityOrigin().grantUniversalAccess();
    719 }
    720 #endif
    721683
    722684NPObject* WebFrameImpl::windowObject() const
    … …  
    856818        return toV8(DirectoryEntry::create(fileSystem, filePath));
    857819    return toV8(FileEntry::create(fileSystem, filePath));
    858 }
    859 #endif
    860 
    861 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    862 bool WebFrameImpl::insertStyleText(const WebString& styleText, const WebString& elementId)
    863 {
    864     return document().insertStyleText(styleText, elementId);
    865820}
    866821#endif

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r89751 r89773  
    7070    virtual void setName(const WebString&);
    7171    virtual long long identifier() const;
    72 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    73     virtual WebURL url() const;
    74 #endif
    7572    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
    76 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    77     virtual WebURL openSearchDescriptionURL() const;
    78     virtual WebString encoding() const;
    79 #endif
    8073    virtual WebSize scrollOffset() const;
    8174    virtual void setScrollOffset(const WebSize&);
    … …  
    9891    virtual WebFrame* findChildByExpression(const WebString&) const;
    9992    virtual WebDocument document() const;
    100 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    101     virtual void forms(WebVector<WebFormElement>&) const;
    102 #endif
    10393    virtual WebAnimationController* animationController();
    10494    virtual WebPerformance performance() const;
    105 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    106     virtual WebSecurityOrigin securityOrigin() const;
    107     virtual void grantUniversalAccess();
    108 #endif
    10995    virtual NPObject* windowObject() const;
    11096    virtual void bindToWindowObject(const WebString& name, NPObject*);
    … …  
    129115                                                  const WebString& filePath,
    130116                                                  bool isDirectory);
    131 #endif
    132 #if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
    133     virtual bool insertStyleText(const WebString& css, const WebString& id);
    134117#endif
    135118    virtual void reload(bool ignoreCache);
Note: See TracChangeset for help on using the changeset viewer.