Bug 172085

Summary: Update json.hpp to v2.1.1
Product: WebKit Reporter: David Kilzer (:ddkilzer) <ddkilzer>
Component: WebKit2Assignee: David Kilzer (:ddkilzer) <ddkilzer>
Status: RESOLVED FIXED    
Severity: Normal CC: achristensen, cdumez, commit-queue, ggaren, krollin, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch none

Description David Kilzer (:ddkilzer) 2017-05-13 21:53:04 PDT
<https://webkit.org/b/000000>
<rdar://problem/32180980>

Reviewed by NOBODY (OOPS!).

* NetworkProcess/capture/NetworkCaptureEvent.cpp:
- Define JSON_NOEXCEPTION as 1 to disable exceptions in
json.hpp.
(WebKit::NetworkCapture::JSONCoder<String>::encode):
(WebKit::NetworkCapture::JSONCoder<WebCore::SharedBuffer>::encode):
- Build std::string passing in length to avoid the need for a
custom basic_json() constructor, and for efficiency.

* NetworkProcess/capture/json.hpp:
- Update to v2.1.1 and remove customizations.
---
 3 files changed, 6324 insertions(+), 4094 deletions(-)
Comment 1 David Kilzer (:ddkilzer) 2017-05-13 21:53:07 PDT
Created attachment 310061 [details]
Patch
Comment 2 Alex Christensen 2017-05-15 12:51:42 PDT
Comment on attachment 310061 [details]
Patch

*sigh*
We really need to make our JSON parser use callbacks like our YARR parser to allow us to use it instead of this.
r=me.  Let's update.
Comment 3 WebKit Commit Bot 2017-05-15 13:20:42 PDT
Comment on attachment 310061 [details]
Patch

Clearing flags on attachment: 310061

Committed r216875: <http://trac.webkit.org/changeset/216875>
Comment 4 WebKit Commit Bot 2017-05-15 13:20:44 PDT
All reviewed patches have been landed.  Closing bug.