Title: [89773] trunk/Source/WebKit/chromium
- Revision
- 89773
- Author
- [email protected]
- Date
- 2011-06-26 13:21:01 -0700 (Sun, 26 Jun 2011)
Log Message
2011-06-26 Adam Barth <[email protected]>
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89772 => 89773)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-26 19:30:56 UTC (rev 89772)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-26 20:21:01 UTC (rev 89773)
@@ -1,3 +1,16 @@
+2011-06-26 Adam Barth <[email protected]>
+
+ 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:
+
2011-06-25 Adam Barth <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (89772 => 89773)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-26 19:30:56 UTC (rev 89772)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-26 20:21:01 UTC (rev 89773)
@@ -128,27 +128,13 @@
// A globally unique identifier for this frame.
virtual long long identifier() const = 0;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- // The url of the document loaded in this frame.
- virtual WebURL url() const = 0;
-#endif
-
// The urls of the given combination types of favicon (if any) specified by
// the document loaded in this frame. The iconTypes is a bit-mask of
// WebIconURL::Type values, used to select from the available set of icon
// URLs
virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- // The url of the OpenSearch Desription Document (if any) specified by
- // the document loaded in this frame.
- virtual WebURL openSearchDescriptionURL() const = 0;
- // Return the frame's encoding.
- virtual WebString encoding() const = 0;
-#endif
-
-
// Geometry -----------------------------------------------------------
// NOTE: These routines do not force page layout so their results may
@@ -219,10 +205,6 @@
virtual WebDocument document() const = 0;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual void forms(WebVector<WebFormElement>&) const = 0;
-#endif
-
virtual WebAnimationController* animationController() = 0;
virtual WebPerformance performance() const = 0;
@@ -230,16 +212,6 @@
// Scripting ----------------------------------------------------------
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- // Returns the security origin of the current document.
- virtual WebSecurityOrigin securityOrigin() const = 0;
-
- // This grants the currently loaded document access to all security
- // origins (including file URLs). Use with care. The access is
- // revoked when a new document is loaded into this frame.
- virtual void grantUniversalAccess() = 0;
-#endif
-
// Returns a NPObject corresponding to this frame's DOMWindow.
virtual NPObject* windowObject() const = 0;
@@ -299,18 +271,6 @@
#endif
- // Styling -------------------------------------------------------------
-
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- // Insert the given text as a STYLE element at the beginning of the
- // document. |elementId| can be empty, but if specified then it is used
- // as the id for the newly inserted element (replacing an existing one
- // with the same id, if any).
- virtual bool insertStyleText(const WebString& styleText,
- const WebString& elementId) = 0;
-#endif
-
-
// Navigation ----------------------------------------------------------
// Reload the current document.
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (89772 => 89773)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-26 19:30:56 UTC (rev 89772)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-26 20:21:01 UTC (rev 89773)
@@ -516,13 +516,6 @@
return m_identifier;
}
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
-WebURL WebFrameImpl::url() const
-{
- return document().url();
-}
-#endif
-
WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
{
FrameLoader* frameLoader = m_frame->loader();
@@ -533,18 +526,6 @@
return WebVector<WebIconURL>();
}
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
-WebURL WebFrameImpl::openSearchDescriptionURL() const
-{
- return document().openSearchDescriptionURL();
-}
-
-WebString WebFrameImpl::encoding() const
-{
- return document().encoding();
-}
-#endif
-
WebSize WebFrameImpl::scrollOffset() const
{
FrameView* view = frameView();
@@ -687,13 +668,6 @@
return WebDocument(m_frame->document());
}
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
-void WebFrameImpl::forms(WebVector<WebFormElement>& results) const
-{
- document().forms(results);
-}
-#endif
-
WebAnimationController* WebFrameImpl::animationController()
{
return &m_animationController;
@@ -707,18 +681,6 @@
return WebPerformance(m_frame->domWindow()->performance());
}
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
-WebSecurityOrigin WebFrameImpl::securityOrigin() const
-{
- return document().securityOrigin();
-}
-
-void WebFrameImpl::grantUniversalAccess()
-{
- document().securityOrigin().grantUniversalAccess();
-}
-#endif
-
NPObject* WebFrameImpl::windowObject() const
{
if (!m_frame)
@@ -858,13 +820,6 @@
}
#endif
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
-bool WebFrameImpl::insertStyleText(const WebString& styleText, const WebString& elementId)
-{
- return document().insertStyleText(styleText, elementId);
-}
-#endif
-
void WebFrameImpl::reload(bool ignoreCache)
{
m_frame->loader()->history()->saveDocumentAndScrollState();
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (89772 => 89773)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-06-26 19:30:56 UTC (rev 89772)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-06-26 20:21:01 UTC (rev 89773)
@@ -69,14 +69,7 @@
virtual WebString name() const;
virtual void setName(const WebString&);
virtual long long identifier() const;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual WebURL url() const;
-#endif
virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual WebURL openSearchDescriptionURL() const;
- virtual WebString encoding() const;
-#endif
virtual WebSize scrollOffset() const;
virtual void setScrollOffset(const WebSize&);
virtual WebSize contentsSize() const;
@@ -97,15 +90,8 @@
virtual WebFrame* findChildByName(const WebString&) const;
virtual WebFrame* findChildByExpression(const WebString&) const;
virtual WebDocument document() const;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual void forms(WebVector<WebFormElement>&) const;
-#endif
virtual WebAnimationController* animationController();
virtual WebPerformance performance() const;
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual WebSecurityOrigin securityOrigin() const;
- virtual void grantUniversalAccess();
-#endif
virtual NPObject* windowObject() const;
virtual void bindToWindowObject(const WebString& name, NPObject*);
virtual void executeScript(const WebScriptSource&);
@@ -129,9 +115,6 @@
const WebString& filePath,
bool isDirectory);
#endif
-#if !defined(WEBKIT_FRAME_TO_DOCUMENT_API_MOVE)
- virtual bool insertStyleText(const WebString& css, const WebString& id);
-#endif
virtual void reload(bool ignoreCache);
virtual void loadRequest(const WebURLRequest&);
virtual void loadHistoryItem(const WebHistoryItem&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
