Changeset 18203 in webkit for trunk/JavaScriptCore/wtf/HashMap.h

Timestamp:

Dec 13, 2006, 3:20:13 PM (18 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Anders.

• added equality and inequality operations for HashMap and Vector, useful for comparing more complex types

• wtf/HashMap.h: (WTF::operator==): (WTF::operator!=):
• wtf/Vector.h: (WTF::operator==): (WTF::operator!=):

WebCore:

Reviewed by Anders.

• converted many places to use ResourceRequest instead of NSURLRequest

• WebCore.exp:
• loader/DocumentLoader.h:
• loader/FrameLoader.cpp: (WebCore::FrameLoader::stopPolicyCheck):
• loader/FrameLoader.h: (WebCore::PolicyCheck::request):
• loader/FrameLoaderClient.h:
• loader/MainResourceLoader.h:
• loader/mac/DocumentLoaderMac.mm: (WebCore::DocumentLoader::DocumentLoader): (WebCore::DocumentLoader::originalRequest): (WebCore::DocumentLoader::originalRequestCopy): (WebCore::DocumentLoader::request): (WebCore::DocumentLoader::initialRequest): (WebCore::DocumentLoader::actualRequest): (WebCore::DocumentLoader::URL): (WebCore::DocumentLoader::unreachableURL): (WebCore::DocumentLoader::replaceRequestURLForAnchorScroll): (WebCore::DocumentLoader::setRequest): (WebCore::DocumentLoader::stopLoading): (WebCore::DocumentLoader::setLastCheckedRequest): (WebCore::DocumentLoader::lastCheckedRequest): (WebCore::DocumentLoader::URLForHistory):
• loader/mac/FrameLoaderMac.mm: (WebCore::FrameLoader::load): (WebCore::FrameLoader::startLoadingMainResource): (WebCore::FrameLoader::applyUserAgent): (WebCore::FrameLoader::originalRequest): (WebCore::FrameLoader::receivedMainResourceError): (WebCore::FrameLoader::callContinueFragmentScrollAfterNavigationPolicy): (WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy): (WebCore::FrameLoader::commitProvisionalLoad): (WebCore::FrameLoader::initialRequest): (WebCore::FrameLoader::setRequest): (WebCore::FrameLoader::checkNavigationPolicy): (WebCore::FrameLoader::shouldReloadToHandleUnreachableURL): (WebCore::FrameLoader::reloadAllowingStaleData): (WebCore::FrameLoader::reload): (WebCore::FrameLoader::checkNewWindowPolicy): (WebCore::FrameLoader::continueAfterNewWindowPolicy): (WebCore::FrameLoader::continueAfterNavigationPolicy): (WebCore::FrameLoader::callContinueLoadAfterNavigationPolicy): (WebCore::FrameLoader::continueLoadAfterNavigationPolicy): (WebCore::FrameLoader::checkLoadCompleteForThisFrame): (WebCore::FrameLoader::callContinueLoadAfterNewWindowPolicy): (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy): (WebCore::FrameLoader::post): (WebCore::FrameLoader::addExtraFieldsToRequest): (WebCore::FrameLoader::isReloading): (WebCore::FrameLoader::referrer): (WebCore::FrameLoader::loadEmptyDocumentSynchronously): (WebCore::FrameLoader::loadResourceSynchronously): (WebCore::FrameLoader::originalRequestURL): (WebCore::PolicyCheck::set): (WebCore::PolicyCheck::call): (WebCore::PolicyCheck::clearRequest):
• loader/mac/MainResourceLoaderMac.mm: (WebCore::MainResourceLoader::callContinueAfterNavigationPolicy): (WebCore::MainResourceLoader::continueAfterNavigationPolicy): (WebCore::MainResourceLoader::isPostOrRedirectAfterPost):
• loader/mac/SubresourceLoaderMac.mm: (WebCore::SubresourceLoader::create):
• loader/mac/WebDataProtocol.h:
• loader/mac/WebDataProtocol.mm:
• platform/KURL.cpp: (WebCore::operator!=):
• platform/KURL.h:
• platform/mac/KURLMac.mm: (WebCore::KURL::getNSURL):
• platform/network/FormData.h: (WebCore::operator==): (WebCore::operator!=):
• platform/network/ResourceRequest.cpp: (WebCore::operator==):
• platform/network/ResourceRequest.h:
• platform/network/mac/ResourceRequestMac.mm: (WebCore::ResourceRequest::doUpdatePlatformRequest):

WebKit:

Reviewed by Anders.

• adjusted for changes from NSURLRequest to ResourceRequest

• Plugins/WebPluginController.mm:
• WebCoreSupport/WebFrameLoaderClient.h:
• WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::updateHistoryForReload): (WebFrameLoaderClient::dispatchIdentifierForInitialRequest): (WebFrameLoaderClient::dispatchDecidePolicyForMIMEType): (WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): (WebFrameLoaderClient::startDownload): (WebFrameLoaderClient::cannotShowURLError): (WebFrameLoaderClient::createDocumentLoader):
• WebView/WebDataSource.mm: (-[WebDataSource _initWithDocumentLoader:]): (-[WebDataSource initialRequest]): (-[WebDataSource request]):
• WebView/WebDocumentLoaderMac.h:
• WebView/WebDocumentLoaderMac.mm: (WebDocumentLoaderMac::WebDocumentLoaderMac):
• WebView/WebFrame.mm: (-[WebFrame _createItem:]): (-[WebFrame _loadItem:withLoadType:]): (-[WebFrame loadArchive:]):

File:

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

trunk/JavaScriptCore/wtf/HashMap.h

@@ -306 +306 @@
     }
 
+    template<typename T, typename U, typename V, typename W, typename X>
+    bool operator==(const HashMap<T, U, V, W, X>& a, const HashMap<T, U, V, W, X>& b)
+    {
+        if (a.size() != b.size())
+            return false;
+
+        typedef typename HashMap<T, U, V, W, X>::const_iterator const_iterator;
+
+        const_iterator end = a.end();
+        const_iterator notFound = b.end();
+        for (const_iterator it = a.begin(); it != end; ++it) {
+            const_iterator bPos = b.find(it->first);
+            if (bPos == notFound || it->second != bPos->second)
+                return false;
+        }
+
+        return true;
+    }
+
+    template<typename T, typename U, typename V, typename W, typename X>
+    inline bool operator!=(const HashMap<T, U, V, W, X>& a, const HashMap<T, U, V, W, X>& b)
+    {
+        return !(a == b);
+    }
+
     template<typename MappedType, typename HashTableType>
     void deleteAllPairSeconds(HashTableType& collection)