diff options
author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/page/UserScript.h | |
parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/page/UserScript.h')
-rw-r--r-- | WebCore/page/UserScript.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/page/UserScript.h b/WebCore/page/UserScript.h index dbbb879..8b3703f 100644 --- a/WebCore/page/UserScript.h +++ b/WebCore/page/UserScript.h @@ -34,16 +34,15 @@ namespace WebCore { -class UserScript { +class UserScript : public Noncopyable { public: UserScript(const String& source, const KURL& url, PassOwnPtr<Vector<String> > whitelist, PassOwnPtr<Vector<String> > blacklist, - unsigned worldID, UserScriptInjectionTime injectionTime) + UserScriptInjectionTime injectionTime) : m_source(source) , m_url(url) , m_whitelist(whitelist) , m_blacklist(blacklist) - , m_worldID(worldID) , m_injectionTime(injectionTime) { } @@ -52,7 +51,6 @@ public: const KURL& url() const { return m_url; } const Vector<String>* whitelist() const { return m_whitelist.get(); } const Vector<String>* blacklist() const { return m_blacklist.get(); } - unsigned worldID() const { return m_worldID; } UserScriptInjectionTime injectionTime() const { return m_injectionTime; } private: @@ -60,7 +58,6 @@ private: KURL m_url; OwnPtr<Vector<String> > m_whitelist; OwnPtr<Vector<String> > m_blacklist; - unsigned m_worldID; UserScriptInjectionTime m_injectionTime; }; |