Issue 16927005: Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}.

Issue 16927005: Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}. (Closed)

Created:
7 years, 6 months ago by darin (slow to review)

Modified:
7 years, 6 months ago

Reviewers:
michaeln

CC:
chromium-reviews, tzik+watch_chromium.org, jam, joi+watch-content_chromium.org, darin-cc_chromium.org, kinuko+watch, jochen+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}. R=michaeln@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=208387

Patch Set 1 #

Patch Set 2 : Rebase #

Created: 7 years, 6 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+42 lines, -53 lines)			Patch
M	content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc	View	1	2 chunks	+2 lines, -3 lines	0 comments	Download
M	content/browser/in_process_webkit/indexed_db_dispatcher_host.cc	View		5 chunks	+4 lines, -4 lines	0 comments	Download
M	content/browser/indexed_db/indexed_db_context_impl.cc	View	1	1 chunk	+0 lines, -1 line	0 comments	Download
M	content/browser/indexed_db/indexed_db_internals_ui.cc	View		1 chunk	+0 lines, -1 line	0 comments	Download
M	content/browser/indexed_db/webidbfactory_impl.cc	View		4 chunks	+4 lines, -4 lines	0 comments	Download
M	content/child/fileapi/webfilesystem_callback_adapters.cc	View		3 chunks	+2 lines, -3 lines	0 comments	Download
M	content/child/webblobregistry_impl.cc	View		3 chunks	+2 lines, -2 lines	0 comments	Download
M	content/renderer/dom_serializer_browsertest.cc	View		3 chunks	+3 lines, -4 lines	0 comments	Download
M	content/renderer/render_view_impl.cc	View	1	7 chunks	+10 lines, -11 lines	0 comments	Download
M	content/renderer/renderer_webkitplatformsupport_impl.cc	View	1	6 chunks	+5 lines, -6 lines	0 comments	Download
M	content/shell/renderer/webkit_test_runner.cc	View	1	4 chunks	+4 lines, -8 lines	0 comments	Download
M	content/worker/worker_webkitplatformsupport_impl.cc	View		7 chunks	+6 lines, -6 lines	0 comments	Download

Messages

Total messages: 6 (0 generated)

Expand Messages | Collapse Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/darin@chromium.org/16927005/1

7 years, 6 months ago (2013-06-24 21:49:12 UTC) #3

commit-bot: I haz the power

Failed to apply patch for content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years, 6 months ago (2013-06-25 02:49:50 UTC) #4

Failed to apply patch for
content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
  Hunk #1 FAILED at 11.
  Hunk #2 succeeded at 95 (offset -22 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc.rej

Patch:      
content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
Index: content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
diff --git
a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
index
e600a49c6b52ac35226b364568fb103a6ef345fd..47d76ddf1bc0bc0e38bfa02be867bb5af896b8c8
100644
--- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
+++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
@@ -11,7 +11,6 @@
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/base/file_path_string_conversions.h"
 
 namespace content {
 
@@ -117,14 +116,14 @@ WebKit::WebData
BrowserWebKitPlatformSupportImpl::loadResource(
 
 int BrowserWebKitPlatformSupportImpl::databaseDeleteFile(
     const WebKit::WebString& vfs_file_name, bool sync_dir) {
-  const base::FilePath path = webkit_base::WebStringToFilePath(vfs_file_name);
+  const base::FilePath& path = base::FilePath::FromUTF16Unsafe(vfs_file_name);
   return file_util::Delete(path, false) ? 0 : 1;
 }
 
 long long BrowserWebKitPlatformSupportImpl::availableDiskSpaceInBytes(
     const WebKit::WebString& fileName) {
   return base::SysInfo::AmountOfFreeDiskSpace(
-      webkit_base::WebStringToFilePath(fileName));
+      base::FilePath::FromUTF16Unsafe(fileName));
 }
 
 }  // namespace content

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/darin@chromium.org/16927005/18002

7 years, 6 months ago (2013-06-25 03:36:28 UTC) #5

darin (slow to review)

7 years, 6 months ago (2013-06-25 04:01:13 UTC) #6

Message was sent while issue was closed.

Committed patchset #2 manually as r208387 (presubmit successful).

Expand Messages | Collapse Messages