Skip to content

GitLab

T
tangled
Commit c0be9ce8 authored by gab's avatar gab Committed by Commit bot
Browse files
Options

Revert of Rename WriteString to WriteStringPiece16 in SpdyFrameBuilder... 

Revert of Rename WriteString to WriteStringPiece16 in SpdyFrameBuilder (patchset #3 id:40001 of https://codereview.chromium.org/910393003/)

Reason for revert:
Appears to be causing iOS Device compile errors on waterfall: https://build.chromium.org/p/chromium.mac/builders/iOS_Device

Last 4 builds all fail with this log:

=== BUILD TARGET net_unittests OF PROJECT net WITH CONFIGURATION Release ===

Check dependencies

Ld /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/net_unittests.app/net_unittests normal armv7
    cd /Volumes/data/b/build/slave/iOS_Device/build/src/net
    export IPHONEOS_DEPLOYMENT_TARGET=7.0
    export PATH="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:/Applications/Xcode.app/Contents/Developer/usr/bin:/Users/chrome-bot/slavebin:/Volumes/data/b/depot_tools:/usr/local/git/bin:/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
    /Volumes/data/b/build/slave/iOS_Device/build/src/net/../third_party/llvm-build/Release+Asserts/bin/clang++ -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk -L/Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos -L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks -F/Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos -filelist /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/net.build/Release-iphoneos/net_unittests.build/Objects-normal/armv7/net_unittests.LinkFileList -dead_strip -Wl,-search_paths_first -stdlib=libc++ -miphoneos-version-min=7.0 /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libbase.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libbase_i18n.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libbase_prefs_test_support.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libdynamic_annotations.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libcrcrypto.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libgmock.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libgtest.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libchrome_zlib.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/liburl_lib.a -lbalsa -lnet -lnet_extras -lnet_test_support -lquic_tools /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libcrnspr.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libcrnss.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libcrssl.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libbase_static.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/liballocator_extension_thunks.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libmodp_b64.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libicui18n.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libicuuc.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libbase_prefs.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libnss_static.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libsqlite_regexp.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libcrnssckbi.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libzlib_x86_simd.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libsdch.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libsql.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libtest_support_base.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libxml.a /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/libtld_cleanup_util.a -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework UIKit -lsqlite3 -framework CFNetwork -framework MobileCoreServices -framework Security -framework SystemConfiguration -lresolv -lxml2 -Xlinker -dependency_info -Xlinker /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/net.build/Release-iphoneos/net_unittests.build/Objects-normal/armv7/net_unittests_dependency_info.dat -o /Volumes/data/b/build/slave/iOS_Device/build/src/xcodebuild/Release-iphoneos/net_unittests.app/net_unittests
Undefined symbols for architecture armv7:
  "net::SpdyFrameBuilder::WriteStringPiece16(base::BasicStringPiece<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > const&)", referenced from:
      net::SpdyFramerTest_DuplicateHeader_Test::TestBody() in spdy_framer_test.o
      net::SpdyFramerTest_MultiValueHeader_Test::TestBody() in spdy_framer_test.o
ld: symbol(s) not found for architecture armv7
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Original issue's description:
> Rename WriteString to WriteStringPiece16 in SpdyFrameBuilder
>
> As the comment in net/spdy/spdy_frame_builder.h by hkhalil@,
> rename WriteString to WriteStringPiece16.
>
> BUG=458880
> R=bnc@chromium.org
>
> Committed: https://crrev.com/d588d971032596c63dd082b3d5c7438997467ddd
> Cr-Commit-Position: refs/heads/master@{#319804}

TBR=bnc@chromium.org,asanka@chromium.org,mmenke@chromium.org,zhuoyu.qian@samsung.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=458880

Review URL: https://codereview.chromium.org/991313002

Cr-Commit-Position: refs/heads/master@{#319876}
parent bf33cc08
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
net/spdy/spdy_frame_builder.cc
View file @ c0be9ce8
......@@ -130,7 +130,7 @@ bool SpdyFrameBuilder::BeginNewFrame(const SpdyFramer& framer,
return success;
}
bool SpdyFrameBuilder::WriteStringPiece16(const base::StringPiece& value) {
bool SpdyFrameBuilder::WriteString(const std::string& value) {
if (value.size() > 0xffff) {
DCHECK(false) << "Tried to write string with length > 16bit.";
return false;
......
net/spdy/spdy_frame_builder.h
View file @ c0be9ce8
......@@ -110,7 +110,8 @@ class NET_EXPORT_PRIVATE SpdyFrameBuilder {
return (WriteBytes(&upper, sizeof(upper)) &&
WriteBytes(&lower, sizeof(lower)));
}
bool WriteStringPiece16(const base::StringPiece& value);
// TODO(hkhalil) Rename to WriteStringPiece16().
bool WriteString(const std::string& value);
bool WriteStringPiece32(const base::StringPiece& value);
bool WriteBytes(const void* data, uint32 data_len);
......
net/spdy/spdy_framer.cc
View file @ c0be9ce8
......@@ -1197,8 +1197,8 @@ void SpdyFramer::WriteHeaderBlock(SpdyFrameBuilder* frame,
SpdyHeaderBlock::const_iterator it;
for (it = headers->begin(); it != headers->end(); ++it) {
if (spdy_version < SPDY3) {
frame->WriteStringPiece16(it->first);
frame->WriteStringPiece16(it->second);
frame->WriteString(it->first);
frame->WriteString(it->second);
} else {
frame->WriteStringPiece32(it->first);
frame->WriteStringPiece32(it->second);
......@@ -3216,8 +3216,8 @@ void SpdyFramer::SerializeNameValueBlockWithoutCompression(
it != name_value_block.end();
++it) {
if (protocol_version() <= SPDY2) {
builder->WriteStringPiece16(it->first);
builder->WriteStringPiece16(it->second);
builder->WriteString(it->first);
builder->WriteString(it->second);
} else {
builder->WriteStringPiece32(it->first);
builder->WriteStringPiece32(it->second);
......
net/spdy/spdy_framer_test.cc
View file @ c0be9ce8
......@@ -871,10 +871,10 @@ TEST_P(SpdyFramerTest, DuplicateHeader) {
if (IsSpdy2()) {
frame.WriteUInt16(2); // Number of headers.
frame.WriteStringPiece16("name");
frame.WriteStringPiece16("value1");
frame.WriteStringPiece16("name");
frame.WriteStringPiece16("value2");
frame.WriteString("name");
frame.WriteString("value1");
frame.WriteString("name");
frame.WriteString("value2");
} else {
frame.WriteUInt32(2); // Number of headers.
frame.WriteStringPiece32("name");
......@@ -917,8 +917,8 @@ TEST_P(SpdyFramerTest, MultiValueHeader) {
string value("value1\0value2", 13);
if (IsSpdy2()) {
frame.WriteUInt16(1); // Number of headers.
frame.WriteStringPiece16("name");
frame.WriteStringPiece16(value);
frame.WriteString("name");
frame.WriteString(value);
} else if (spdy_version_ > SPDY3) {
// TODO(jgraettinger): If this pattern appears again, move to test class.
std::map<string, string> header_set;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment