webkit/glue/glue_serialize.cc - Issue 387020: Upstreaming WebKit.gyp

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/glue/glue_serialize.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "webkit/glue/glue_serialize.h"	5 #include "webkit/glue/glue_serialize.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/pickle.h"	9 #include "base/pickle.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "googleurl/src/gurl.h"	11 #include "googleurl/src/gurl.h"

12 #include "webkit/api/public/WebData.h"	12 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"

13 #include "webkit/api/public/WebHistoryItem.h"	13 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"

14 #include "webkit/api/public/WebHTTPBody.h"	14 #include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h"

15 #include "webkit/api/public/WebPoint.h"	15 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"

16 #include "webkit/api/public/WebString.h"	16 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"

17 #include "webkit/api/public/WebVector.h"	17 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"

18 #include "webkit/glue/glue_util.h"	18 #include "webkit/glue/glue_util.h"

19 #include "webkit/glue/webkit_glue.h"	19 #include "webkit/glue/webkit_glue.h"

20	20

21 using WebKit::WebData;	21 using WebKit::WebData;

22 using WebKit::WebHistoryItem;	22 using WebKit::WebHistoryItem;

23 using WebKit::WebHTTPBody;	23 using WebKit::WebHTTPBody;

24 using WebKit::WebPoint;	24 using WebKit::WebPoint;

25 using WebKit::WebString;	25 using WebKit::WebString;

26 using WebKit::WebUChar;	26 using WebKit::WebUChar;

27 using WebKit::WebVector;	27 using WebKit::WebVector;

(...skipping 366 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
394 const WebHistoryItem& item = HistoryItemFromString(content_state, false);	394 const WebHistoryItem& item = HistoryItemFromString(content_state, false);

395 if (item.isNull()) {	395 if (item.isNull()) {

396 // Couldn't parse the string, return an empty string.	396 // Couldn't parse the string, return an empty string.

397 return std::string();	397 return std::string();

398 }	398 }

399	399

400 return HistoryItemToString(item);	400 return HistoryItemToString(item);

401 }	401 }

402	402

403 } // namespace webkit_glue	403 } // namespace webkit_glue

OLD	NEW

« no previous file with comments | « webkit/glue/glue_serialize.h ('k') | webkit/glue/glue_serialize_unittest.cc » ('j') | no next file with comments »