Skip to content

Commit

Permalink
Add material-foundation dependencies.
Browse files Browse the repository at this point in the history
These are third party libraries used by Chrome for iOS.

BUG=none

Review-Url: https://codereview.chromium.org/2551963004
Cr-Commit-Position: refs/heads/master@{#438189}
  • Loading branch information
Arcank authored and Commit bot committed Dec 13, 2016
1 parent 22a19da commit ad24399
Show file tree
Hide file tree
Showing 13 changed files with 158 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ vs-chromium-project.txt
/ios/third_party/earl_grey/src
/ios/third_party/fishhook/src
/ios/third_party/gcdwebserver/src
/ios/third_party/material_font_disk_loader_ios/src
/ios/third_party/material_roboto_font_loader_ios/src
/ios/third_party/material_sprited_animation_view_ios/src
/ios/third_party/material_text_accessibility_ios/src
/ios/third_party/ochamcrest/src
/ios_internal
Expand Down
9 changes: 9 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,15 @@ deps_os = {
'src/ios/third_party/gcdwebserver/src':
Var('chromium_git') + '/external/github.com/swisspol/GCDWebServer.git' + '@' + '3d5fd0b8281a7224c057deb2d17709b5bea64836',

'src/ios/third_party/material_font_disk_loader_ios/src':
Var('chromium_git') + '/external/github.com/material-foundation/material-font-disk-loader-ios.git' + '@' + '20c8fe37329cb18826f90159ce4ee445079e2e46',

'src/ios/third_party/material_roboto_font_loader_ios/src':
Var('chromium_git') + '/external/github.com/material-foundation/material-roboto-font-loader-ios.git' + '@' + '2e83b0fdbbd9b12782aa886695dd29b077bad430',

'src/ios/third_party/material_sprited_animation_view_ios/src':
Var('chromium_git') + '/external/github.com/material-foundation/material-sprited-animation-view-ios.git' + '@' + 'e240cdcd4538f0763ca5bd8c5afc2991eb482f1a',

'src/ios/third_party/material_text_accessibility_ios/src':
Var('chromium_git') + '/external/github.com/google/material-text-accessibility-ios.git' + '@' + '96d2b0f13976a897bc7a41daf67f36d9548cff94',

Expand Down
23 changes: 23 additions & 0 deletions ios/third_party/material_font_disk_loader_ios/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

config("material_font_disk_loader_ios_config") {
include_dirs = [ "src/src" ]
visibility = [ ":material_font_disk_loader_ios" ]
}

source_set("material_font_disk_loader_ios") {
sources = [
"src/src/MDFFontDiskLoader.h",
"src/src/MDFFontDiskLoader.m",
"src/src/MaterialFontDiskLoader.h",
]
public_configs = [ ":material_font_disk_loader_ios_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":material_font_disk_loader_ios_config",
"//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code",
]
}
2 changes: 2 additions & 0 deletions ios/third_party/material_font_disk_loader_ios/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lpromero@chromium.org
rohitrao@chromium.org
13 changes: 13 additions & 0 deletions ios/third_party/material_font_disk_loader_ios/README.chromium
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Name: Material Font Disk Loader iOS
URL: https://github.com/material-foundation/material-font-disk-loader-ios
Version: 0
Revision: 20c8fe37329cb18826f90159ce4ee445079e2e46
License: Apache 2.0
License File: src/LICENSE
Security Critical: yes

Description:
Registers a single custom font asset from disk.

Local Modifications:
None
48 changes: 48 additions & 0 deletions ios/third_party/material_roboto_font_loader_ios/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

config("material_roboto_font_loader_ios_config") {
include_dirs = [ "src/src" ]
visibility = [ ":material_roboto_font_loader_ios" ]
}

source_set("material_roboto_font_loader_ios") {
sources = [
"src/src/MDFRobotoFontLoader.h",
"src/src/MDFRobotoFontLoader.m",
"src/src/MaterialRobotoFontLoader.h",
]
deps = [
":material_roboto_font_loader_bundle",
"//ios/third_party/material_font_disk_loader_ios",
]
public_configs = [ ":material_roboto_font_loader_ios_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":material_roboto_font_loader_ios_config",
"//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code",
]
}

bundle_data("material_roboto_font_loader_bundle") {
visibility = [ ":material_roboto_font_loader_ios" ]
sources = [
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Black.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-BlackItalic.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Bold.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-BoldItalic.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Italic.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Light.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-LightItalic.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Medium.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-MediumItalic.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Regular.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-Thin.ttf",
"src/src/MaterialRobotoFontLoader.bundle/Roboto-ThinItalic.ttf",
]
outputs = [
"{{bundle_resources_dir}}/MaterialRobotoFontLoader.bundle/{{source_file_part}}",
]
}
2 changes: 2 additions & 0 deletions ios/third_party/material_roboto_font_loader_ios/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lpromero@chromium.org
rohitrao@chromium.org
13 changes: 13 additions & 0 deletions ios/third_party/material_roboto_font_loader_ios/README.chromium
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Name: Material Roboto Font Loader iOS
URL: https://github.com/material-foundation/material-roboto-font-loader-ios
Version: 0
Revision: 2e83b0fdbbd9b12782aa886695dd29b077bad430
License: Apache 2.0
License File: src/LICENSE
Security Critical: yes

Description:
The Roboto Font Loader lazy loads the Roboto font.

Local Modifications:
None
23 changes: 23 additions & 0 deletions ios/third_party/material_sprited_animation_view_ios/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

config("material_sprited_animation_view_ios_config") {
include_dirs = [ "src/src" ]
visibility = [ ":material_sprited_animation_view_ios" ]
}

source_set("material_sprited_animation_view_ios") {
sources = [
"src/src/MDFSpritedAnimationView.h",
"src/src/MDFSpritedAnimationView.m",
"src/src/MaterialSpritedAnimationView.h",
]
public_configs = [ ":material_sprited_animation_view_ios_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":material_sprited_animation_view_ios_config",
"//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code",
]
}
2 changes: 2 additions & 0 deletions ios/third_party/material_sprited_animation_view_ios/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lpromero@chromium.org
rohitrao@chromium.org
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Name: Material Sprited Animation View
URL: https://github.com/material-foundation/material-sprited-animation-view-ios
Version: 0
Revision: e240cdcd4538f0763ca5bd8c5afc2991eb482f1a
License: Apache 2.0
License File: src/LICENSE
Security Critical: yes

Description:
This control provides an alternative to animating an array of images with an
UIImageView. Only a single image composed of individual sprite frames is used,
and animation simply consists of updating the layer contentsRect.

Local Modifications:
None
3 changes: 2 additions & 1 deletion ios/third_party/material_text_accessibility_ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ source_set("material_text_accessibility_ios") {
"src/src/private/NSArray+MDFUtils.h",
"src/src/private/NSArray+MDFUtils.m",
]

public_configs = [ ":material_text_accessibility_ios_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":material_text_accessibility_ios_config",
"//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code",
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Name: Material Text Accessibility iOS
URL: None
URL: https://github.com/material-foundation/material-text-accessibility-ios
Version: 0
Revision: 96d2b0f13976a897bc7a41daf67f36d9548cff94
License: Apache 2.0
License File: src/LICENSE
Security Critical: yes
Expand Down

0 comments on commit ad24399

Please sign in to comment.