Bug 172085 - Update json.hpp to v2.1.1
Summary: Update json.hpp to v2.1.1
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2017-05-13 21:53 PDT by David Kilzer (:ddkilzer)
Modified: 2017-05-15 13:20 PDT (History)
6 users (show)

See Also:

Attachments
Patch (485.84 KB, patch)
2017-05-13 21:53 PDT, David Kilzer (:ddkilzer) 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.