Changeset 18822 in webkit for trunk/JavaScriptCore/wtf/HashTraits.h

Timestamp:

Jan 12, 2007, 5:44:24 PM (18 years ago)

Author:

andersca

Message:

JavaScriptCore:

Reviewed by Darin.

• wtf/HashTraits.h: Add hash traits for unsigned long and unsigned long long.

WebCore:

Reviewed by Darin.

Use unsigned long for identifiers instead of Objective-C objects.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::loadResourceSynchronously): (WebCore::FrameLoader::startLoadingMainResource): (WebCore::FrameLoader::startLoading): (WebCore::FrameLoader::assignIdentifierToInitialRequest): (WebCore::FrameLoader::opened): (WebCore::FrameLoader::sendRemainingDelegateMessages): (WebCore::FrameLoader::requestFromDelegate): (WebCore::FrameLoader::loadedResourceFromMemoryCache):
• loader/FrameLoader.h:
• loader/FrameLoaderClient.h:
• loader/ResourceLoader.cpp: (WebCore::ResourceLoader::ResourceLoader): (WebCore::ResourceLoader::willSendRequest):
• loader/ResourceLoader.h: (WebCore::ResourceLoader::setIdentifier): (WebCore::ResourceLoader::identifier):
• page/Page.cpp: (WebCore::Page::Page): (WebCore::Page::createUniqueIdentifier):
• page/Page.h:
• platform/graphics/svg/SVGImageEmptyClients.h: (WebCore::SVGEmptyFrameLoaderClient::assignIdentifierToInitialRequest): (WebCore::SVGEmptyFrameLoaderClient::dispatchWillSendRequest): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidReceiveAuthenticationChallenge): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidCancelAuthenticationChallenge): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidReceiveResponse): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidReceiveContentLength): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidFinishLoading): (WebCore::SVGEmptyFrameLoaderClient::dispatchDidFailLoading): (WebCore::SVGEmptyFrameLoaderClient::incrementProgress): (WebCore::SVGEmptyFrameLoaderClient::completeProgress):

WebKit:

Reviewed by Darin.

Add a HashMap between unsigned longs and Objective-C objects and use it for
the resource load delegate.

• WebCoreSupport/WebFrameLoaderClient.h:
• WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::assignIdentifierToInitialRequest): (WebFrameLoaderClient::dispatchIdentifierForInitialRequest): (WebFrameLoaderClient::dispatchWillSendRequest): (WebFrameLoaderClient::dispatchDidReceiveAuthenticationChallenge): (WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge): (WebFrameLoaderClient::dispatchDidReceiveResponse): (WebFrameLoaderClient::dispatchDidReceiveContentLength): (WebFrameLoaderClient::dispatchDidFinishLoading): (WebFrameLoaderClient::dispatchDidFailLoading): (WebFrameLoaderClient::incrementProgress): (WebFrameLoaderClient::completeProgress):
• WebView/WebView.mm: (-[WebViewPrivate init]): (-[WebViewPrivate dealloc]): (-[WebView _addObject:forIdentifier:]): (-[WebView _objectForIdentifier:]): (-[WebView _removeObjectForIdentifier:]):
• WebView/WebViewInternal.h:

File:

• trunk/JavaScriptCore/wtf/HashTraits.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/HashTraits.h

@@ -82 +82 @@
         static long deletedValue() { return -1; }
     };
+    template<> struct HashTraits<unsigned long> : GenericHashTraits<unsigned long> {
+        static unsigned long deletedValue() { return static_cast<unsigned long>(-1); }
+    };
     template<> struct HashTraits<long long> : GenericHashTraits<long long> {
-        static long deletedValue() { return -1; }
-    };
-
+        static long long deletedValue() { return -1; }
+    };
+    template<> struct HashTraits<unsigned long> : GenericHashTraits<unsigned long long> {
+        static unsigned long long deletedValue() { return static_cast<unsigned long long>(-1); }
+    };
+    
     template<typename P> struct HashTraits<P*> : GenericHashTraits<P*> {
         typedef HashTraits<typename IntTypes<sizeof(P*)>::SignedType> StorageTraits;