Title: [143740] trunk/Source
- Revision
- 143740
- Author
- commit-qu...@webkit.org
- Date
- 2013-02-22 09:26:04 -0800 (Fri, 22 Feb 2013)
Log Message
[BlackBerry] Rename first/second to key/value in HashMap iterators
https://bugs.webkit.org/show_bug.cgi?id=110577
Patch by Carlos Garcia Campos <cargar...@rim.com> on 2013-02-22
Reviewed by Rob Buis.
Iterators were renamed to key/value in r130612.
Source/WebCore:
* platform/blackberry/AuthenticationChallengeManager.cpp:
(WebCore::AuthenticationChallengeManager::pageVisibilityChanged):
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::handleNotifyMultipartHeaderReceived):
Source/WebKit/blackberry:
* WebKitSupport/NotificationManager.cpp:
(BlackBerry::WebKit::NotificationManager::show):
(BlackBerry::WebKit::NotificationManager::clearNotifications):
(BlackBerry::WebKit::NotificationManager::removeNotificationFromContextMap):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143739 => 143740)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 17:23:54 UTC (rev 143739)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 17:26:04 UTC (rev 143740)
@@ -1,3 +1,17 @@
+2013-02-22 Carlos Garcia Campos <cargar...@rim.com>
+
+ [BlackBerry] Rename first/second to key/value in HashMap iterators
+ https://bugs.webkit.org/show_bug.cgi?id=110577
+
+ Reviewed by Rob Buis.
+
+ Iterators were renamed to key/value in r130612.
+
+ * platform/blackberry/AuthenticationChallengeManager.cpp:
+ (WebCore::AuthenticationChallengeManager::pageVisibilityChanged):
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::handleNotifyMultipartHeaderReceived):
+
2013-02-22 Kentaro Hara <hara...@chromium.org>
[V8] Add comments to checkTypeOrDieTrying()
Modified: trunk/Source/WebCore/platform/blackberry/AuthenticationChallengeManager.cpp (143739 => 143740)
--- trunk/Source/WebCore/platform/blackberry/AuthenticationChallengeManager.cpp 2013-02-22 17:23:54 UTC (rev 143739)
+++ trunk/Source/WebCore/platform/blackberry/AuthenticationChallengeManager.cpp 2013-02-22 17:26:04 UTC (rev 143740)
@@ -140,10 +140,10 @@
return;
}
- if (iter->second == visible)
+ if (iter->value == visible)
return;
- iter->second = visible;
+ iter->value = visible;
if (!visible)
return;
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (143739 => 143740)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-02-22 17:23:54 UTC (rev 143739)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-02-22 17:26:04 UTC (rev 143740)
@@ -418,14 +418,14 @@
bool needsCopyfromOriginalResponse = true;
int replaceHeadersIndex = 0;
while (BlackBerry::Platform::MultipartStream::replaceHeaders[replaceHeadersIndex]) {
- if (it->first.lower() == BlackBerry::Platform::MultipartStream::replaceHeaders[replaceHeadersIndex]) {
+ if (it->key.lower() == BlackBerry::Platform::MultipartStream::replaceHeaders[replaceHeadersIndex]) {
needsCopyfromOriginalResponse = false;
break;
}
replaceHeadersIndex++;
}
if (needsCopyfromOriginalResponse)
- m_multipartResponse->setHTTPHeaderField(it->first, it->second);
+ m_multipartResponse->setHTTPHeaderField(it->key, it->value);
}
m_multipartResponse->setIsMultipartPayload(true);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (143739 => 143740)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-02-22 17:23:54 UTC (rev 143739)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-02-22 17:26:04 UTC (rev 143740)
@@ -1,5 +1,19 @@
2013-02-22 Carlos Garcia Campos <cargar...@rim.com>
+ [BlackBerry] Rename first/second to key/value in HashMap iterators
+ https://bugs.webkit.org/show_bug.cgi?id=110577
+
+ Reviewed by Rob Buis.
+
+ Iterators were renamed to key/value in r130612.
+
+ * WebKitSupport/NotificationManager.cpp:
+ (BlackBerry::WebKit::NotificationManager::show):
+ (BlackBerry::WebKit::NotificationManager::clearNotifications):
+ (BlackBerry::WebKit::NotificationManager::removeNotificationFromContextMap):
+
+2013-02-22 Carlos Garcia Campos <cargar...@rim.com>
+
[BlackBerry] Remove ProtocolHandler methods from ChromeClientBlackBerry
https://bugs.webkit.org/show_bug.cgi?id=110567
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp (143739 => 143740)
--- trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp 2013-02-22 17:23:54 UTC (rev 143739)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/NotificationManager.cpp 2013-02-22 17:26:04 UTC (rev 143740)
@@ -57,7 +57,7 @@
m_notificationIDMap.set(notificationID, notification);
NotificationContextMap::iterator it = m_notificationContextMap.add(notification->scriptExecutionContext(), Vector<String>()).iterator;
- it->second.append(notificationID);
+ it->value.append(notificationID);
m_webPagePrivate->client()->showNotification(notificationID, notification->title(), notification->body(), notification->iconURL().string(), notification->tag(), notification->scriptExecutionContext()->securityOrigin()->toString());
return true;
@@ -78,7 +78,7 @@
if (it == m_notificationContextMap.end())
return;
- Vector<String>& notificationIDs = it->second;
+ Vector<String>& notificationIDs = it->value;
std::vector<BlackBerry::Platform::String> ids;
size_t count = notificationIDs.size();
for (size_t i = 0; i < count; ++i) {
@@ -218,10 +218,10 @@
// This is a helper function for managing the hash maps.
NotificationContextMap::iterator it = m_notificationContextMap.find(notification->scriptExecutionContext());
ASSERT(it != m_notificationContextMap.end());
- size_t index = it->second.find(notificationID);
+ size_t index = it->value.find(notificationID);
ASSERT(index != notFound);
- it->second.remove(index);
- if (it->second.isEmpty())
+ it->value.remove(index);
+ if (it->value.isEmpty())
m_notificationContextMap.remove(it);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
