Attempt #3: Change Skia DEPS to pull from googlesource (git)

- Uploading from pure-svn and intending to commit manually to properly remove
  the directory from svn.
- Includes deps_whitelist change for new Skia DEP

R=iannucci@chromium.org, mkosiba@chromium.org, torne@chromium.org

Review URL: https://codereview.chromium.org/283163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271262 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -31,7 +31,6 @@ vars = {
   "webkit_revision": "174203",
   "chromium_git": "https://chromium.googlesource.com",
   "chromiumos_git": "https://chromium.googlesource.com/chromiumos",
-  "skia_git": "https://skia.googlesource.com",
   "swig_revision": "230490",
   "nacl_revision": "13181",
   # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
@@ -44,8 +43,7 @@ vars = {
   "lss_revision": "26",
   "sfntly_revision": "228",
   "lighttpd_revision": "33737",
-  "skia_revision": "14765",
-  "skia_hash": "24f6e29fc133f1082c73e2a96f30bee92e3123aa",
+  "skia_revision": "b0ce4b6fc8da4c3aa491fc43512e9187df1dfdae",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.
@@ -165,14 +163,8 @@ deps = {
     (Var("googlecode_url") % "sfntly") + "/trunk/cpp/src@" +
     Var("sfntly_revision"),
 
-  "src/third_party/skia/src":
-    (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
-
-  "src/third_party/skia/gyp":
-    (Var("googlecode_url") % "skia") + "/trunk/gyp@" + Var("skia_revision"),
-
-  "src/third_party/skia/include":
-    (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"),
+  "src/third_party/skia":
+    Var("chromium_git") + "/skia.git@" + Var("skia_revision"),
 
   "src/third_party/ots":
     (Var("googlecode_url") % "ots") + "/trunk@113",

android_webview/buildbot/deps_whitelist.py

@@ -53,9 +53,7 @@ class DepsWhitelist(object):
       'third_party/opus/src',
       'third_party/ots',
       'third_party/sfntly/cpp/src',
-      'third_party/skia/gyp',
-      'third_party/skia/include',
-      'third_party/skia/src',
+      'third_party/skia',
       'third_party/smhasher/src',
       'third_party/usrsctp/usrsctplib',
       'third_party/webrtc',

third_party/skia/LICENSE

-// Copyright (c) 2011 Google Inc. 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.

third_party/skia/OWNERS

-reed@google.com
-bsalomon@google.com

third_party/skia/README.chromium

-Name: skia
-URL: http://code.google.com/p/skia
-Version: unknown
-Security Critical: yes
-License: BSD