DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from https://crrev.com/333737

Browse Source 
* Cherrypick crrev.com/333293 (freetype -> freetype-android).
* Update mojo/go/go.py to use android-16 (NDK API level 16), which is
  4.1 (first Jelly Bean). Chromium dropped support for 14.
* TODO (separately): also update tools/go/upload.py and upload new
  binaries?
* Roll android_tools (to match Chromium).
* Small fixes to match //base changes: base::ObserverList, TraceConfig,
  ThreadTicks, etc.
* Restore build/ls.py (and add it to the list of files to not roll).
* Remove the dependency on third_party/instrumented_libraries.
* Add "enable_topchrome_md = false" to build/config/ui.gni.
* Add build/config/ui.gni to files_not_to_roll in
  update_from_chromium.py. (We should probably get rid of the use_glib
  variable/argument, and others as well.)
* Remove mojo/tools/roll/{roll_network_service.py,
  roll_network_service_patches/network_service.patch}. These are for
  rolling from Chromium, whereas we now have/use monet.
* Roll buildtools (to match Chromium).
* Modify sanitizer gn/gni files to make it work (patch included).
  (Maybe the patch even works -- I haven't checked.)

TBR=rockot@chromium.org,jamesr@chromium.org,rogulenko@google.com

Review URL: https://codereview.chromium.org/1180693002.
This commit is contained in:
Viet-Trung Luu 2015-06-11 10:01:25 -07:00
parent 80fbf90cb9
commit 3c2e575fac
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/platform/url_request_types.cc
View File

@ -25,10 +25,10 @@ class HeaderFlattener : public blink::WebHTTPHeaderVisitor {
// Skip over referrer headers found in the header map because we already
// pulled it out as a separate parameter.
if (LowerCaseEqualsASCII(name_latin1, "referer"))
if (base::LowerCaseEqualsASCII(name_latin1, "referer"))
return;
if (LowerCaseEqualsASCII(name_latin1, "accept"))
if (base::LowerCaseEqualsASCII(name_latin1, "accept"))
has_accept_header_ = true;
auto header = HttpHeader::New();

6
shell/android/tracing_controller.cc
View File

@ -8,6 +8,7 @@
#include "base/android/jni_string.h"
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/trace_event/trace_config.h"
#include "base/trace_event/trace_event.h"
#include "jni/TracingController_jni.h"
@ -45,9 +46,8 @@ static void StartTracing(JNIEnv* env, jclass clazz) {
LOG(INFO) << "Starting trace";
base::trace_event::TraceLog::GetInstance()->SetEnabled(
base::trace_event::CategoryFilter("*"),
base::trace_event::TraceLog::RECORDING_MODE,
base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL));
base::trace_event::TraceConfig("*", base::trace_event::RECORD_UNTIL_FULL),
base::trace_event::TraceLog::RECORDING_MODE);
}
static void StopTracing(JNIEnv* env, jclass clazz, jstring path) {