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

Issue 1472573002: These packets got reformatted at some point, maybe before the clang-format off annotation was added. (Closed)

Created:
5 years, 1 month ago by ianswett
Modified:
5 years ago
Reviewers:
Ryan Hamilton
CC:
chromium-reviews, cbentzel+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@107711408
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

These packets got reformatted at some point, maybe before the clang-format off annotation was added. Merge internal change: 107790487 Get rid of unnecessary CompareSpdyHeaderBlocks method, use operator== instead. No behavior change. Merge internal change: 107784612 minor changes to batched write to make DCHECK happy. Behind gfe2_reloadable_flag_quic_batch_writes Also includes a test fix to update bytes on the correct stream to get the no-op we intended (rather than a no-op we didn't intend) Merge internal change: 107783952 R=rch@chromium.org BUG=

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+23 lines, -56 lines) Patch
M net/quic/quic_framer_test.cc View 2 chunks +8 lines, -54 lines 0 comments Download
M net/quic/quic_write_blocked_list.h View 1 chunk +1 line, -0 lines 0 comments Download
M net/quic/quic_write_blocked_list_test.cc View 1 chunk +1 line, -2 lines 0 comments Download
M net/tools/quic/quic_server_bin.cc View 1 chunk +13 lines, -0 lines 2 comments Download

Depends on Patchset:

Dependent Patchsets:

Messages

Total messages: 4 (0 generated)
ianswett
5 years, 1 month ago (2015-11-21 22:39:58 UTC) #1
Ryan Hamilton
https://codereview.chromium.org/1472573002/diff/1/net/tools/quic/quic_server_bin.cc File net/tools/quic/quic_server_bin.cc (right): https://codereview.chromium.org/1472573002/diff/1/net/tools/quic/quic_server_bin.cc#newcode59 net/tools/quic/quic_server_bin.cc:59: >>>>>>> More merge conflicts?
5 years, 1 month ago (2015-11-22 00:54:41 UTC) #2
ianswett
quic_server_bin.cc fixed in Final. https://codereview.chromium.org/1472573002/diff/1/net/tools/quic/quic_server_bin.cc File net/tools/quic/quic_server_bin.cc (right): https://codereview.chromium.org/1472573002/diff/1/net/tools/quic/quic_server_bin.cc#newcode59 net/tools/quic/quic_server_bin.cc:59: >>>>>>> On 2015/11/22 00:54:41, Ryan ...
5 years, 1 month ago (2015-11-23 20:04:50 UTC) #3
Ryan Hamilton
5 years, 1 month ago (2015-11-23 20:53:32 UTC) #4
lgtm

Powered by Google App Engine
This is Rietveld 408576698