Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1900)

Unified Diff: Source/modules/websockets/WebSocketFrame.cpp

Issue 363613003: Removing using declarations that import names in the C++ Standard library. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/WebSocketFrame.cpp
diff --git a/Source/modules/websockets/WebSocketFrame.cpp b/Source/modules/websockets/WebSocketFrame.cpp
index 383cb78c88e263350e16af6b944d45940b35a0cf..cddd2e2b716ef6fab2690c335ec23ec69dc8f242 100644
--- a/Source/modules/websockets/WebSocketFrame.cpp
+++ b/Source/modules/websockets/WebSocketFrame.cpp
@@ -27,8 +27,6 @@
#include "wtf/CryptographicallyRandomNumber.h"
#include "wtf/MathExtras.h"
-using namespace std;
-
namespace WebCore {
// Constants for hybi-10 frame format.
@@ -97,7 +95,7 @@ WebSocketFrame::ParseFrameResult WebSocketFrame::parseFrame(char* data, size_t d
static const uint64_t maxPayloadLength = UINT64_C(0x7FFFFFFFFFFFFFFF);
size_t maskingKeyLength = masked ? maskingKeyWidthInBytes : 0;
- if (payloadLength64 > maxPayloadLength || payloadLength64 + maskingKeyLength > numeric_limits<size_t>::max()) {
+ if (payloadLength64 > maxPayloadLength || payloadLength64 + maskingKeyLength > std::numeric_limits<size_t>::max()) {
errorString = "WebSocket frame length too large: " + String::number(payloadLength64) + " bytes";
return FrameError;
}
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698