Commit c2614f1e authored by bungeman@chromium.org's avatar bungeman@chromium.org

Clean up blink_skia_config.

The gyp is no longer needed, and the defines in the gypi are
no longer required.

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

git-svn-id: svn://svn.chromium.org/blink/trunk@185301 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 81dd89ee
...@@ -7,7 +7,5 @@ mkwst@chromium.org ...@@ -7,7 +7,5 @@ mkwst@chromium.org
pfeldman@chromium.org pfeldman@chromium.org
rbyers@chromium.org rbyers@chromium.org
tkent@chromium.org tkent@chromium.org
per-file blink_skia_config.gyp=bungeman@chromium.org
per-file blink_skia_config.gyp=reed@chromium.org
per-file blink_skia_config.gypi=bungeman@chromium.org per-file blink_skia_config.gypi=bungeman@chromium.org
per-file blink_skia_config.gypi=reed@chromium.org per-file blink_skia_config.gypi=reed@chromium.org
#
# Copyright (C) 2012 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.
#
# This target is a dependency of Chromium's skia/skia_library.gyp.
# It only contains code suppressions which keep Webkit tests from failing.
{
'targets': [
{
'target_name': 'blink_skia_config',
'type': 'none',
'direct_dependent_settings': {
'defines': [
# Place defines here that require significant Blink rebaselining, or that
# are otherwise best removed in Blink and then rolled into Chromium.
# Defines should be in single quotes and a comma must appear after every one.
# DO NOT remove the define until you are ready to rebaseline, and
# AFTER the flag has been removed from skia.gyp in Chromium.
'SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1',
],
},
},
],
}
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
# DO NOT remove the define until you are ready to rebaseline, and # DO NOT remove the define until you are ready to rebaseline, and
# AFTER the flag has been removed from skia.gyp in Chromium. # AFTER the flag has been removed from skia.gyp in Chromium.
'blink_skia_defines': [ 'blink_skia_defines': [
'SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1',
'SK_USE_SCALED_FONTMETRICS',
], ],
}, },
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment