summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/touchadjustment
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org>2015-06-26 01:52:13 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org>2015-06-26 01:52:13 +0000
commit5ca14cf499b37414d5c79e80b2480cf98da62f70 (patch)
tree74390ef843ad6b1978aa3445af865ac1ecff2ec6 /third_party/WebKit/LayoutTests/touchadjustment
parent0c9462cc211668d5a56cb15fd65b4fb7e1913b0e (diff)
downloadchromium_src-5ca14cf499b37414d5c79e80b2480cf98da62f70.zip
chromium_src-5ca14cf499b37414d5c79e80b2480cf98da62f70.tar.gz
chromium_src-5ca14cf499b37414d5c79e80b2480cf98da62f70.tar.bz2
Deflake tests using ahem font with @font-face.
Instead of trying to fix the issues about sideloaded font on Windows and similar issue on Mac, we use @font-face instead, and force a layout during DOMContentLoad to ensure the ahem font is loaded before onload fires and test finishes. This CL converts the tests using ahem font and marked flaky in TestExpectations and FlakyTests. Other benefits of this CL are: - No more need of platform-specific methods to register the 'Ahem' font family; - We can run the tests directly in browser and browser-mode content_shell without requiring 'Ahem' font registered in the system. Next steps: - Convert all tests using ahem font to this style; - Ensure all tests using @font-face to force a layout before onload; - Convert all tests using pre-registered fonts to this style; - Write a presubmit rule to ensure the above; - Remove the platform-specific code for pre-registering fonts. BUG=392046 Review URL: https://codereview.chromium.org/1204023002 git-svn-id: svn://svn.chromium.org/blink/trunk@197873 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/touchadjustment')
-rw-r--r--third_party/WebKit/LayoutTests/touchadjustment/context-menu-text-subtargets.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/WebKit/LayoutTests/touchadjustment/context-menu-text-subtargets.html b/third_party/WebKit/LayoutTests/touchadjustment/context-menu-text-subtargets.html
index 635d9a1..40ff6c6 100644
--- a/third_party/WebKit/LayoutTests/touchadjustment/context-menu-text-subtargets.html
+++ b/third_party/WebKit/LayoutTests/touchadjustment/context-menu-text-subtargets.html
@@ -2,6 +2,7 @@
<html>
<head>
<title>Touch Adjustment : Adjust context-menu to text-node subtargets - bug 94449</title>
+ <script src="../resources/ahem.js"></script>
<script src="../resources/js-test.js"></script>
<script src="resources/touchadjustment.js"></script>
<style>