diff options
-rw-r--r-- | content/content_tests.gypi | 12 | ||||
-rw-r--r-- | webkit/tools/test_shell/resources/AHEM____.TTF | bin | 12480 -> 0 bytes | |||
-rw-r--r-- | webkit/tools/test_shell/resources/README.txt | 26 | ||||
-rw-r--r-- | webkit/tools/test_shell/resources/fonts.conf | 229 | ||||
-rw-r--r-- | webkit/tools/test_shell/resources/missingImage.gif | bin | 362 -> 0 bytes | |||
-rw-r--r-- | webkit/tools/test_shell/resources/missingImage.png | bin | 411 -> 0 bytes | |||
-rw-r--r-- | webkit/tools/test_shell/resources/textAreaResizeCorner.png | bin | 195 -> 0 bytes |
7 files changed, 2 insertions, 265 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 37bdb85e..f766bef 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -201,16 +201,8 @@ 'copies': [{ 'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit', 'files': [ - '../webkit/tools/test_shell/resources/missingImage.png', - '../webkit/tools/test_shell/resources/textAreaResizeCorner.png', - ], - }], - }, { # OS!="mac" - 'copies': [{ - 'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources', - 'files': [ - '../webkit/tools/test_shell/resources/missingImage.gif', - '../webkit/tools/test_shell/resources/textAreaResizeCorner.png', + 'shell/resources/missingImage.png', + 'shell/resources/textAreaResizeCorner.png', ], }], }], diff --git a/webkit/tools/test_shell/resources/AHEM____.TTF b/webkit/tools/test_shell/resources/AHEM____.TTF Binary files differdeleted file mode 100644 index ac81cb0..0000000 --- a/webkit/tools/test_shell/resources/AHEM____.TTF +++ /dev/null diff --git a/webkit/tools/test_shell/resources/README.txt b/webkit/tools/test_shell/resources/README.txt deleted file mode 100644 index 4a4e10b..0000000 --- a/webkit/tools/test_shell/resources/README.txt +++ /dev/null @@ -1,26 +0,0 @@ -missingImage.gif was created from Webkit data: WebCore/Resources/missingImage.tiff - -Licence text for missingImage.tiff from which missingImage.gif was generated: - -Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, 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: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. -THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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. - -missingImage.png is the same as WebCore/Resources/missingImage.png and carries exactly the same license. diff --git a/webkit/tools/test_shell/resources/fonts.conf b/webkit/tools/test_shell/resources/fonts.conf deleted file mode 100644 index b75a932..0000000 --- a/webkit/tools/test_shell/resources/fonts.conf +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- /etc/fonts/fonts.conf file to configure system font access --> -<fontconfig> - <match target="font"> - <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>Times</string> - </test> - <edit name="family" mode="assign"> - <string>Times New Roman</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>sans</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>sans serif</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - </match> - - <!-- Some layout tests specify Helvetica as a family and we need to make sure - that we don't fallback to Times New Roman for them --> - <match target="pattern"> - <test qual="any" name="family"> - <string>Helvetica</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>sans-serif</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>serif</string> - </test> - <edit name="family" mode="assign"> - <string>Times New Roman</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>mono</string> - </test> - <edit name="family" mode="assign"> - <string>Courier New</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>monospace</string> - </test> - <edit name="family" mode="assign"> - <string>Courier New</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>Courier</string> - </test> - <edit name="family" mode="assign"> - <string>Courier New</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>cursive</string> - </test> - <edit name="family" mode="assign"> - <string>Comic Sans MS</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>fantasy</string> - </test> - <edit name="family" mode="assign"> - <string>Impact</string> - </edit> - </match> - - <match target="pattern"> - <test qual="any" name="family"> - <string>Monaco</string> - </test> - <edit name="family" mode="assign"> - <string>Times New Roman</string> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>NonAntiAliasedSans</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="antialias" mode="assign"> - <bool>false</bool> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>SlightHintedGeorgia</string> - </test> - <edit name="family" mode="assign"> - <string>Georgia</string> - </edit> - <edit name="hintstyle" mode="assign"> - <const>hintslight</const> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>NonHintedSans</string> - </test> - <edit name="family" mode="assign"> - <string>Verdana</string> - </edit> - <!-- These deliberately contradict each other. The 'hinting' preference - should take priority --> - <edit name="hintstyle" mode="assign"> - <const>hintfull</const> - </edit> - <edit name="hinting" mode="assign"> - <bool>false</bool> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>AutohintedSerif</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="autohint" mode="assign"> - <bool>true</bool> - </edit> - <edit name="hintstyle" mode="assign"> - <const>hintmedium</const> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>HintedSerif</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="autohint" mode="assign"> - <bool>false</bool> - </edit> - <edit name="hintstyle" mode="assign"> - <const>hintmedium</const> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>FullAndAutoHintedSerif</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="autohint" mode="assign"> - <bool>true</bool> - </edit> - <edit name="hintstyle" mode="assign"> - <const>hintfull</const> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>SubpixelEnabledArial</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="rgba" mode="assign"> - <const>rgb</const> - </edit> - </match> - - <match target="pattern"> - <test name="family" compare="eq"> - <string>SubpixelDisabledArial</string> - </test> - <edit name="family" mode="assign"> - <string>Arial</string> - </edit> - <edit name="rgba" mode="assign"> - <const>none</const> - </edit> - </match> - -</fontconfig> diff --git a/webkit/tools/test_shell/resources/missingImage.gif b/webkit/tools/test_shell/resources/missingImage.gif Binary files differdeleted file mode 100644 index 0f7215d..0000000 --- a/webkit/tools/test_shell/resources/missingImage.gif +++ /dev/null diff --git a/webkit/tools/test_shell/resources/missingImage.png b/webkit/tools/test_shell/resources/missingImage.png Binary files differdeleted file mode 100644 index 5c24d20..0000000 --- a/webkit/tools/test_shell/resources/missingImage.png +++ /dev/null diff --git a/webkit/tools/test_shell/resources/textAreaResizeCorner.png b/webkit/tools/test_shell/resources/textAreaResizeCorner.png Binary files differdeleted file mode 100644 index 023615e..0000000 --- a/webkit/tools/test_shell/resources/textAreaResizeCorner.png +++ /dev/null |