Title: [169844] trunk/Source/WebCore
- Revision
- 169844
- Author
- [email protected]
- Date
- 2014-06-11 15:01:03 -0700 (Wed, 11 Jun 2014)
Log Message
Remove some more unneeded member functions from HTTPHeaderMap
https://bugs.webkit.org/show_bug.cgi?id=133768
Reviewed by Simon Fraser.
* loader/CrossOriginAccessControl.cpp:
(WebCore::createAccessControlPreflightRequest):
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::find): Deleted.
(WebCore::HTTPHeaderMap::keys): Deleted.
* platform/network/HTTPHeaderMap.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169843 => 169844)
--- trunk/Source/WebCore/ChangeLog 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/ChangeLog 2014-06-11 22:01:03 UTC (rev 169844)
@@ -1,3 +1,17 @@
+2014-06-11 Anders Carlsson <[email protected]>
+
+ Remove some more unneeded member functions from HTTPHeaderMap
+ https://bugs.webkit.org/show_bug.cgi?id=133768
+
+ Reviewed by Simon Fraser.
+
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::createAccessControlPreflightRequest):
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::find): Deleted.
+ (WebCore::HTTPHeaderMap::keys): Deleted.
+ * platform/network/HTTPHeaderMap.h:
+
2014-06-11 Jer Noble <[email protected]>
Unreviwed Mac release build fix; mark the keyPath parameter as unused.
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (169843 => 169844)
--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-11 22:01:03 UTC (rev 169844)
@@ -116,13 +116,13 @@
StringBuilder headerBuffer;
bool appendComma = false;
- for (const auto& headerName : requestHeaderFields.keys()) {
+ for (const auto& headerField : requestHeaderFields) {
if (appendComma)
headerBuffer.appendLiteral(", ");
else
appendComma = true;
- headerBuffer.append(headerName);
+ headerBuffer.append(headerField.key);
}
preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", headerBuffer.toString().lower());
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169843 => 169844)
--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-11 22:01:03 UTC (rev 169844)
@@ -108,11 +108,6 @@
return find(name) != end();
}
-HTTPHeaderMap::iterator HTTPHeaderMap::find(const char* name)
-{
- return m_headers.find<CaseFoldingCStringTranslator>(name);
-}
-
HTTPHeaderMap::const_iterator HTTPHeaderMap::find(const char* name) const
{
return m_headers.find<CaseFoldingCStringTranslator>(name);
@@ -128,10 +123,4 @@
return m_headers.remove(m_headers.find<CaseFoldingCStringTranslator>(name));
}
-WTF::IteratorRange<HTTPHeaderMap::const_iterator::Keys> HTTPHeaderMap::keys() const
-{
- return m_headers.keys();
-}
-
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169843 => 169844)
--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-11 22:01:03 UTC (rev 169844)
@@ -44,7 +44,6 @@
typedef HashMap<AtomicString, String, CaseFoldingHash> HashMapType;
public:
typedef HashMapType::const_iterator const_iterator;
- typedef HashMapType::iterator iterator;
typedef HashMapType::AddResult AddResult;
HTTPHeaderMap();
@@ -68,15 +67,12 @@
bool contains(const char*) const;
String get(const char*) const;
const_iterator find(const char*) const;
- iterator find(const char*);
AddResult add(const char* name, const String& value);
bool remove(const char*);
const_iterator begin() const { return m_headers.begin(); }
const_iterator end() const { return m_headers.end(); }
- WTF::IteratorRange<const_iterator::Keys> keys() const;
-
friend bool operator==(const HTTPHeaderMap& a, const HTTPHeaderMap& b)
{
return a.m_headers == b.m_headers;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
