Title: [137389] trunk/Source/WebKit2
- Revision
- 137389
- Author
- [email protected]
- Date
- 2012-12-11 17:00:22 -0800 (Tue, 11 Dec 2012)
Log Message
<rdar://problem/12857870> [WK2 NetworkProcess] Cannot load HTTPS sites
https://bugs.webkit.org/show_bug.cgi?id=104732
Reviewed by Anders Carlsson.
* Shared/BlockingResponseMap.h: (BlockingBoolResponseMap::waitForResponse):
Fixed to make sense.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137388 => 137389)
--- trunk/Source/WebKit2/ChangeLog 2012-12-12 00:56:44 UTC (rev 137388)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-12 01:00:22 UTC (rev 137389)
@@ -1,3 +1,13 @@
+2012-12-11 Alexey Proskuryakov <[email protected]>
+
+ <rdar://problem/12857870> [WK2 NetworkProcess] Cannot load HTTPS sites
+ https://bugs.webkit.org/show_bug.cgi?id=104732
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/BlockingResponseMap.h: (BlockingBoolResponseMap::waitForResponse):
+ Fixed to make sense.
+
2012-12-11 Xianzhu Wang <[email protected]>
Add window.internals.mainThreadScrollReasonsAsText for testing slow scrolling
Modified: trunk/Source/WebKit2/Shared/BlockingResponseMap.h (137388 => 137389)
--- trunk/Source/WebKit2/Shared/BlockingResponseMap.h 2012-12-12 00:56:44 UTC (rev 137388)
+++ trunk/Source/WebKit2/Shared/BlockingResponseMap.h 2012-12-12 01:00:22 UTC (rev 137389)
@@ -71,8 +71,12 @@
while (true) {
MutexLocker locker(m_mutex);
- if (bool response = m_responses.take(requestID))
- return response;
+ HashMap<uint64_t, bool>::iterator iter = m_responses.find(requestID);
+ if (iter != m_responses.end()) {
+ bool result = iter->value;
+ m_responses.remove(iter);
+ return result;
+ }
m_condition.wait(m_mutex);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
