diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/page/DOMWindow.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/page/DOMWindow.h')
| -rw-r--r-- | WebCore/page/DOMWindow.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 6fd3775..2156791 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -57,7 +57,6 @@ namespace WebCore { class Frame; class History; class IDBFactory; - class InspectorTimelineAgent; class Location; class StyleMedia; class Navigator; @@ -235,7 +234,7 @@ namespace WebCore { void pageDestroyed(); #if ENABLE(INDEXED_DATABASE) - IDBFactory* indexedDB() const; + IDBFactory* webkitIndexedDB() const; #endif #if ENABLE(FILE_SYSTEM) @@ -393,8 +392,8 @@ namespace WebCore { DOMApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); } #endif #if ENABLE(BLOB) - String createBlobURL(Blob*); - void revokeBlobURL(const String&); + String createObjectURL(Blob*); + void revokeObjectURL(const String&); #endif using RefCounted<DOMWindow>::ref; @@ -407,7 +406,6 @@ namespace WebCore { virtual void derefEventTarget() { deref(); } virtual EventTargetData* eventTargetData(); virtual EventTargetData* ensureEventTargetData(); - InspectorTimelineAgent* inspectorTimelineAgent(); RefPtr<SecurityOrigin> m_securityOrigin; KURL m_url; |