LayoutTests/fast/text-autosizing/span-child.html - Issue 12310107: Merge 143356

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: LayoutTests/fast/text-autosizing/span-child.html

Issue 12310107: Merge 143356 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « LayoutTests/fast/text-autosizing/simple-paragraph-expected.html ('k') | LayoutTests/fast/text-autosizing/span-child-expected.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4	4

5 <meta name="viewport" content="width=800">	5 <meta name="viewport" content="width=800">

6 <style>	6 <style>

7 html { font-size: 16px; }	7 html { font-size: 16px; }

8 body { width: 800px; margin: 0; }	8 body { width: 800px; margin: 0; overflow-y: hidden; }

9 </style>	9 </style>

10	10

11 <script>	11 <script>

12 if (window.internals) {	12 if (window.internals) {

13 window.internals.settings.setTextAutosizingEnabled(true);	13 window.internals.settings.setTextAutosizingEnabled(true);

14 window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);	14 window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);

15 } else if (window.console && console.warn) {	15 } else if (window.console && console.warn) {

16 console.warn("This test depends on the Text Autosizing setting being true, s o run it in DumpRenderTree, or manually enable Text Autosizing, and either use a mobile device with 320px device-width (like Nexus S or iPhone), or define HACK_ FORCE_TEXT_AUTOSIZING_ON_DESKTOP.");	16 console.warn("This test depends on the Text Autosizing setting being true, s o run it in DumpRenderTree, or manually enable Text Autosizing, and either use a mobile device with 320px device-width (like Nexus S or iPhone), or define HACK_ FORCE_TEXT_AUTOSIZING_ON_DESKTOP.");

17 }	17 }

18 </script>	18 </script>

19	19

20 </head>	20 </head>

21 <body>	21 <body>

22	22

23 <div>	23 <div>

24 This text should all be autosized to 40px computed font-size; the span below shouldn't affect this.	24 This text should all be autosized to 40px computed font-size; the span below shouldn't affect this.

25 <span>	25 <span>

26 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.	26 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

27 </span>	27 </span>

28 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tem por incididunt ut labore et dolore magna aliqua.	28 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tem por incididunt ut labore et dolore magna aliqua.

29 </div>	29 </div>

30	30

31 </body>	31 </body>

32 </html>	32 </html>

OLD	NEW