Update to Chromium revision 12bfc336 (#338390).

- The ffmpeg library is now statically linked (see https://codereview.chromium.org/1141703002).
- Off-screen rendering of the PDF viewer does not work in combination with surfaces. Pass the
  `--disable-surfaces` command-line flag if GPU is enabled (see https://codereview.chromium.org/1169983006).
This commit is contained in:
Marshall Greenblatt
2015-07-23 20:06:56 -04:00
parent 50a9343cec
commit 8da8a4fbf1
69 changed files with 413 additions and 402 deletions

View File

@@ -92,7 +92,11 @@ class TracingTestHandler : public CefEndTracingCallback,
void OnEndTracingComplete(const CefString& tracing_file) override {
EXPECT_UI_THREAD();
base::FilePath file_path(tracing_file);
#if defined(OS_WIN)
base::FilePath file_path(tracing_file.ToWString());
#else
base::FilePath file_path(tracing_file.ToString());
#endif
CefPostTask(TID_FILE,
base::Bind(&TracingTestHandler::ReadTracingFile, this, file_path));
}