Changeset 107082 in webkit
- Timestamp:
- Feb 8, 2012 6:39:18 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 23 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r107081 r107082 1 2012-02-08 Kaustubh Atrawalkar <kaustubh@motorola.com> 2 3 Migrate createObjectURL & revokeObjectURL to static (Class) methods. 4 https://bugs.webkit.org/show_bug.cgi?id=74386 5 6 Reviewed by Kentaro Hara. 7 8 Added test to check if createObjectURL & revokeObjectURL are static functions. 9 10 * fast/dom/DOMURL/check-instanceof-domurl-functions-expected.txt: Added. 11 * fast/dom/DOMURL/check-instanceof-domurl-functions.html: Added. 12 * platform/gtk/fast/dom/prototype-inheritance-2-expected.txt: GTK Rebaseline. 13 * platform/gtk/fast/js/global-constructors-expected.txt: ditto. 14 * platform/qt/fast/dom/constructed-objects-prototypes-expected.txt: Qt Rebaseline. 15 * platform/qt/fast/dom/prototype-inheritance-2-expected.txt: ditto. 16 * platform/qt/fast/js/global-constructors-expected.txt: ditto. 17 1 18 2012-02-08 Pavel Podivilov <podivilov@chromium.org> 2 19 -
trunk/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt
r106922 r107082 241 241 Never found DOMSettableTokenList 242 242 Never found DOMStringList 243 Never found DOMURL 243 244 Never found Document 244 245 Never found DocumentFragment -
trunk/LayoutTests/platform/gtk/fast/js/global-constructors-expected.txt
r106922 r107082 334 334 PASS XSLTProcessor.toString() is '[object XSLTProcessorConstructor]' 335 335 FAIL webkitPeerConnection.toString() should be [object webkitPeerConnectionConstructor]. Was [object PeerConnectionConstructor]. 336 FAIL webkitURL.toString() should be [object webkitURLConstructor]. Was [object DOMURLConstructor]. 336 337 PASS successfullyParsed is true 337 338 -
trunk/LayoutTests/platform/qt/fast/dom/constructed-objects-prototypes-expected.txt
r106922 r107082 62 62 PASS (new inner.XSLTProcessor()).isInner is true 63 63 PASS (new inner.XSLTProcessor()).constructor.isInner is true 64 PASS (new inner.webkitURL()).isInner is true 65 PASS (new inner.webkitURL()).constructor.isInner is true 64 66 PASS successfullyParsed is true 65 67 -
trunk/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt
r106922 r107082 241 241 Never found DOMSettableTokenList 242 242 Never found DOMStringList 243 Never found DOMURL 243 244 Never found Document 244 245 Never found DocumentFragment -
trunk/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
r106922 r107082 316 316 PASS XPathResult.toString() is '[object XPathResultConstructor]' 317 317 PASS XSLTProcessor.toString() is '[object XSLTProcessorConstructor]' 318 FAIL webkitURL.toString() should be [object webkitURLConstructor]. Was [object DOMURLConstructor]. 318 319 PASS successfullyParsed is true 319 320 -
trunk/Source/WebCore/ChangeLog
r107079 r107082 1 2012-02-08 Kaustubh Atrawalkar <kaustubh@motorola.com> 2 3 Migrate createObjectURL & revokeObjectURL to static (Class) methods. 4 https://bugs.webkit.org/show_bug.cgi?id=74386 5 6 Reviewed by Kentaro Hara. 7 8 Move createObjectURL & revokeObjectURL from DOMURL implementation to 9 static methods as per specs - http://www.w3.org/TR/FileAPI/#creating-revoking 10 11 Test: fast/dom/DOMURL/check-instanceof-domurl-functions.html 12 Already Existing: 13 fast/files/revoke-blob-url.html 14 fast/dom/window-domurl-crash.html 15 fast/files/apply-blob-url-to-img.html 16 fast/files/create-blob-url-crash.html 17 fast/files/workers/inline-worker-via-blob-url.html 18 19 * GNUmakefile.list.am: 20 * Target.pri: 21 * WebCore.gypi: 22 * WebCore.vcproj/WebCore.vcproj: 23 * WebCore.xcodeproj/project.pbxproj: 24 * dom/ScriptExecutionContext.cpp: 25 (WebCore::ScriptExecutionContext::~ScriptExecutionContext): 26 (WebCore::ScriptExecutionContext::fileThread): 27 (WebCore): 28 (WebCore::ScriptExecutionContext::publicURLManager): 29 * dom/ScriptExecutionContext.h: 30 (WebCore): 31 (ScriptExecutionContext): 32 * html/DOMURL.cpp: 33 (WebCore): 34 (WebCore::DOMURL::createObjectURL): Changed to static. 35 (WebCore::DOMURL::revokeObjectURL): ditto. 36 * html/DOMURL.h: 37 (DOMURL): 38 (WebCore::DOMURL::create): 39 * html/DOMURL.idl: 40 * html/PublicURLManager.h: Added. 41 (WebCore): 42 (PublicURLManager): 43 (WebCore::PublicURLManager::create): 44 (WebCore::PublicURLManager::contextDestroyed): 45 (WebCore::PublicURLManager::blobURLs): 46 (WebCore::PublicURLManager::streamURLs): 47 * page/DOMWindow.cpp: Removed object initialization for DOMURL. 48 (WebCore): 49 * page/DOMWindow.h: ditto. 50 (DOMWindow): 51 * page/DOMWindow.idl: 52 * workers/WorkerContext.cpp: 53 (WebCore): 54 * workers/WorkerContext.h: 55 (WorkerContext): 56 * workers/WorkerContext.idl: 57 1 58 2012-02-01 Brian Grinstead <briangrinstead@gmail.com> 2 59 -
trunk/Source/WebCore/GNUmakefile.list.am
r106953 r107082 2257 2257 Source/WebCore/html/PluginDocument.cpp \ 2258 2258 Source/WebCore/html/PluginDocument.h \ 2259 Source/WebCore/html/PublicURLManager.h \ 2259 2260 Source/WebCore/html/RadioInputType.cpp \ 2260 2261 Source/WebCore/html/RadioInputType.h \ -
trunk/Source/WebCore/Target.pri
r107035 r107082 1881 1881 html/MicroDataItemValue.h \ 1882 1882 html/PluginDocument.h \ 1883 html/PublicURLManager.h \ 1883 1884 html/StepRange.h \ 1884 1885 html/TextDocument.h \ -
trunk/Source/WebCore/WebCore.gypi
r107036 r107082 5376 5376 'html/PluginDocument.cpp', 5377 5377 'html/PluginDocument.h', 5378 'html/PublicURLManager.h', 5378 5379 'html/RadioInputType.cpp', 5379 5380 'html/RadioInputType.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r106953 r107082 60495 60495 </File> 60496 60496 <File 60497 RelativePath="..\html\PublicURLManager.h" 60498 > 60499 </File> 60500 <File 60497 60501 RelativePath="..\html\RadioInputType.cpp" 60498 60502 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r107026 r107082 280 280 0FF50271102BA96A0066F39A /* StyleMedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF5026E102BA9660066F39A /* StyleMedia.cpp */; }; 281 281 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF5026F102BA96A0066F39A /* StyleMedia.h */; }; 282 10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 10FB084A14E15C7E00A3DB98 /* PublicURLManager.h */; }; 282 283 1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1402645D0AFDC19B005919E2 /* LoggingMac.mm */; }; 283 284 1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 1403B99509EB13AF00797C7F /* DOMWindow.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 6981 6982 0FF5026F102BA96A0066F39A /* StyleMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleMedia.h; sourceTree = "<group>"; }; 6982 6983 0FF50270102BA96A0066F39A /* StyleMedia.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StyleMedia.idl; sourceTree = "<group>"; }; 6984 10FB084A14E15C7E00A3DB98 /* PublicURLManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublicURLManager.h; sourceTree = "<group>"; }; 6983 6985 1402645D0AFDC19B005919E2 /* LoggingMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingMac.mm; sourceTree = "<group>"; }; 6984 6986 1403B90C09EB124500797C7F /* DOMWindow.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindow.idl; sourceTree = "<group>"; }; … … 16942 16944 97205AB91239292700B17380 /* PluginDocument.cpp */, 16943 16945 97205ABA1239292700B17380 /* PluginDocument.h */, 16946 10FB084A14E15C7E00A3DB98 /* PublicURLManager.h */, 16944 16947 F55B3D971251F12D003EF269 /* RadioInputType.cpp */, 16945 16948 F55B3D981251F12D003EF269 /* RadioInputType.h */, … … 24158 24161 1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */, 24159 24162 1AAADDE914DC8DF800AF64B3 /* ScrollingTreeNodeMac.h in Headers */, 24163 10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */, 24160 24164 7A54858014E02D51006AE05A /* InspectorHistory.h in Headers */, 24161 24165 ); -
trunk/Source/WebCore/dom/ScriptExecutionContext.cpp
r106914 r107082 39 39 #include "FileThread.h" 40 40 #include "MessagePort.h" 41 #include "PublicURLManager.h" 41 42 #include "ScriptCallStack.h" 42 43 #include "SecurityOrigin.h" … … 126 127 m_fileThread = 0; 127 128 } 129 #endif 130 #if ENABLE(BLOB) 131 if (m_publicURLManager) 132 m_publicURLManager->contextDestroyed(); 128 133 #endif 129 134 } … … 386 391 #endif 387 392 393 #if ENABLE(BLOB) 394 PublicURLManager& ScriptExecutionContext::publicURLManager() 395 { 396 if (!m_publicURLManager) 397 m_publicURLManager = PublicURLManager::create(); 398 return *m_publicURLManager; 399 } 400 #endif 401 388 402 void ScriptExecutionContext::adjustMinimumTimerInterval(double oldMinimumTimerInterval) 389 403 { -
trunk/Source/WebCore/dom/ScriptExecutionContext.h
r106914 r107082 54 54 class MessagePort; 55 55 56 #if ENABLE(BLOB) 57 class PublicURLManager; 58 #endif 56 59 #if ENABLE(SQL_DATABASE) 57 60 class Database; … … 104 107 virtual void stopActiveDOMObjects(); 105 108 109 #if ENABLE(BLOB) 110 PublicURLManager& publicURLManager(); 111 #endif 106 112 void didCreateActiveDOMObject(ActiveDOMObject*, void* upcastPointer); 107 113 void willDestroyActiveDOMObject(ActiveDOMObject*); … … 206 212 class PendingException; 207 213 OwnPtr<Vector<OwnPtr<PendingException> > > m_pendingExceptions; 214 #if ENABLE(BLOB) 215 OwnPtr<PublicURLManager> m_publicURLManager; 216 #endif 208 217 209 218 #if ENABLE(SQL_DATABASE) -
trunk/Source/WebCore/html/DOMURL.cpp
r106914 r107082 1 1 /* 2 2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Motorola Mobility Inc. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 30 31 #include "DOMURL.h" 31 32 33 #include "ActiveDOMObject.h" 32 34 #include "Blob.h" 33 35 #include "BlobURL.h" 34 36 #include "KURL.h" 37 #include "PublicURLManager.h" 35 38 #include "ScriptExecutionContext.h" 39 #include "SecurityOrigin.h" 36 40 #include "ThreadableBlobRegistry.h" 41 #include <wtf/PassOwnPtr.h> 37 42 #include <wtf/MainThread.h> 38 43 … … 44 49 namespace WebCore { 45 50 46 DOMURL::DOMURL(ScriptExecutionContext* scriptExecutionContext)47 : ContextDestructionObserver(scriptExecutionContext)51 #if ENABLE(MEDIA_STREAM) 52 String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaStream* stream) 48 53 { 49 } 50 51 DOMURL::~DOMURL() 52 { 53 } 54 55 void DOMURL::contextDestroyed() 56 { 57 ContextDestructionObserver::contextDestroyed(); 58 59 HashSet<String>::iterator publicBlobURLsEnd = m_publicBlobURLs.end(); 60 for (HashSet<String>::iterator iter = m_publicBlobURLs.begin(); iter != publicBlobURLsEnd; ++iter) 61 ThreadableBlobRegistry::unregisterBlobURL(KURL(ParsedURLString, *iter)); 62 63 #if ENABLE(MEDIA_STREAM) 64 HashSet<String>::iterator publicStreamURLsEnd = m_publicStreamURLs.end(); 65 for (HashSet<String>::iterator iter = m_publicStreamURLs.begin(); iter != publicStreamURLsEnd; ++iter) 66 MediaStreamRegistry::registry().unregisterMediaStreamURL(KURL(ParsedURLString, *iter)); 67 #endif 68 } 69 70 #if ENABLE(MEDIA_STREAM) 71 String DOMURL::createObjectURL(MediaStream* stream) 72 { 73 if (!m_scriptExecutionContext || !stream) 54 if (!scriptExecutionContext || !stream) 74 55 return String(); 75 56 76 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext ()->securityOrigin());57 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext->securityOrigin()); 77 58 if (publicURL.isEmpty()) 78 59 return String(); … … 82 63 83 64 MediaStreamRegistry::registry().registerMediaStreamURL(publicURL, stream); 84 m_publicStreamURLs.add(publicURL.string());65 scriptExecutionContext->publicURLManager().streamURLs().add(publicURL.string()); 85 66 86 67 return publicURL.string(); … … 88 69 #endif 89 70 90 String DOMURL::createObjectURL( Blob* blob)71 String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, Blob* blob) 91 72 { 92 if (! m_scriptExecutionContext || !blob)73 if (!scriptExecutionContext || !blob) 93 74 return String(); 94 75 95 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext ()->securityOrigin());76 KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext->securityOrigin()); 96 77 if (publicURL.isEmpty()) 97 78 return String(); 98 79 99 80 ThreadableBlobRegistry::registerBlobURL(publicURL, blob->url()); 100 m_publicBlobURLs.add(publicURL.string());81 scriptExecutionContext->publicURLManager().blobURLs().add(publicURL.string()); 101 82 102 83 return publicURL.string(); 103 84 } 104 85 105 void DOMURL::revokeObjectURL( const String& urlString)86 void DOMURL::revokeObjectURL(ScriptExecutionContext* scriptExecutionContext, const String& urlString) 106 87 { 107 if (! m_scriptExecutionContext)88 if (!scriptExecutionContext) 108 89 return; 109 90 110 91 KURL url(KURL(), urlString); 111 92 112 if (m_publicBlobURLs.contains(url.string())) { 93 HashSet<String>& blobURLs = scriptExecutionContext->publicURLManager().blobURLs(); 94 if (blobURLs.contains(url.string())) { 113 95 ThreadableBlobRegistry::unregisterBlobURL(url); 114 m_publicBlobURLs.remove(url.string());96 blobURLs.remove(url.string()); 115 97 } 116 98 117 99 #if ENABLE(MEDIA_STREAM) 118 if (m_publicStreamURLs.contains(url.string())) { 100 HashSet<String>& streamURLs = scriptExecutionContext->publicURLManager().streamURLs(); 101 if (streamURLs.contains(url.string())) { 119 102 // FIXME: make sure of this assertion below. Raise a spec question if required. 120 103 // Since WebWorkers cannot obtain Stream objects, we should be on the main thread. 121 104 ASSERT(isMainThread()); 122 105 MediaStreamRegistry::registry().unregisterMediaStreamURL(url); 123 m_publicStreamURLs.remove(url.string());106 streamURLs.remove(url.string()); 124 107 } 125 108 #endif -
trunk/Source/WebCore/html/DOMURL.h
r106914 r107082 1 1 /* 2 2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Motorola Mobility Inc. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 27 28 #define DOMURL_h 28 29 29 #if ENABLE(BLOB) 30 31 #include "ActiveDOMObject.h" 30 #include "KURL.h" 32 31 #include "PlatformString.h" 33 32 #include <wtf/HashSet.h> … … 41 40 class ScriptExecutionContext; 42 41 43 class DOMURL : public RefCounted<DOMURL>, public ContextDestructionObserver { 42 class DOMURL : public RefCounted<DOMURL> { 43 44 44 public: 45 static PassRefPtr<DOMURL> create(ScriptExecutionContext* scriptExecutionContext) { return adoptRef(new DOMURL(scriptExecutionContext)); } 46 ~DOMURL(); 45 static PassRefPtr<DOMURL> create() { return adoptRef(new DOMURL); } 47 46 47 #if ENABLE(BLOB) 48 static void contextDestroyed(ScriptExecutionContext*); 49 50 static String createObjectURL(ScriptExecutionContext*, Blob*); 51 static void revokeObjectURL(ScriptExecutionContext*, const String&); 48 52 #if ENABLE(MEDIA_STREAM) 49 String createObjectURL(MediaStream*);53 static String createObjectURL(ScriptExecutionContext*, MediaStream*); 50 54 #endif 51 String createObjectURL(Blob*);52 void revokeObjectURL(const String&);53 54 private:55 explicit DOMURL(ScriptExecutionContext*);56 57 virtual void contextDestroyed();58 59 HashSet<String> m_publicBlobURLs;60 #if ENABLE(MEDIA_STREAM)61 HashSet<String> m_publicStreamURLs;62 55 #endif 63 56 }; … … 65 58 } // namespace WebCore 66 59 67 #endif // ENABLE(BLOB)68 69 60 #endif // DOMURL_h -
trunk/Source/WebCore/html/DOMURL.idl
r107041 r107082 1 1 /* 2 2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Motorola Mobility Inc. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 27 28 interface [ 28 29 Conditional=BLOB, 29 OmitConstructor,30 Constructor, 30 31 JSGenerateToNativeObject, 31 32 JSGenerateToJS, … … 33 34 ] DOMURL { 34 35 #if defined(ENABLE_MEDIA_STREAM) && ENABLE_MEDIA_STREAM 35 [ConvertNullStringTo=Undefined] DOMString createObjectURL(in MediaStream stream);36 static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in MediaStream stream); 36 37 #endif 37 [ConvertNullStringTo=Undefined] DOMString createObjectURL(in Blob blob);38 void revokeObjectURL(in DOMString url);38 static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in Blob blob); 39 static [CallWith=ScriptExecutionContext] void revokeObjectURL(in DOMString url); 39 40 }; 40 41 } -
trunk/Source/WebCore/html/PublicURLManager.h
r107081 r107082 1 1 /* 2 * Copyright (C) 201 1 Google Inc. All rights reserved.2 * Copyright (C) 2012 Motorola Mobility Inc. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #ifndef DOMURL_h27 #define DOMURL_h26 #ifndef PublicURLManager_h 27 #define PublicURLManager_h 28 28 29 29 #if ENABLE(BLOB) 30 #include "PlatformString.h" 31 #include "ScriptExecutionContext.h" 32 #include "ThreadableBlobRegistry.h" 33 #include <wtf/HashSet.h> 30 34 31 #include "ActiveDOMObject.h" 32 #include "PlatformString.h" 33 #include <wtf/HashSet.h> 34 #include <wtf/PassRefPtr.h> 35 #include <wtf/RefCounted.h> 35 #if ENABLE(MEDIA_STREAM) 36 #include "MediaStream.h" 37 #include "MediaStreamRegistry.h" 38 #endif 36 39 37 40 namespace WebCore { 38 41 39 class Blob;40 class MediaStream;41 42 class ScriptExecutionContext; 42 43 43 class DOMURL : public RefCounted<DOMURL>, public ContextDestructionObserver { 44 class PublicURLManager { 45 44 46 public: 45 static PassRefPtr<DOMURL> create(ScriptExecutionContext* scriptExecutionContext) { return adoptRef(new DOMURL(scriptExecutionContext)); } 46 ~DOMURL(); 47 static PassOwnPtr<PublicURLManager> create() { return adoptPtr(new PublicURLManager); } 48 void contextDestroyed() 49 { 50 HashSet<String>::iterator blobURLsEnd = m_blobURLs.end(); 51 for (HashSet<String>::iterator iter = m_blobURLs.begin(); iter != blobURLsEnd; ++iter) 52 ThreadableBlobRegistry::unregisterBlobURL(KURL(ParsedURLString, *iter)); 47 53 48 54 #if ENABLE(MEDIA_STREAM) 49 String createObjectURL(MediaStream*); 55 HashSet<String>::iterator streamURLsEnd = m_streamURLs.end(); 56 for (HashSet<String>::iterator iter = m_streamURLs.begin(); iter != streamURLsEnd; ++iter) 57 MediaStreamRegistry::registry().unregisterMediaStreamURL(KURL(ParsedURLString, *iter)); 50 58 #endif 51 String createObjectURL(Blob*); 52 void revokeObjectURL(const String&); 59 } 60 61 HashSet<String>& blobURLs() { return m_blobURLs; } 62 #if ENABLE(MEDIA_STREAM) 63 HashSet<String>& streamURLs() { return m_streamURLs; } 64 #endif 53 65 54 66 private: 55 explicit DOMURL(ScriptExecutionContext*); 56 57 virtual void contextDestroyed(); 58 59 HashSet<String> m_publicBlobURLs; 67 HashSet<String> m_blobURLs; 60 68 #if ENABLE(MEDIA_STREAM) 61 HashSet<String> m_ publicStreamURLs;69 HashSet<String> m_streamURLs; 62 70 #endif 63 71 }; … … 65 73 } // namespace WebCore 66 74 67 #endif // ENABLE(BLOB) 68 69 #endif // DOMURL_h 75 #endif // BLOB 76 #endif // PUBLICURLMANAGER_h -
trunk/Source/WebCore/page/DOMWindow.cpp
r106914 r107082 1898 1898 } 1899 1899 1900 #if ENABLE(BLOB)1901 DOMURL* DOMWindow::webkitURL() const1902 {1903 if (!m_domURL && isCurrentlyDisplayedInFrame())1904 m_domURL = DOMURL::create(this->scriptExecutionContext());1905 return m_domURL.get();1906 }1907 #endif1908 1909 1900 #if ENABLE(QUOTA) 1910 1901 StorageInfo* DOMWindow::webkitStorageInfo() const -
trunk/Source/WebCore/page/DOMWindow.h
r106914 r107082 352 352 using RefCounted<DOMWindow>::deref; 353 353 354 #if ENABLE(BLOB)355 DOMURL* webkitURL() const;356 #endif357 358 354 #if ENABLE(DEVICE_ORIENTATION) 359 355 DEFINE_ATTRIBUTE_EVENT_LISTENER(devicemotion); -
trunk/Source/WebCore/page/DOMWindow.idl
r107046 r107082 783 783 attribute [Conditional=BLOB] WebKitBlobBuilderConstructor WebKitBlobBuilder; 784 784 785 readonly attribute [Conditional=BLOB] DOMURLwebkitURL;785 attribute [Conditional=BLOB] DOMURLConstructor webkitURL; 786 786 787 787 #if defined(ENABLE_QUOTA) && ENABLE_QUOTA -
trunk/Source/WebCore/workers/WorkerContext.cpp
r106914 r107082 378 378 } 379 379 380 #if ENABLE(BLOB)381 DOMURL* WorkerContext::webkitURL() const382 {383 if (!m_domURL)384 m_domURL = DOMURL::create(this->scriptExecutionContext());385 return m_domURL.get();386 }387 #endif388 389 380 #if ENABLE(FILE_SYSTEM) 390 381 void WorkerContext::webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback) -
trunk/Source/WebCore/workers/WorkerContext.h
r106914 r107082 132 132 virtual bool isJSExecutionForbidden() const; 133 133 134 #if ENABLE(BLOB)135 DOMURL* webkitURL() const;136 #endif137 138 134 #if ENABLE(FILE_SYSTEM) 139 135 enum FileSystemType { -
trunk/Source/WebCore/workers/WorkerContext.idl
r107041 r107082 102 102 #endif 103 103 104 readonly attribute [Conditional=BLOB] DOMURLwebkitURL;104 attribute [Conditional=BLOB] DOMURLConstructor webkitURL; 105 105 106 106 #if defined(ENABLE_FILE_SYSTEM) && ENABLE_FILE_SYSTEM
Note: See TracChangeset
for help on using the changeset viewer.