| Index: third_party/WebKit/public/platform/WebData.h
|
| diff --git a/third_party/WebKit/public/platform/WebData.h b/third_party/WebKit/public/platform/WebData.h
|
| index ba79a0dd6c34f45671bdcb88b6b1ee1a0224da94..4d21c10bdb03c542653a03237bc999b2769d12d3 100644
|
| --- a/third_party/WebKit/public/platform/WebData.h
|
| +++ b/third_party/WebKit/public/platform/WebData.h
|
| @@ -83,11 +83,15 @@ class BLINK_PLATFORM_EXPORT WebData {
|
| #else
|
| template <class C>
|
| WebData(const C& c) {
|
| + /* DO NOT SUBMIT - merge conflict marker
|
| + * Please spell |data| and |size| (rather than |Data| and |Size|) below. */
|
| assign(c.data(), c.size());
|
| }
|
|
|
| template <class C>
|
| WebData& operator=(const C& c) {
|
| + /* DO NOT SUBMIT - merge conflict marker
|
| + * Please spell |data| and |size| (rather than |Data| and |Size|) below. */
|
| assign(c.data(), c.size());
|
| return *this;
|
| }
|
|
|