Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: third_party/WebKit/public/web/WebDocument.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 WebDocument(const WebDocument& e) : WebNode(e) { } 67 WebDocument(const WebDocument& e) : WebNode(e) { }
68 68
69 WebDocument& operator=(const WebDocument& e) 69 WebDocument& operator=(const WebDocument& e)
70 { 70 {
71 WebNode::assign(e); 71 WebNode::assign(e);
72 return *this; 72 return *this;
73 } 73 }
74 void assign(const WebDocument& e) { WebNode::assign(e); } 74 void assign(const WebDocument& e) { WebNode::assign(e); }
75 75
76 BLINK_EXPORT WebURL url() const; 76 BLINK_EXPORT WebURL url() const;
77 // Note: Security checks should use the securityOrigin(), not url(). 77 // Note: Security checks should use the getSecurityOrigin(), not url().
78 BLINK_EXPORT WebSecurityOrigin securityOrigin() const; 78 BLINK_EXPORT WebSecurityOrigin getSecurityOrigin() const;
79 BLINK_EXPORT bool isSecureContext(WebString& errorMessage) const; 79 BLINK_EXPORT bool isSecureContext(WebString& errorMessage) const;
80 80
81 BLINK_EXPORT WebString encoding() const; 81 BLINK_EXPORT WebString encoding() const;
82 BLINK_EXPORT WebString contentLanguage() const; 82 BLINK_EXPORT WebString contentLanguage() const;
83 BLINK_EXPORT WebString referrer() const; 83 BLINK_EXPORT WebString referrer() const;
84 BLINK_EXPORT WebColor themeColor() const; 84 BLINK_EXPORT WebColor themeColor() const;
85 // The url of the OpenSearch Desription Document (if any). 85 // The url of the OpenSearch Desription Document (if any).
86 BLINK_EXPORT WebURL openSearchDescriptionURL() const; 86 BLINK_EXPORT WebURL openSearchDescriptionURL() const;
87 87
88 // Returns the frame the document belongs to or 0 if the document is framele ss. 88 // Returns the frame the document belongs to or 0 if the document is framele ss.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 BLINK_EXPORT WebDocument& operator=(const PassRefPtrWillBeRawPtr<Document>&) ; 146 BLINK_EXPORT WebDocument& operator=(const PassRefPtrWillBeRawPtr<Document>&) ;
147 BLINK_EXPORT operator PassRefPtrWillBeRawPtr<Document>() const; 147 BLINK_EXPORT operator PassRefPtrWillBeRawPtr<Document>() const;
148 #endif 148 #endif
149 }; 149 };
150 150
151 DECLARE_WEB_NODE_TYPE_CASTS(WebDocument); 151 DECLARE_WEB_NODE_TYPE_CASTS(WebDocument);
152 152
153 } // namespace blink 153 } // namespace blink
154 154
155 #endif 155 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/public/platform/WebMediaPlayer.h ('k') | third_party/WebKit/public/web/WebFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698