Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py. Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281

Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py. Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
0529e5d0 · Ben Murdoch · 8346740f · 0529e5d0 · 0529e5d0 · 0529e5d0
Commit 0529e5d0 authored 11 years ago by Ben Murdoch
20 changed files
--- a/.DEPS.git
+++ b/.DEPS.git
@@ -5,20 +5,20 @@
 # FOR HOW TO ROLL DEPS
 vars = {
    'ffmpeg_hash':
-         '@681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87',
+         '@ac4a9f31fe2610bd146857bbd55d7a260003a888',
    'webkit_url':
         'https://chromium.googlesource.com/chromium/blink.git',
    'git_url':
         'https://chromium.googlesource.com',
    'webkit_rev':
-         '@d755a8eb69563c10f78b1649aaf4086e63d715ca',
+         '@8743fca5ed4ee3c23d06e83999ed3af08401dd08',
    'angle_revision':
         '74697cf2064c0a2c0d7e1b1b28db439286766a05'
 }

 deps = {
    'src/breakpad/src':
-        Var('git_url') + '/external/google-breakpad/src.git@f7a16b06ff5fbc96df95c0c94e65bd8b679c5b16',
+        Var('git_url') + '/external/google-breakpad/src.git@b9b51eb55b9746fcdbf6a1dd69667d1ac5b13604',
    'src/chrome/browser/resources/pdf/html_office':
        Var('git_url') + '/chromium/html-office-public.git@c29b3dcd20a03c5cec041764d178245b7d306dec',
    'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
@@ -32,7 +32,7 @@ deps = {
    'src/media/cdm/ppapi/api':
        Var('git_url') + '/chromium/cdm.git@53f0c537a5cc685663a51d4d8d7eb6b323a3e802',
    'src/native_client':
-        Var('git_url') + '/native_client/src/native_client.git@2d4a98a39fe258acf708511899fdb55f387a9d8b',
+        Var('git_url') + '/native_client/src/native_client.git@44c028817cc1a21f9d8814555b19fd42eae538ef',
    'src/sdch/open-vcdiff':
        Var('git_url') + '/external/open-vcdiff.git@438f2a5be6d809bc21611a94cd37bfc8c28ceb33',
    'src/testing/gmock':
@@ -54,7 +54,7 @@ deps = {
    'src/third_party/cacheinvalidation/src':
        Var('git_url') + '/external/google-cache-invalidation-api/src.git@6cd2fc3c3f3b3c95870be4696e642d4c3f051b59',
    'src/third_party/clang_format/script':
-        Var('git_url') + '/chromium/llvm-project/cfe/tools/clang-format.git@ebc1600adbe81140f086227e185a37e4498923eb',
+        Var('git_url') + '/chromium/llvm-project/cfe/tools/clang-format.git@385fc3379dc95b67d601b4384b16b1ec0bf12361',
    'src/third_party/cld_2/src':
        Var('git_url') + '/external/cld2.git@3fced387543ba9bed402923b3c6feb459fb61f58',
    'src/third_party/ffmpeg':
@@ -76,13 +76,13 @@ deps = {
    'src/third_party/libaddressinput/src':
        Var('git_url') + '/external/libaddressinput.git@3f7d76be9f572d8fdf512f4e2085109bc32a6128',
    'src/third_party/libc++/trunk':
-        Var('git_url') + '/chromium/llvm-project/libcxx.git@e3ef8601c853c8c056d96f6c88fd1f2b8e67372d',
+        Var('git_url') + '/chromium/llvm-project/libcxx.git@e785ef19637f88c5e3e9926fabd8a64cd7eac49d',
    'src/third_party/libc++abi/trunk':
-        Var('git_url') + '/chromium/llvm-project/libcxxabi.git@afba0fa03209315a0eb682cf3900d1a4ee141269',
+        Var('git_url') + '/chromium/llvm-project/libcxxabi.git@062ba40d41870a04e0aefb64f8122e91aa824147',
    'src/third_party/libexif/sources':
-        Var('git_url') + '/chromium/deps/libexif/sources.git@bd8e7ca8200abba0b57afc2c2e778d3db3fb4d33',
+        Var('git_url') + '/chromium/deps/libexif/sources.git@ed98343daabd7b4497f97fda972e132e6877c48a',
    'src/third_party/libjingle/source/talk':
-        Var('git_url') + '/external/webrtc/trunk/talk.git@92ad4370e12c1017bcc1137e738d81957a2d038e',
+        Var('git_url') + '/external/webrtc/trunk/talk.git@48284e07608ed8f726f67e48879ecc46df48fbd5',
    'src/third_party/libjpeg_turbo':
        Var('git_url') + '/chromium/deps/libjpeg_turbo.git@3395bcc26e390d2960d15020d4a4d27ae0c122fe',
    'src/third_party/libphonenumber/src/phonenumbers':
@@ -94,13 +94,13 @@ deps = {
    'src/third_party/libsrtp':
        Var('git_url') + '/chromium/deps/libsrtp.git@2f2e557b809dc1dd7977098ad354a540f04beb4e',
    'src/third_party/libvpx':
-        Var('git_url') + '/chromium/deps/libvpx.git@37fc486eee21129fa42b92b99778b54caf773980',
+        Var('git_url') + '/chromium/deps/libvpx.git@497a01b086cc703ed01af8e8aeed3e5733ad8315',
    'src/third_party/libwebm/source':
        Var('git_url') + '/webm/libwebm.git@fb6b6e64444c637f27d103fd113e0c7bf4f107dd',
    'src/third_party/libyuv':
-        Var('git_url') + '/external/libyuv.git@c99fa63f6b8a240fb28c354752a192ac64fdf9b9',
+        Var('git_url') + '/external/libyuv.git@05c4c715090dd1ffdd3b9bbc52cc078e6398ac3a',
    'src/third_party/mesa/src':
-        Var('git_url') + '/chromium/deps/mesa.git@66c1c789ce3407472de9ed620c9f815639058835',
+        Var('git_url') + '/chromium/deps/mesa.git@457812d99a213dedf1c4cd38018ff48118d0c44f',
    'src/third_party/openmax_dl':
        Var('git_url') + '/external/webrtc/deps/third_party/openmax.git@0349a5549a2ad49d03bef9742a77f62f72ece1ed',
    'src/third_party/openssl':
@@ -120,11 +120,11 @@ deps = {
    'src/third_party/sfntly/cpp/src':
        Var('git_url') + '/external/sfntly/cpp/src.git@8f090032dd4f8f8908f338cc73bb840b788377f2',
    'src/third_party/skia/gyp':
-        Var('git_url') + '/external/skia/gyp.git@b62fec7fcb34f152a209dc2184c8f89f4b80b75c',
+        Var('git_url') + '/external/skia/gyp.git@b460a213ddebe85e7a61996298582eff269b6f25',
    'src/third_party/skia/include':
-        Var('git_url') + '/external/skia/include.git@72f492321ad99fffc9962d8ef948a21df4f0687c',
+        Var('git_url') + '/external/skia/include.git@cfb32ead7d0bd08495f48486156ee9bc98045e69',
    'src/third_party/skia/src':
-        Var('git_url') + '/external/skia/src.git@482d2e86684260b1a7d8804b2c2df35bda72898a',
+        Var('git_url') + '/external/skia/src.git@93b0d3a5467e48b1b1ec7e4ab0c2c921dea045be',
    'src/third_party/smhasher/src':
        Var('git_url') + '/external/smhasher.git@b52816cce35fbfdda7d56c533cf53d15201513e3',
    'src/third_party/snappy/src':
@@ -134,31 +134,31 @@ deps = {
    'src/third_party/swig/Lib':
        Var('git_url') + '/chromium/deps/swig/Lib.git@f2a695d52e61e6a8d967731434f165ed400f0d69',
    'src/third_party/trace-viewer':
-        Var('git_url') + '/external/trace-viewer.git@06893dc07731bf2bf4620e096b8d14abc4c99076',
+        Var('git_url') + '/external/trace-viewer.git@40253adbe30b792022242a57d4ed4dec4cdabb27',
    'src/third_party/usrsctp/usrsctplib':
        Var('git_url') + '/external/usrsctplib.git@368d86efa422ae7e549399f8c35783c0e80232f0',
    'src/third_party/webdriver/pylib':
        Var('git_url') + '/external/selenium/py.git@8212c8017c92a1ba740caf01c1acefb3674a6a44',
    'src/third_party/webgl/src':
-        Var('git_url') + '/external/khronosgroup/webgl.git@b6bce42c2484666d3e28dc25b12f27eb06f39f27',
+        Var('git_url') + '/external/khronosgroup/webgl.git@8f445334c2f13a6be762fbdc90c4d80397d31788',
    'src/third_party/webpagereplay':
        Var('git_url') + '/external/web-page-replay.git@1cf80576c1c4beb6185af0ac70eb7379c5e8262b',
    'src/third_party/webrtc':
-        Var('git_url') + '/external/webrtc/trunk/webrtc.git@55bc2810c06fe624311518c4502af5ca8a5c085c',
+        Var('git_url') + '/external/webrtc/trunk/webrtc.git@b031016337f09d758a97ed51b67788e574431103',
    'src/third_party/yasm/source/patched-yasm':
        Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
    'src/tools/deps2git':
        Var('git_url') + '/chromium/tools/deps2git.git@f3ab61817e0c29800c6a5773eade3fc0d904d627',
    'src/tools/grit':
-        Var('git_url') + '/external/grit-i18n.git@3cc30808743b43aba1bc37a2c0e4b6fb55746508',
+        Var('git_url') + '/external/grit-i18n.git@1370f19146300b010e054e20bd733e183ba6f30e',
    'src/tools/gyp':
-        Var('git_url') + '/external/gyp.git@4e05c3342e09c44bbe594d0b5c7cda1227e7580f',
+        Var('git_url') + '/external/gyp.git@9a184eea4849278fd557627adcf48cb8e2ff9f67',
    'src/tools/page_cycler/acid3':
        Var('git_url') + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
    'src/tools/swarming_client':
        Var('git_url') + '/external/swarming.client.git@4eeada947e2fa4f48100ebb39b740bccabbc7747',
    'src/v8':
-        Var('git_url') + '/external/v8.git@c2e08d7d6b03e672e13fc3bf274a292009decce6',
+        Var('git_url') + '/external/v8.git@5aed4fc58b91cbb1ed563e2e07b74490ba953037',
 }

 deps_os = {
@@ -314,9 +314,9 @@ deps_os = {
        'src/chrome/tools/test/reference_build/chrome_linux':
            Var('git_url') + '/chromium/reference_builds/chrome_linux64.git@5186d1b279358de0d9a581399281f2268932cd37',
        'src/third_party/chromite':
-            Var('git_url') + '/chromiumos/chromite.git@473f7ab6baf1781618f379a7680b56048b5e0ec1',
+            Var('git_url') + '/chromiumos/chromite.git@aaa614c9521c705071737f840f68d1262036bebe',
        'src/third_party/cros_system_api':
-            Var('git_url') + '/chromiumos/platform/system_api.git@926038efc28089447a2f9292d7dc8cdc7eff7a36',
+            Var('git_url') + '/chromiumos/platform/system_api.git@916c5d850ca4424b1de79e9e1054f34a23ee2e33',
        'src/third_party/fontconfig/src':
            Var('git_url') + '/external/fontconfig.git@f16c3118e25546c1b749f9823c51827a60aeb5c1',
        'src/third_party/freetype2/src':
@@ -363,7 +363,7 @@ deps_os = {
        'src/third_party/swig/win':
            Var('git_url') + '/chromium/deps/swig/win.git@986f013ba518541adf5c839811efb35630a31031',
        'src/third_party/syzygy/binaries':
-            Var('git_url') + '/external/sawbuck/syzygy/binaries.git@df9bc6a160063bfced8def048fb75c560de449d1',
+            Var('git_url') + '/external/sawbuck/syzygy/binaries.git@fb4f87bc4c61151f2b9d38cd7ba321ab334a6992',
        'src/third_party/yasm/binaries':
            Var('git_url') + '/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881',
    },

--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ v8.log
 /chrome/app/theme/default_200_percent/google_chrome
 /chrome/app/theme/google_chrome
 /chrome/browser/autofill/internal
+/chrome/browser/extensions/api/ledger/
 /chrome/browser/extensions/default_extensions/chromeos
 /chrome/browser/google/linkdoctor_internal
 /chrome/browser/intents/internal/
@@ -86,6 +87,7 @@ v8.log
 /chrome/chrome_user32_delay_imports.xml
 /chrome/chrome_version_resources.xml
 /chrome/common/extensions/api/api.xml
+/chrome/common/extensions/api/ledger/
 /chrome/Hammer
 /chrome/installer/linux/debian_wheezy_amd64-sysroot/
 /chrome/installer/linux/debian_wheezy_i386-sysroot/

--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ Antonio Gomes <a1.gomes@sisa.samsung.com>
 Arthur Lussos <developer0420@gmail.com>
 Arun Mankuzhi <arun.m@samsung.com>
 Arunprasad Rajkumar <ararunprasad@gmail.com>
+Avinaash Doreswamy <avi.nitk@samsung.com>
 Balazs Kelemen <b.kelemen@samsung.com>
 Behara Mani Shyam Patro <behara.ms@samsung.com>
 Bem Jones-Bey <bemajaniman@gmail.com>
@@ -144,6 +145,7 @@ Janwar Dinata <j.dinata@gmail.com>
 Jared Shumway <jaredshumway94@gmail.com>
 Jared Wein <weinjared@gmail.com>
 Jay Soffian <jaysoffian@gmail.com>
+Jeado Ko <haibane84@gmail.com>
 Jesse Miller <jesse@jmiller.biz>
 Jesus Sanchez-Palencia <jesus.sanchez-palencia.fernandez.fil@intel.com>
 Jin Yang <jin.a.yang@intel.com>
@@ -263,6 +265,7 @@ Philippe Beaudoin <philippe.beaudoin@gmail.com>
 Pierre-Antoine LaFayette <pierre.lafayette@gmail.com>
 Po-Chun Chang <pochang0403@gmail.com>
 Prashant Nevase <prashant.n@samsung.com>
+Puttaraju R <puttaraju.r@samsung.com>
 Qiankun Miao <qiankun.miao@intel.com>
 Qing Zhang <qing.zhang@intel.com>
 Radu Stavila <stavila@adobe.com>
@@ -286,6 +289,7 @@ Robert Goldberg <goldberg@adobe.com>
 Robert Hogan <robhogan@gmail.com>
 Robert Nagy <robert.nagy@gmail.com>
 Robert Sesek <rsesek@bluestatic.org>
+Roland Takacs <rtakacs.u-szeged@partner.samsung.com>
 Rosen Dash <nqk836@motorola.com>
 Rosen Dash <rosen.dash@gmail.com>
 ruben <chromium@hybridsource.org>
@@ -335,6 +339,7 @@ Sunil Ratnu <sunil.ratnu@samsung.com>
 Sylvain Zimmer <sylvinus@gmail.com>
 Szymon Piechowicz <szymonpiechowicz@o2.pl>
 Takeshi Kurosawa <taken.spc@gmail.com>
+Tapu Kumar Ghose <ghose.tapu@gmail.com>
 Taylor Price <trprice@gmail.com>
 Ted Vessenes <tedvessenes@gmail.com>
 Teodora Novkovic <teodora.petrovic@gmail.com>

--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,13 +21,16 @@ group("root") {
    "//components/language_usage_metrics",
    "//components/navigation_metrics",
    "//components/onc",
+    "//components/os_crypt",
    "//components/startup_metric_utils",
+    "//components/resources:components_resources",
    #"//components/translate:translate_core_browser",
    #"//components/translate:translate_core_common",
+    "//components/url_matcher",
    "//crypto",
    "//device/usb",
    "//ipc",
-    #"//net",
+    "//net",
    #"//sdch",
    "//skia",
    #"//third_party/WebKit/Source/platform",
@@ -35,6 +38,7 @@ group("root") {
    "//third_party/leveldatabase",
    "//third_party/libpng",
    "//third_party/libusb",
+    "//third_party/libwebp",
    "//third_party/re2",
    "//third_party/smhasher:cityhash",
    "//third_party/smhasher:murmurhash3",
@@ -43,7 +47,9 @@ group("root") {
    "//tools/gn",
    "//ui/events",
    "//ui/gfx",
+    "//ui/resources",
    "//url",
+    "//v8:v8_base",
  ]

  if (is_linux) {
@@ -54,6 +60,9 @@ group("root") {

  if (is_android) {
    deps -= [
+      "//components/os_crypt",
+      "//crypto",
+      "//net",
      "//skia",
      "//third_party/libusb",
      "//tools/gn",

--- a/DEPS
+++ b/DEPS
@@ -19,43 +19,43 @@ vars = {
  "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
  "llvm_url": "http://src.chromium.org/llvm-project",
  "llvm_git": "https://llvm.googlesource.com",
-  "libcxx_revision": "197314",
-  "libcxxabi_revision": "197063",
+  "libcxx_revision": "206024",
+  "libcxxabi_revision": "206024",
  "webkit_trunk": "http://src.chromium.org/blink/trunk",
  "nacl_trunk": "http://src.chromium.org/native_client/trunk",
-  "webkit_revision": "171541",
+  "webkit_revision": "172351",
  "chromium_git": "https://chromium.googlesource.com",
  "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
  "skia_git": "https://skia.googlesource.com",
  "swig_revision": "230490",
-  "nacl_revision": "13006",
+  "nacl_revision": "13018",
  # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
  # to update other nacl_*_revision's.
  "nacl_tools_revision": "12970",  # native_client/DEPS: tools_rev
  "google_toolbox_for_mac_revision": "662",
  "libaddressinput_revision": "176",
  "libphonenumber_revision": "621",
-  "libvpx_revision": "263116",
+  "libvpx_revision": "264320",
  "lss_revision": "26",

  # These two FFmpeg variables must be updated together.  One is used for SVN
  # checkouts and the other for Git checkouts.
-  "ffmpeg_revision": "255431",
-  "ffmpeg_hash": "681ca6bfed239ad2e1a6a3c8a586839c6dbd3e87",
+  "ffmpeg_revision": "264299",
+  "ffmpeg_hash": "ac4a9f31fe2610bd146857bbd55d7a260003a888",

  "sfntly_revision": "228",
  "lighttpd_revision": "33737",
-  "skia_revision": "14196",
-  "skia_hash": "a1ed7aec95eb8c77d1a39834fea476780007cade",
+  "skia_revision": "14324",
+  "skia_hash": "6e332f768f873323b418ee7b028f28662bfb43c6",
  # Three lines of non-changing comments so that
  # the commit queue can handle CLs rolling Skia
  # and V8 without interference from each other.
  "v8_branch": "trunk",
-  "v8_revision": "20743",
+  "v8_revision": "20903",
  # Three lines of non-changing comments so that
  # the commit queue can handle CLs rolling WebRTC
  # and V8 without interference from each other.
-  "webrtc_revision": "5884",
+  "webrtc_revision": "5963",
  "jsoncpp_revision": "248",
  "nss_revision": "259440",
  # Three lines of non-changing comments so that
@@ -74,7 +74,7 @@ vars = {

 deps = {
  "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1313",
+    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1318",

  "src/sdch/open-vcdiff":
    (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
@@ -89,7 +89,7 @@ deps = {
    Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"),

  "src/third_party/trace-viewer":
-    (Var("googlecode_url") % "trace-viewer") + "/trunk@1240",
+    (Var("googlecode_url") % "trace-viewer") + "/trunk@1265",

  "src/third_party/WebKit":
    Var("webkit_trunk") + "@" + Var("webkit_revision"),
@@ -106,7 +106,7 @@ deps = {
    "/trunk/deps/third_party/icu46@262949",

  "src/third_party/libexif/sources":
-    "/trunk/deps/third_party/libexif/sources@263766",
+    "/trunk/deps/third_party/libexif/sources@265008",

  "src/third_party/hunspell":
   "/trunk/deps/third_party/hunspell@256272",
@@ -134,10 +134,10 @@ deps = {
    (Var("googlecode_url") % "snappy") + "/trunk@80",

  "src/tools/grit":
-    (Var("googlecode_url") % "grit-i18n") + "/trunk@160",
+    (Var("googlecode_url") % "grit-i18n") + "/trunk@167",

  "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1892",
+    (Var("googlecode_url") % "gyp") + "/trunk@1895",

  "src/tools/swarming_client":
    Var("chromium_git") + "/external/swarming.client.git@" +
@@ -191,7 +191,7 @@ deps = {

  "src/third_party/webgl/src":
    Var("chromium_git") +
-    "/external/khronosgroup/webgl.git@b6bce42c2484666d3e28dc25b12f27eb06f39f27",
+    "/external/khronosgroup/webgl.git@8f445334c2f13a6be762fbdc90c4d80397d31788",

  "src/third_party/swig/Lib":
    "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
@@ -253,7 +253,7 @@ deps = {
        "/trunk/jsoncpp/src/lib_json@" + Var("jsoncpp_revision"),

  "src/third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@994",
+    (Var("googlecode_url") % "libyuv") + "/trunk@1000",

  "src/third_party/smhasher/src":
    (Var("googlecode_url") % "smhasher") + "/trunk@151",
@@ -279,7 +279,7 @@ deps = {
    "/trunk/tools/deps2git@262731",

  "src/third_party/clang_format/script":
-    Var("llvm_url") + "/cfe/trunk/tools/clang-format@202065",
+    Var("llvm_url") + "/cfe/trunk/tools/clang-format@206068",

  "src/third_party/webpagereplay":
    (Var("googlecode_url") % "web-page-replay") + "/trunk@544",
@@ -294,7 +294,7 @@ deps = {
    "/trunk/deps/cdm@262570",

  "src/third_party/mesa/src":
-    "/trunk/deps/third_party/mesa@261106",
+    "/trunk/deps/third_party/mesa@265279",

  "src/third_party/cld_2/src":
    (Var("googlecode_url") % "cld2") + "/trunk@160",
@@ -362,7 +362,7 @@ deps_os = {
    # Binary level profile guided optimizations. This points to the
    # latest release binaries for the toolchain.
    "src/third_party/syzygy/binaries":
-      (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@2058",
+      (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@2126",

    # Binaries for nacl sdk.
    "src/third_party/nacl_sdk_binaries":
@@ -469,7 +469,7 @@ deps_os = {
    # For Linux and Chromium OS.
    "src/third_party/cros_system_api":
      Var("chromiumos_git") + "/platform/system_api.git" +
-      "@926038efc28089447a2f9292d7dc8cdc7eff7a36",
+      "@916c5d850ca4424b1de79e9e1054f34a23ee2e33",

    # Note that this is different from Android's freetype repo.
    "src/third_party/freetype2/src":
@@ -479,7 +479,7 @@ deps_os = {
    # Build tools for targeting ChromeOS.
    "src/third_party/chromite":
      Var("chromiumos_git") + "/chromite.git" +
-      "@473f7ab6baf1781618f379a7680b56048b5e0ec1",
+      "@aaa614c9521c705071737f840f68d1262036bebe",

    # Dependency of chromite.git.
    "src/third_party/pyelftools":

--- a/GypAndroid.darwin-arm.mk
+++ b/GypAndroid.darwin-arm.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.darwin-arm.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.darwin-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.darwin-arm.mk
@@ -152,6 +153,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.darwin-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.darwin-arm.mk
@@ -302,7 +304,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.darwin-arm.mk
-include $(LOCAL_PATH)/ui/events/events.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.darwin-arm.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.darwin-arm.mk

--- a/GypAndroid.darwin-mips.mk
+++ b/GypAndroid.darwin-mips.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.darwin-mips.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.darwin-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.darwin-mips.mk
@@ -148,6 +149,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.darwin-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.darwin-mips.mk
@@ -284,7 +286,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.darwin-mips.mk
-include $(LOCAL_PATH)/ui/events/events.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.darwin-mips.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.darwin-mips.mk

--- a/GypAndroid.darwin-x86.mk
+++ b/GypAndroid.darwin-x86.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.darwin-x86.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.darwin-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.darwin-x86.mk
@@ -157,6 +158,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.darwin-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.darwin-x86.mk
@@ -312,7 +314,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.darwin-x86.mk
-include $(LOCAL_PATH)/ui/events/events.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.darwin-x86.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.darwin-x86.mk

--- a/GypAndroid.darwin-x86_64.mk
+++ b/GypAndroid.darwin-x86_64.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.darwin-x86_64.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.darwin-x86_64.mk
@@ -157,6 +158,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.darwin-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.darwin-x86_64.mk
@@ -312,7 +314,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.darwin-x86_64.mk
-include $(LOCAL_PATH)/ui/events/events.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.darwin-x86_64.mk

--- a/GypAndroid.linux-arm.mk
+++ b/GypAndroid.linux-arm.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.linux-arm.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.linux-arm.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-arm.mk
@@ -152,6 +153,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.linux-arm.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-arm.mk
@@ -302,7 +304,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-arm.mk
-include $(LOCAL_PATH)/ui/events/events.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.linux-arm.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-arm.mk

--- a/GypAndroid.linux-mips.mk
+++ b/GypAndroid.linux-mips.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.linux-mips.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.linux-mips.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-mips.mk
@@ -148,6 +149,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.linux-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.linux-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.linux-mips.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-mips.mk
@@ -284,7 +286,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-mips.mk
-include $(LOCAL_PATH)/ui/events/events.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-mips.mk

--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.linux-x86.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.linux-x86.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-x86.mk
@@ -157,6 +158,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.linux-x86.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-x86.mk
@@ -312,7 +314,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-x86.mk
-include $(LOCAL_PATH)/ui/events/events.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.linux-x86.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-x86.mk

--- a/GypAndroid.linux-x86_64.mk
+++ b/GypAndroid.linux-x86_64.mk
@@ -75,6 +75,7 @@ include $(LOCAL_PATH)/gpu/command_buffer_client.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/command_buffer_common.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/command_buffer_service.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/disk_cache_proto.target.linux-x86_64.mk
+include $(LOCAL_PATH)/gpu/gl_in_process_context.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_c_lib.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_cmd_helper.target.linux-x86_64.mk
 include $(LOCAL_PATH)/gpu/gles2_implementation.target.linux-x86_64.mk
@@ -157,6 +158,7 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_a
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_codemirror_js.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_console_js.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_css.target.linux-x86_64.mk
+include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_devices_js.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_elements_js.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_extensions_js.target.linux-x86_64.mk
 include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/concatenated_devtools_js.target.linux-x86_64.mk
@@ -312,7 +314,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/base/ui_base_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/dom4_keycode_converter.target.linux-x86_64.mk
-include $(LOCAL_PATH)/ui/events/events.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/events_base.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/events/gesture_detection.target.linux-x86_64.mk
 include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-x86_64.mk

--- a/NOTICE
+++ b/NOTICE
@@ -2639,6 +2639,39 @@ DAMAGES.
   See the License for the specific language governing permissions and
   limitations under the License.

+// Copyright (C) 2002-2013 The ANGLE Project Authors. 
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//     Redistributions of source code must retain the above copyright
+//     notice, this list of conditions and the following disclaimer.
+//
+//     Redistributions in binary form must reproduce the above 
+//     copyright notice, this list of conditions and the following
+//     disclaimer in the documentation and/or other materials provided
+//     with the distribution.
+//
+//     Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
+//     Ltd., nor the names of their contributors may be used to endorse
+//     or promote products derived from this software without specific
+//     prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
 // Copyright (C) 2002-2013 The ANGLE Project Authors. 
 // All rights reserved.
 //
@@ -5360,6 +5393,34 @@ FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 /*************************************************************************
 *
 *  IAccessible2 IDL Specification 

--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -79,7 +79,7 @@ _BANNED_OBJC_FUNCTIONS = (
      False,
    ),
    (
-      'NSTrackingArea',
+      r'/NSTrackingArea\W',
      (
       'The use of NSTrackingAreas is prohibited. Please use CrTrackingArea',
       'instead.',
@@ -396,7 +396,14 @@ def _CheckNoBannedFunctions(input_api, output_api):
  for f in input_api.AffectedFiles(file_filter=file_filter):
    for line_num, line in f.ChangedContents():
      for func_name, message, error in _BANNED_OBJC_FUNCTIONS:
-        if func_name in line:
+        matched = False
+        if func_name[0:1] == '/':
+          regex = func_name[1:]
+          if input_api.re.search(regex, line):
+            matched = True
+        elif func_name in line:
+            matched = True
+        if matched:
          problems = warnings;
          if error:
            problems = errors;
@@ -911,8 +918,7 @@ def _CheckSpamLogging(input_api, output_api):
                 r"^chrome[\\\/]browser[\\\/]ui[\\\/]startup[\\\/]"
                     r"startup_browser_creator\.cc$",
                 r"^chrome[\\\/]installer[\\\/]setup[\\\/].*",
-                 r"^chrome[\\\/]renderer[\\\/]extensions[\\\/]"
-                     r"logging_native_handler\.cc$",
+                 r"^extensions[\\\/]renderer[\\\/]logging_native_handler\.cc$",
                 r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]"
                     r"gl_helper_benchmark\.cc$",
                 r"^native_client_sdk[\\\/]",
@@ -1255,6 +1261,16 @@ def CheckChangeOnUpload(input_api, output_api):
  return results


+def GetTryServerMasterForBot(bot):
+  """Returns the Try Server master for the given bot.
+
+  Assumes that most Try Servers are on the tryserver.chromium master."""
+  non_default_master_map = {
+      'linux_gpu': 'tryserver.chromium.gpu',
+  }
+  return non_default_master_map.get(bot, 'tryserver.chromium')
+
+
 def GetDefaultTryConfigs(bots=None):
  """Returns a list of ('bot', set(['tests']), optionally filtered by [bots].

@@ -1323,6 +1339,7 @@ def GetDefaultTryConfigs(bots=None):
      'linux_chromium_compile_dbg': ['defaulttests'],
      'linux_chromium_rel': ['defaulttests'],
      'linux_chromium_clang_dbg': ['defaulttests'],
+      'linux_gpu': ['defaulttests'],
      'linux_nacl_sdk_build': ['compile'],
      'linux_rel': [
          'telemetry_perf_unittests',
@@ -1388,16 +1405,18 @@ def GetDefaultTryConfigs(bots=None):
                                 for x in builders_and_tests[bot]]

  if bots:
-    return {
-        'tryserver.chromium': dict((bot, set(builders_and_tests[bot]))
-                                   for bot in bots)
-    }
+    filtered_builders_and_tests = dict((bot, set(builders_and_tests[bot]))
+                                       for bot in bots)
  else:
-    return {
-        'tryserver.chromium': dict(
-            (bot, set(tests))
-            for bot, tests in builders_and_tests.iteritems())
-    }
+    filtered_builders_and_tests = dict(
+        (bot, set(tests))
+        for bot, tests in builders_and_tests.iteritems())
+
+  # Build up the mapping from tryserver master to bot/test.
+  out = dict()
+  for bot, tests in filtered_builders_and_tests.iteritems():
+    out.setdefault(GetTryServerMasterForBot(bot), {})[bot] = tests
+  return out


 def CheckChangeOnCommit(input_api, output_api):
@@ -1450,6 +1469,7 @@ def GetPreferredTryMasters(project, change):
      'linux_chromium_chromeos_rel',
      'linux_chromium_clang_dbg',
      'linux_chromium_rel',
+      'linux_gpu',
      'mac_chromium_compile_dbg',
      'mac_chromium_rel',
      'win_chromium_compile_dbg',

--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -215,6 +215,11 @@
    'content': {
      'filepath': 'content/',
    },
+    'content_input': {
+      'filepath': 'content/browser/renderer_host/input/|'\
+                  'content/common/input/|'\
+                  'content/renderer/input/',
+    },
    'content_shell': {
      'filepath': 'content/shell/',
    },
@@ -225,12 +230,12 @@
    'deep_memory_profiler': {
      'filepath': 'tools/(deep_memory_profiler|find_runtime_symbols)',
    },
-    'device_orientation': {
-      'filepath': 'content/browser/device_orientation/|'\
-                  'content/common/device_orientation/|'\
-                  'content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java|'\
-                  'content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java|'\
-                  'content/renderer/device_orientation/',
+    'device_sensors': {
+      'filepath': 'content/browser/device_sensors/|'\
+                  'content/common/device_sensors/|'\
+                  'content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java|'\
+                  'content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java|'\
+                  'content/renderer/device_sensors/',
    },
    'devtools': {
      'filepath': 'devtools',
@@ -273,6 +278,9 @@
    'drive_resource_metadata': {
      'filepath': 'chrome/browser/chromeos/drive/resource_metadata'
    },
+    'events': {
+      'filepath': 'ui/events/',
+    },
    'extension': {
      'filepath': 'extension',
    },
@@ -286,7 +294,8 @@
                  'filebrowse'
    },
    'filesapp': {
-      'filepath': 'chrome/browser/resources/file_manager',
+      'filepath': 'chrome/browser/resources/file_manager|' \
+                  'ui/file_manager'
    },
    'ftp': {
      'filepath': 'ftp',
@@ -458,6 +467,9 @@
      'filepath': 'chrome/browser/resources/options/|'\
          'chrome/browser/ui/webui/options/',
    },
+    'overview_mode': {
+      'filepath': 'ash/wm/overview/',
+    },
    'ozone': {
      'filepath': 'ui/ozone/|'\
        'ui/events/ozone/|'\
@@ -752,10 +764,11 @@
    'clipboard': ['dcheng@chromium.org'],
    'content': ['jam@chromium.org',
                'darin-cc@chromium.org'],
+    'content_input': ['jdduke+watch@chromium.org'],
    'content_shell': ['jochen+watch@chromium.org'],
    'cookie_monster': ['erikwright@chromium.org'],
    'deep_memory_profiler': ['dmikurube+memory@chromium.org'],
-    'device_orientation': ['timvolodine@chromium.org', 'mvanouwerkerk@chromium.org'],
+    'device_sensors': ['timvolodine@chromium.org', 'mvanouwerkerk@chromium.org', 'rijubrata.bhaumik@intel.com'],
    'devtools': ['pfeldman@chromium.org', 'yurys@chromium.org',
                 'vsevik@chromium.org', 'aandrey+blink@chromium.org',
                 'paulirish+reviews@chromium.org',
@@ -768,6 +781,7 @@
    'downloads_ui': ['asanka@chromium.org', 'benjhayden+dwatch@chromium.org'],
    'drive': ['tfarina@chromium.org'],
    'drive_resource_metadata': ['hashimoto+watch@chromium.org'],
+    'events': ['tdresser+watch@chromium.org'],
    'extension': ['chromium-apps-reviews@chromium.org',
                  'extensions-reviews@chromium.org'],
    'fileapi': ['kinuko+watch@chromium.org',
@@ -831,6 +845,7 @@
            'pedrosimonetti+watch@chromium.org'],
    'omnibox': ['suzhe@chromium.org'],
    'options': ['dbeam+watch-options@chromium.org'],
+    'overview_mode': ['tdanderson+overview@chromium.org'],
    'ozone': ['kalyan.kondapally@intel.com', 'ozone-reviews@chromium.org',
              'rjkroege@chromium.org'],
    'panels': ['dimich@chromium.org', 'jennb@chromium.org',
@@ -899,7 +914,8 @@
    'version_assembly': ['caitkp+watch@chromium.org',
                         'gab+watch@chromium.org'],
    'views': ['tfarina@chromium.org'],
-    'views_core': ['ben+views@chromium.org'],
+    'views_core': ['ben+views@chromium.org',
+                   'tdanderson+views@chromium.org'],
    'views_corewm': ['ben+corewm@chromium.org'],
    'virtual_keyboard': ['dfaden+virtualkb@google.com',
                         'groby+virtualkb@chromium.org'],

--- a/android_webview/android_webview_common.target.darwin-arm.mk
+++ b/android_webview/android_webview_common.target.darwin-arm.mk
@@ -95,7 +95,6 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-fno-tree-sra \
 	-fuse-ld=gold \
 	-Wno-psabi \
@@ -147,12 +146,15 @@ MY_DEFS_Debug := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -240,7 +242,6 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-fno-tree-sra \
 	-fuse-ld=gold \
 	-Wno-psabi \
@@ -292,12 +293,15 @@ MY_DEFS_Release := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -392,7 +396,6 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
-	-Wl,--gc-sections \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed

--- a/android_webview/android_webview_common.target.darwin-mips.mk
+++ b/android_webview/android_webview_common.target.darwin-mips.mk
@@ -95,7 +95,6 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-EL \
 	-mhard-float \
 	-ffunction-sections \
@@ -146,12 +145,15 @@ MY_DEFS_Debug := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -239,7 +241,6 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-EL \
 	-mhard-float \
 	-ffunction-sections \
@@ -290,12 +291,15 @@ MY_DEFS_Release := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -388,7 +392,6 @@ LOCAL_LDFLAGS_Debug := \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
-	-Wl,--gc-sections \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed

--- a/android_webview/android_webview_common.target.darwin-x86.mk
+++ b/android_webview/android_webview_common.target.darwin-x86.mk
@@ -94,7 +94,6 @@ MY_CFLAGS_Debug := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-msse2 \
 	-mfpmath=sse \
 	-mmmx \
@@ -148,12 +147,15 @@ MY_DEFS_Debug := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -239,7 +241,6 @@ MY_CFLAGS_Release := \
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
-	-Wno-unknown-pragmas \
 	-msse2 \
 	-mfpmath=sse \
 	-mmmx \
@@ -293,12 +294,15 @@ MY_DEFS_Release := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -390,7 +394,6 @@ LOCAL_LDFLAGS_Debug := \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
-	-Wl,--gc-sections \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed

--- a/android_webview/android_webview_common.target.darwin-x86_64.mk
+++ b/android_webview/android_webview_common.target.darwin-x86_64.mk
@@ -96,7 +96,6 @@ MY_CFLAGS_Debug := \
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-Wno-unknown-pragmas \
 	-m64 \
 	-march=x86-64 \
 	-fuse-ld=gold \
@@ -148,12 +147,15 @@ MY_DEFS_Debug := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -241,7 +243,6 @@ MY_CFLAGS_Release := \
 	-pipe \
 	-fPIC \
 	-Wno-unused-local-typedefs \
-	-Wno-unknown-pragmas \
 	-m64 \
 	-march=x86-64 \
 	-fuse-ld=gold \
@@ -293,12 +294,15 @@ MY_DEFS_Release := \
 	'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
 	'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
 	'-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
+	'-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
+	'-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
 	'-DSK_SUPPORT_LEGACY_N32_NAME' \
+	'-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
+	'-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
 	'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
-	'-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DCHROME_PNG_WRITE_SUPPORT' \
 	'-DPNG_USER_CONFIG' \
@@ -390,7 +394,6 @@ LOCAL_LDFLAGS_Debug := \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
-	-Wl,--gc-sections \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed